diff --git a/appengine-java8/appidentity/pom.xml b/appengine-java8/appidentity/pom.xml index 6bf485ff350..7cc6d3ffbcd 100644 --- a/appengine-java8/appidentity/pom.xml +++ b/appengine-java8/appidentity/pom.xml @@ -45,7 +45,7 @@ com.google.guava guava - 20.0 + 25.1-android diff --git a/appengine-java8/datastore/pom.xml b/appengine-java8/datastore/pom.xml index 2db945bc09a..9a70eca537a 100644 --- a/appengine-java8/datastore/pom.xml +++ b/appengine-java8/datastore/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 20.0 + 25.1-android diff --git a/appengine-java8/requests/pom.xml b/appengine-java8/requests/pom.xml index 2aa4b4df834..63cfd447a83 100644 --- a/appengine-java8/requests/pom.xml +++ b/appengine-java8/requests/pom.xml @@ -54,7 +54,7 @@ Copyright 2016 Google Inc. com.google.guava guava - 20.0 + 25.1-android diff --git a/appengine-java8/users/pom.xml b/appengine-java8/users/pom.xml index 04dd6e053b9..97821f49afd 100644 --- a/appengine-java8/users/pom.xml +++ b/appengine-java8/users/pom.xml @@ -45,7 +45,7 @@ Copyright 2015 Google Inc. com.google.guava guava - 20.0 + 25.1-android diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml index c11dea51097..d1fb6f3a3d5 100644 --- a/appengine/appidentity/pom.xml +++ b/appengine/appidentity/pom.xml @@ -44,7 +44,7 @@ com.google.guava guava - 20.0 + 25.1-android javax.servlet diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml index 294453fbb79..b9214d7e294 100644 --- a/appengine/endpoints-frameworks-v2/backend/pom.xml +++ b/appengine/endpoints-frameworks-v2/backend/pom.xml @@ -14,123 +14,127 @@ limitations under the License. --> - 4.0.0 - war - 1.0-SNAPSHOT + 4.0.0 + war + 1.0-SNAPSHOT - com.example.echo - echo + com.example.echo + echo - - - com.google.cloud.samples - shared-configuration - 1.0.9 - + + + com.google.cloud.samples + shared-configuration + 1.0.9 + + + 3.0 + - - UTF-8 + + UTF-8 - 2.1.0 + 2.1.0 - YOUR_PROJECT_ID - 1.7 - 1.7 - 1.3.2 - + YOUR_PROJECT_ID + 1.7 + 1.7 + 1.3.2 + - - - - com.google.endpoints - endpoints-framework - ${endpoints.framework.version} - - - - com.google.endpoints - endpoints-management-control-appengine - 1.0.8 - - - com.google.endpoints - endpoints-framework-auth - 1.0.8 - - - - com.google.appengine - appengine-api-1.0-sdk - 1.9.64 - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.inject - javax.inject - 1 - - + + + + com.google.endpoints + endpoints-framework + ${endpoints.framework.version} + + + + com.google.endpoints + endpoints-management-control-appengine + 1.0.8 + + + com.google.endpoints + endpoints-framework-auth + 1.0.8 + + + + com.google.appengine + appengine-api-1.0-sdk + 1.9.64 + + + javax.servlet + servlet-api + 2.5 + provided + + + javax.inject + javax.inject + 1 + + - - - ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - - - com.google.cloud.tools - appengine-maven-plugin - ${appengine.maven.plugin.version} - - - - - - - com.google.cloud.tools - endpoints-framework-maven-plugin - 1.0.2 - - - ${endpoints.project.id}.appspot.com - - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - - - ${basedir}/src/main/webapp/WEB-INF - true - WEB-INF - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.3 - - - compile - - display-dependency-updates - display-plugin-updates - - - - - - + + + ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + + + + com.google.cloud.tools + appengine-maven-plugin + ${appengine.maven.plugin.version} + + + + + + + com.google.cloud.tools + endpoints-framework-maven-plugin + 1.0.2 + + + ${endpoints.project.id}.appspot.com + + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + + + ${basedir}/src/main/webapp/WEB-INF + true + WEB-INF + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.3 + + + compile + + display-dependency-updates + display-plugin-updates + + + + + + diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml index d874e648e54..861c28d2333 100644 --- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml @@ -31,6 +31,10 @@ 1.0.9 + + 3.0 + + UTF-8 diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 46e5dd16b0a..14af3bf6c1c 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -32,6 +32,10 @@ limitations under the License. 1.0.9 + + 3.0 + + 1.7 diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml index 891fe0e8f3c..e7aad1a4d7f 100644 --- a/appengine/requests/pom.xml +++ b/appengine/requests/pom.xml @@ -37,15 +37,15 @@ Copyright 2016 Google Inc. - - com.google.appengine - appengine-maven-plugin - 1.9.64 - - + + com.google.appengine + appengine-maven-plugin + 1.9.64 + + com.google.guava guava - 20.0 + 25.1-android javax.servlet @@ -100,7 +100,8 @@ Copyright 2016 Google Inc. - ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + ${project.build.directory}/${project.build.finalName}/WEB-INF/classes + com.google.appengine diff --git a/appengine/taskqueue/defer-samples/pom.xml b/appengine/taskqueue/defer-samples/pom.xml index ea62527dbd1..9d8f14c2d57 100644 --- a/appengine/taskqueue/defer-samples/pom.xml +++ b/appengine/taskqueue/defer-samples/pom.xml @@ -30,6 +30,10 @@ 1.0.9 + + 3.0 + + 1.7 1.7 diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml index fba2d44602a..b29546e3f49 100644 --- a/appengine/users/pom.xml +++ b/appengine/users/pom.xml @@ -42,7 +42,7 @@ Copyright 2015 Google Inc. com.google.guava guava - 20.0 + 25.1-android javax.servlet diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index 01b3bf6dec1..11e6201f0d3 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -52,7 +52,7 @@ com.google.guava guava - 23.0 + 25.1-android com.google.oauth-client diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index d8933f47e60..d9d25f0ebb2 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -58,7 +58,7 @@ com.google.guava guava - 20.0 + 25.1-android diff --git a/vision/label/pom.xml b/vision/label/pom.xml index bf6f529c8ac..18849559140 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -56,7 +56,7 @@ com.google.guava guava - 20.0 + 25.1-android diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index e20dc174203..582471b70a7 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -56,7 +56,7 @@ com.google.guava guava - 20.0 + 25.1-android diff --git a/vision/text/pom.xml b/vision/text/pom.xml index cb5f23d3604..2a355ae4911 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -56,7 +56,7 @@ com.google.guava guava - 20.0 + 25.1-android org.apache.opennlp