Clean up of App engine java 11 pom files (GoogleCloudPlatform#1804)

averikitsch · web-flow · commit 69a9c2d2f484 · 2019-12-11T15:54:15.000-08:00
* Update plugin

* update to bom
diff --git a/appengine-java11/gaeinfo/pom.xml b/appengine-java11/gaeinfo/pom.xml
@@ -81,6 +81,15 @@ Copyright 2019 Google LLC
   <build>
     <finalName>gaeinfo</finalName>
     <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>2.2.0</version>
+        <configuration>
+          <version>gaeinfo</version>
+        </configuration>
+      </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -106,29 +115,9 @@ Copyright 2019 Google LLC
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>install</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/appengine-staging/cprof</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>com.google.cloud.tools</groupId>
-        <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.0.0</version>
-        <configuration>
-          <version>gaeinfo</version>
-        </configuration>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.4.2.v20170220</version>
       </plugin>
     </plugins>
 
diff --git a/appengine-java11/guestbook-cloud-firestore/pom.xml b/appengine-java11/guestbook-cloud-firestore/pom.xml
@@ -38,7 +38,6 @@
     Dependent-jars are created and added to
     ${project.build.directory}/appengine-staging -->
 
-  <!-- [START gae_java11_firestore_pom] -->
   <!--  Using libraries-bom to manage versions.
   See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -->
   <dependencyManagement>
@@ -59,7 +58,6 @@
       <artifactId>google-cloud-firestore</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- [END gae_java11_firestore_pom] -->
 
     <!-- Dependency needs to be locally install from directory -->
 		<!-- `java-docs-samples/appengine-java11/appengine-simple-jetty-main' -->
@@ -89,9 +87,7 @@
       <artifactId>jstl</artifactId>
       <version>1.2</version>
     </dependency>
-    <!-- [START gae_java11_firestore_pom] -->
   </dependencies>
-  <!-- [END gae_java11_firestore_pom] -->
   <build>
     <finalName>guestbook</finalName>
     <plugins>
diff --git a/appengine-java11/micronaut-helloworld/pom.xml b/appengine-java11/micronaut-helloworld/pom.xml
@@ -172,16 +172,16 @@
               <arg>-parameters</arg>
             </compilerArgs>
             <annotationProcessorPaths>
-                  <path>
-                    <groupId>io.micronaut</groupId>
-                    <artifactId>micronaut-inject-java</artifactId>
-                    <version>1.1.0</version>
-                  </path>
-                  <path>
-                    <groupId>io.micronaut</groupId>
-                    <artifactId>micronaut-validation</artifactId>
-                    <version>1.1.0</version>
-                  </path>
+              <path>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-inject-java</artifactId>
+                <version>1.1.0</version>
+              </path>
+              <path>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-validation</artifactId>
+                <version>1.1.0</version>
+              </path>
             </annotationProcessorPaths>
           </configuration>
           <executions>
diff --git a/appengine-java11/spanner/pom.xml b/appengine-java11/spanner/pom.xml
@@ -38,6 +38,18 @@
     <maven.compiler.source>11</maven.compiler.source>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>3.0.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <!-- All dependencies are scoped as provided.
     Dependent-jars are created and added to
     ${project.build.directory}/appengine-staging -->
@@ -55,7 +67,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>1.45.0</version>
       <scope>provided</scope>
     </dependency>
 
