From 58916394262921e9b77c58272c0743a2120d5898 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 20 Aug 2019 17:17:40 -0400 Subject: [PATCH 1/4] sync and update App Engine SDK version --- .kokoro/install_dependencies.sh | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/install_dependencies.sh b/.kokoro/install_dependencies.sh index a0439dd7d..0e49fafc1 100755 --- a/.kokoro/install_dependencies.sh +++ b/.kokoro/install_dependencies.sh @@ -19,7 +19,7 @@ set -eo pipefail mvn dependency:get -Dartifact=com.google.android:android:4.1.1.4 # Install the appengine SDK -mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.65 +mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.76 # Install play services mvn dependency:get -Dartifact=com.google.android.google-play-services:google-play-services:1 -o -DremoteRepositories=file:~/.m2 || \ diff --git a/pom.xml b/pom.xml index 0e5aad625..e30846102 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ 2.9.8 2.6.1 28.0-android - 1.9.64 + 1.9.76 1.1.4c 4.5.9 4.4.11 From 6968ff8be8e6b2373ca5dbf04053681cd91a0013 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 20 Aug 2019 18:50:59 -0400 Subject: [PATCH 2/4] update animal-sniffer for Java 9 compatibility --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e30846102..0725b1867 100644 --- a/pom.xml +++ b/pom.xml @@ -313,7 +313,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.9 + 1.17 org.apache.maven.plugins From dcda5fa7c5a81e320123527164b46f0fd97baa05 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 20 Aug 2019 19:07:41 -0400 Subject: [PATCH 3/4] try sniffer 1.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0725b1867..3ed83be3c 100644 --- a/pom.xml +++ b/pom.xml @@ -313,7 +313,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.17 + 1.16 org.apache.maven.plugins From 675d7504fdce823fce9c5e2c40421202f0a37649 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 22 Aug 2019 14:03:43 -0400 Subject: [PATCH 4/4] try 1.9.65 --- .kokoro/install_dependencies.sh | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/install_dependencies.sh b/.kokoro/install_dependencies.sh index 0e49fafc1..a0439dd7d 100755 --- a/.kokoro/install_dependencies.sh +++ b/.kokoro/install_dependencies.sh @@ -19,7 +19,7 @@ set -eo pipefail mvn dependency:get -Dartifact=com.google.android:android:4.1.1.4 # Install the appengine SDK -mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.76 +mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.65 # Install play services mvn dependency:get -Dartifact=com.google.android.google-play-services:google-play-services:1 -o -DremoteRepositories=file:~/.m2 || \ diff --git a/pom.xml b/pom.xml index 75c4a7fc1..0283aee95 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ 2.9.8 3.9.1 28.0-android - 1.9.76 + 1.9.65 1.1.4c 4.5.9 4.4.11