diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml index 55e31cd43e3..0280111e86c 100644 --- a/appengine/analytics/pom.xml +++ b/appengine/analytics/pom.xml @@ -27,6 +27,12 @@ ../.. + + + 1.7 + 1.7 + + com.google.appengine @@ -55,15 +61,6 @@ appengine-maven-plugin ${appengine.sdk.version} - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.7 - 1.7 - - diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml index 881bf737a07..5916a1f2e0b 100644 --- a/appengine/appidentity/pom.xml +++ b/appengine/appidentity/pom.xml @@ -27,6 +27,10 @@ ../.. + + 2.0.9.101.v20160316 + + com.google.appengine @@ -96,7 +100,7 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.101.v20160316 + ${gcloud-maven-plugin-version} diff --git a/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml index 2974bc78b09..a1c8cde0c51 100644 --- a/compute/error-reporting/pom.xml +++ b/compute/error-reporting/pom.xml @@ -1,17 +1,17 @@ 4.0.0 @@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved. com.example.compute compute-error-reporting + + + + 1.8 + 1.8 + 2.6 + + @@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved. maven-assembly-plugin + ${maven-assembly-plugin-version} package @@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved. - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml index 7c36e821d0a..1ad4da7fa92 100644 --- a/compute/sendgrid/pom.xml +++ b/compute/sendgrid/pom.xml @@ -1,17 +1,17 @@ 4.0.0 @@ -20,6 +20,22 @@ Copyright 2016 Google Inc. All Rights Reserved. com.example.compute compute-sendgrid + + + + 1.8 + 1.8 + 2.6 + + @@ -33,6 +49,7 @@ Copyright 2016 Google Inc. All Rights Reserved. maven-assembly-plugin + ${maven-assembly-plugin-version} package @@ -52,15 +69,6 @@ Copyright 2016 Google Inc. All Rights Reserved. - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - diff --git a/java-repo-tools/pom.xml b/java-repo-tools/pom.xml index 48490d39f6b..8985be5024b 100644 --- a/java-repo-tools/pom.xml +++ b/java-repo-tools/pom.xml @@ -24,6 +24,16 @@ limitations under the License. UTF-8 UTF-8 + 2.2 + 0.7.6.201602180812 + 3.0.0 + 2.17 + 2.8.2 + 2.19.1 + 2.5.2 + 2.7 + 3.5.1 + 2.19.1 @@ -40,7 +50,7 @@ limitations under the License. org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + ${maven-surefire-plugin-version} false @@ -49,7 +59,7 @@ limitations under the License. org.apache.maven.plugins maven-failsafe-plugin - 2.19.1 + ${maven-failsafe-plugin-version} @@ -62,7 +72,7 @@ limitations under the License. org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + ${maven-checkstyle-plugin-version} google-checks.xml true @@ -78,12 +88,12 @@ limitations under the License. org.codehaus.mojo versions-maven-plugin - 2.2 + ${codehaus-versions-maven-plugin-version} org.jacoco jacoco-maven-plugin - 0.7.6.201602180812 + ${jacoco-maven-plugin-version} diff --git a/managed_vms/analytics/pom.xml b/managed_vms/analytics/pom.xml index c0d359f9f32..a5957e676e9 100644 --- a/managed_vms/analytics/pom.xml +++ b/managed_vms/analytics/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + org.apache.httpcomponents @@ -35,29 +56,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/cloudsql/pom.xml b/managed_vms/cloudsql/pom.xml index 4ab8fc7c978..e9060559a8c 100644 --- a/managed_vms/cloudsql/pom.xml +++ b/managed_vms/cloudsql/pom.xml @@ -1,18 +1,17 @@ - 4.0.0 @@ -28,6 +27,14 @@ Copyright 2016 Google Inc. All Rights Reserved. ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -51,29 +58,20 @@ Copyright 2016 Google Inc. All Rights Reserved. com.google.appengine gcloud-maven-plugin - ${maven.plugin.version} + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/cloudstorage/pom.xml b/managed_vms/cloudstorage/pom.xml index db1b1d6de1a..22eb71d25ad 100644 --- a/managed_vms/cloudstorage/pom.xml +++ b/managed_vms/cloudstorage/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -37,29 +58,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/cron/pom.xml b/managed_vms/cron/pom.xml index 5ddc7eda9e9..3e0e7b82e68 100644 --- a/managed_vms/cron/pom.xml +++ b/managed_vms/cron/pom.xml @@ -1,7 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -15,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + @@ -34,29 +54,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/datastore/pom.xml b/managed_vms/datastore/pom.xml index ee4bb850603..d3e3e2936c3 100644 --- a/managed_vms/datastore/pom.xml +++ b/managed_vms/datastore/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -37,29 +58,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/disk/pom.xml b/managed_vms/disk/pom.xml index b96d9579266..dd20a8918b6 100644 --- a/managed_vms/disk/pom.xml +++ b/managed_vms/disk/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -30,29 +51,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/extending-runtime/pom.xml b/managed_vms/extending-runtime/pom.xml index c6a6b017054..1b3f080f5c8 100644 --- a/managed_vms/extending-runtime/pom.xml +++ b/managed_vms/extending-runtime/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -30,29 +51,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/helloworld/pom.xml b/managed_vms/helloworld/pom.xml index b29c41a3417..43f0ce18a1c 100644 --- a/managed_vms/helloworld/pom.xml +++ b/managed_vms/helloworld/pom.xml @@ -1,7 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -15,6 +27,14 @@ ../.. + + 1.7 + 1.7 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + @@ -34,29 +54,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.7 - 1.7 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/mailgun/pom.xml b/managed_vms/mailgun/pom.xml index c5a5b7a05ec..794832ca5ab 100644 --- a/managed_vms/mailgun/pom.xml +++ b/managed_vms/mailgun/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -47,29 +68,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/mailjet/pom.xml b/managed_vms/mailjet/pom.xml index 3c21753347e..6c6cb3bd584 100644 --- a/managed_vms/mailjet/pom.xml +++ b/managed_vms/mailjet/pom.xml @@ -1,17 +1,17 @@ 4.0.0 @@ -19,6 +19,7 @@ 1.0-SNAPSHOT com.example.managedvms managed-vms-mailjet + com.google.cloud doc-samples @@ -26,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -49,29 +58,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/memcache/pom.xml b/managed_vms/memcache/pom.xml index 7769926fe99..ee6f038e138 100644 --- a/managed_vms/memcache/pom.xml +++ b/managed_vms/memcache/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -37,29 +58,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/sendgrid/pom.xml b/managed_vms/sendgrid/pom.xml index 21cd80a9940..864b6111e5a 100644 --- a/managed_vms/sendgrid/pom.xml +++ b/managed_vms/sendgrid/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -37,29 +58,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/static-files/pom.xml b/managed_vms/static-files/pom.xml index bf2ef49cacf..bb6e9b591cb 100644 --- a/managed_vms/static-files/pom.xml +++ b/managed_vms/static-files/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,14 @@ ../.. + + 1.8 + 1.8 + 2.6 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + + javax.servlet @@ -30,29 +51,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/managed_vms/twilio/pom.xml b/managed_vms/twilio/pom.xml index b8cbb56b315..8ba3b72686d 100644 --- a/managed_vms/twilio/pom.xml +++ b/managed_vms/twilio/pom.xml @@ -1,6 +1,19 @@ - - + + 4.0.0 war 1.0-SNAPSHOT @@ -14,6 +27,15 @@ ../.. + + 1.8 + 1.8 + 2.0.9.106.v20160420 + 9.3.7.v20160115 + 2.6 + 2.19.1 + + @@ -37,29 +59,20 @@ com.google.appengine gcloud-maven-plugin - 2.0.9.106.v20160420 + ${gcloud-maven-plugin-version} org.apache.maven.plugins maven-war-plugin - 2.6 + ${maven-war-plugin-version} false - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - org.eclipse.jetty jetty-maven-plugin - 9.3.7.v20160115 + ${jetty-maven-plugin-version} diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml index 22ee2619c34..9505e365c26 100644 --- a/monitoring/v3/pom.xml +++ b/monitoring/v3/pom.xml @@ -1,6 +1,19 @@ - + + 4.0.0 com.google.cloud.monotoring.samples cloud-monitoring-v3-samples @@ -15,6 +28,8 @@ + 1.7 + 1.7 1.19.0 1.19.0 UTF-8 @@ -86,18 +101,10 @@ - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - org.apache.maven.plugins maven-surefire-plugin - 2.4.2 + ${maven-surefire-plugin-version} ${skipTests} diff --git a/speech/grpc/pom.xml b/speech/grpc/pom.xml index 0e05f3a7f55..cdb241b940c 100644 --- a/speech/grpc/pom.xml +++ b/speech/grpc/pom.xml @@ -48,6 +48,9 @@ limitations under the License. UTF-8 + 2.2 + 3.1 + 0.5.0 @@ -205,7 +208,7 @@ limitations under the License. org.xolstice.maven.plugins protobuf-maven-plugin - 0.5.0 + ${xolstice-protobuf-maven-plugin-version} + 4.0.0 + com.google.apis-samples + storage-xml-cmdline-sample + 1 + doc-samples com.google.cloud @@ -7,17 +26,19 @@ ../../.. - 4.0.0 - com.google.apis-samples - storage-xml-cmdline-sample - 1 - Example for the Google Cloud Storage XML API using Application Default Credentials. + + 1.20.0 + UTF-8 + 1.1 + 3.2 + + org.codehaus.mojo exec-maven-plugin - 1.1 + ${codehaus-exec-maven-plugin} @@ -32,7 +53,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + ${maven-compiler-plugin-version} 7 7 @@ -71,8 +92,4 @@ test - - 1.20.0 - UTF-8 - diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml index 76711dcebfe..068c4cbbabc 100644 --- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml +++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml @@ -1,5 +1,19 @@ - + + 4.0.0 @@ -17,10 +31,15 @@ war + 1.7 + 1.7 1.21.0 ${project.build.directory}/${project.build.finalName} UTF-8 + 1.1 + 2.3.2 + 2.1.1 @@ -28,19 +47,10 @@ ${webappDirectory}/WEB-INF/classes - - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - org.apache.maven.plugins maven-war-plugin - 2.1.1 + ${maven-war-plugin-version} compile @@ -56,7 +66,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.3.2 + ${codehaus-findbugs-maven-plugin-version} false diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml index 938e940d537..dffee70457f 100644 --- a/taskqueue/deferred/pom.xml +++ b/taskqueue/deferred/pom.xml @@ -1,9 +1,24 @@ - - + + 4.0.0 war 1.0-SNAPSHOT + com.google.cloud.taskqueue.samples + taskqueue-defer-sample @@ -13,8 +28,12 @@ ../.. - com.google.cloud.taskqueue.samples - taskqueue-defer-sample + + 1.7 + 1.7 + 2.1 + 2.4 + @@ -57,7 +76,7 @@ org.codehaus.mojo versions-maven-plugin - 2.1 + ${codehaus-versions-maven-plugin-version} compile @@ -68,20 +87,11 @@ - - org.apache.maven.plugins - 3.1 - maven-compiler-plugin - - 1.7 - 1.7 - - org.apache.maven.plugins maven-war-plugin - 2.4 + ${maven-war-plugin-version} true diff --git a/unittests/pom.xml b/unittests/pom.xml index 36ef247eab0..1917592f359 100644 --- a/unittests/pom.xml +++ b/unittests/pom.xml @@ -16,6 +16,14 @@ com.google.appengine.samples unittests-appengine-local-testing-samples + + 1.7 + 1.7 + UTF-8 + 2.6 + 2.5.1 + + @@ -62,20 +70,10 @@ - - org.apache.maven.plugins - 2.5.1 - maven-compiler-plugin - - 1.7 - 1.7 - - - org.apache.maven.plugins maven-war-plugin - 2.3 + ${maven-war-plugin-version} true diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index 813a4d02a78..9cf84202543 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -29,6 +29,11 @@ ../.. + + 1.8 + 1.8 + + @@ -71,15 +76,6 @@ - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.7 - 1.7 - - maven-assembly-plugin diff --git a/vision/label/pom.xml b/vision/label/pom.xml index dad5639cedd..54bc43d0d48 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -29,6 +29,11 @@ ../.. + + 1.8 + 1.8 + + com.google.apis diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index a6e9005a8fc..e6abb1ccb79 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -29,6 +29,11 @@ ../.. + + 1.8 + 1.8 + + com.google.apis @@ -69,15 +74,6 @@ - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.7 - 1.7 - - maven-assembly-plugin diff --git a/vision/text/pom.xml b/vision/text/pom.xml index 2a2a2d551d0..d30a9104654 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -29,6 +29,11 @@ ../.. + + 1.8 + 1.8 + + com.google.apis @@ -85,15 +90,6 @@ - - org.apache.maven.plugins - 3.3 - maven-compiler-plugin - - 1.8 - 1.8 - - maven-assembly-plugin