Update to latest repo-tools (#774)

* Update to latest repo-tools 1. check style is no longer stops us, but there are a bunch of failures we should fix. 2. Broke out compute & flex pom.xml’s so that they exist. 3. Make more project include the parent pom. * fix a few things... Still broken are: appengine-guestbook-cloud-datastore-j8 iap-samples cloud-logging-samples vision-landmark-detection
GoogleCloudPlatform · Jul 31, 2017 · 3605324 · 3605324
1 parent f99f1e6
commit 3605324
Show file tree

Hide file tree

Showing 34 changed files with 182 additions and 119 deletions.
diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml
@@ -19,6 +19,7 @@
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.appengine</groupId>
   <artifactId>appengine-firebase-tictactoe-j8</artifactId>
+
   <parent>
       <groupId>com.google.cloud</groupId>
       <artifactId>appengine-java8-samples</artifactId>

diff --git a/...a8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java b/...a8/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
@@ -40,6 +40,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -147,6 +148,7 @@ public LowLevelHttpResponse execute() throws IOException {
         eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
   }
 
+  @Ignore // TODO: this wasn't running, and I've turned it off.
   public void doPost_notMyTurn_move() throws Exception {
     // Insert a game
     Objectify ofy = ObjectifyService.ofy();

diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
@@ -22,21 +22,14 @@ limitations under the License.
   <!-- Parent POM defines common plugins and properties. -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -58,6 +51,7 @@ limitations under the License.
           </systemProperties>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -73,6 +67,7 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
+
     </plugins>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>

diff --git a/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml
@@ -20,21 +20,12 @@
   <groupId>com.example.compute</groupId>
   <artifactId>compute-error-reporting</artifactId>
 
-  <!-- TODO: Use common parent after fixing checkstyle errors.
-       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
-  -->
-
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
-  </properties>
 
   <dependencies>
     <!-- [START dependencies] -->
@@ -49,7 +40,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin-version}</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/compute/mailjet/pom.xml b/compute/mailjet/pom.xml
@@ -19,11 +19,12 @@
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.compute</groupId>
   <artifactId>compute-mailjet</artifactId>
+
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/compute/pom.xml b/compute/pom.xml
@@ -0,0 +1,39 @@
+<!--
+ Copyright 2017 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <version>1.0.0</version>
+
+  <groupId>com.google.cloud</groupId>
+  <artifactId>compute</artifactId>
+  <packaging>pom</packaging>
+
+  <!-- Parent POM defines common plugins and properties. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <modules>
+    <module>cmdline</module>
+    <module>error-reporting</module>
+    <module>mailjet</module>
+    <module>sendgrid</module>
+  </modules>
+
+</project>
diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml
@@ -20,21 +20,12 @@
   <groupId>com.example.compute</groupId>
   <artifactId>compute-sendgrid</artifactId>
 
-  <!-- TODO: Use common parent after fixing checkstyle errors.
-       https://github.com/GoogleCloudPlatform/java-docs-samples/issues/298
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>compute</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
-  -->
-
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
-  </properties>
 
   <dependencies>
     <!-- [START dependencies] -->
@@ -49,7 +40,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>${maven-assembly-plugin-version}</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/flexible/analytics/pom.xml b/flexible/analytics/pom.xml
@@ -21,16 +21,13 @@
   <artifactId>flexible-analytics</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-
     <appengine.maven.plugin>1.3.1</appengine.maven.plugin>
     <jetty>9.4.4.v20170414</jetty>
 

diff --git a/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml
@@ -22,10 +22,10 @@
   <packaging>war</packaging>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/cloudsql/.gitignore b/flexible/cloudsql/.gitignore
diff --git a/flexible/cloudsql/pom.xml b/flexible/cloudsql/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>flexible-cloudsql</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
 <!-- [START properties] -->

diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>flexible-cloudstorage</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/cron/pom.xml b/flexible/cron/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>managed-vms-cron</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>flexible-datastore</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/disk/pom.xml b/flexible/disk/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>flexible-disk</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/endpoints/pom.xml b/flexible/endpoints/pom.xml
@@ -9,10 +9,10 @@
   <artifactId>flexible-endpoints</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/errorreporting/pom.xml b/flexible/errorreporting/pom.xml
@@ -22,10 +22,10 @@
   <artifactId>flexible-error-reporting</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>extendingruntime</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml
@@ -22,10 +22,10 @@
   <artifactId>flexible-helloworld</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>mailgun</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>

diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml
@@ -21,10 +21,10 @@
   <artifactId>memcache</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-flexible</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>