From 539890f5954096b53099767a4170269317f84f09 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 16:29:57 -0700 Subject: [PATCH 1/7] Add the javax.annotation-api as a compile scope to the google-api-grpc projects --- google-api-grpc/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index bd859b040069..502d67510955 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -89,6 +89,14 @@ https://www.apache.org/licenses/LICENSE-2.0.txt + + + javax.annotation + javax.annotation-api + 1.2 + compile + + From 3d4fcfbbbe93863c2406f0451e5b1744b17c4560 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 16:40:48 -0700 Subject: [PATCH 2/7] Upgrade maven-compiler-plugin 3.5.1->3.7.0 and maven-jar-plugin 2.6->3.1.0 --- google-api-grpc/pom.xml | 2 +- google-cloud-clients/pom.xml | 4 ++-- google-cloud-examples/pom.xml | 2 +- google-cloud-testing/google-cloud-appengineflexcompat/pom.xml | 2 +- google-cloud-testing/google-cloud-appenginejava8/pom.xml | 2 +- google-cloud-testing/pom.xml | 4 ++-- google-cloud-util/google-cloud-compat-checker/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 502d67510955..6254044c5016 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -723,7 +723,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index dbc4bb99d7ad..923c21538b95 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -569,7 +569,7 @@ maven-jar-plugin - 2.6 + 3.1.0 true @@ -595,7 +595,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index 232931dab34d..f774a1ab8a8a 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -94,7 +94,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml index 4b99ee88323a..26da5e7a4b62 100644 --- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml @@ -44,7 +44,7 @@ org.apache.maven.plugins - 3.5.1 + 3.7.0 maven-compiler-plugin ${java.source.version} diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml index d2acbcad2a7f..03a0c8c23c73 100644 --- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml +++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.plugins - 3.5.1 + 3.7.0 maven-compiler-plugin ${java.source.version} diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index e5019efcfeb5..be0d38279751 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -59,7 +59,7 @@ org.objenesis objenesis - 2.6 + 3.1.0 com.google.truth @@ -83,7 +83,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml index 889419a5110f..e8447b1a1df9 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -54,7 +54,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 From 798dba277c3a630f36615e0eec46d1cabc694437 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 16:57:22 -0700 Subject: [PATCH 3/7] Add annotation-api compile dependency to google-cloud-clients --- google-cloud-clients/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 923c21538b95..541f9e72b3c9 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -169,6 +169,14 @@ 2.6 + + + javax.annotation + javax.annotation-api + 1.2 + compile + + From 81419e5945a40a59dd61c1063fd3739a3d3ab7ed Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 17:00:44 -0700 Subject: [PATCH 4/7] Fix objensis version 3.1.0->2.6 --- google-cloud-testing/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index be0d38279751..40cb27eabdb7 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -59,7 +59,7 @@ org.objenesis objenesis - 3.1.0 + 2.6 com.google.truth From 553d06cce99058e332c381d0a8456bc1d5055b73 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 17:07:48 -0700 Subject: [PATCH 5/7] Fix service option test visibility --- .../test/java/com/google/cloud/ServiceOptionsTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java index ee957a625f3c..3e75344d6f7b 100644 --- a/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java +++ b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java @@ -171,7 +171,7 @@ public long millisTime() { } } - private interface TestService extends Service {} + interface TestService extends Service {} private static class TestServiceImpl extends BaseService implements TestService { @@ -180,7 +180,7 @@ private TestServiceImpl(TestServiceOptions options) { } } - private interface TestServiceFactory extends ServiceFactory {} + interface TestServiceFactory extends ServiceFactory {} private static class DefaultTestServiceFactory implements TestServiceFactory { private static final TestServiceFactory INSTANCE = new DefaultTestServiceFactory(); @@ -191,7 +191,7 @@ public TestService create(TestServiceOptions options) { } } - private interface TestServiceRpcFactory + interface TestServiceRpcFactory extends ServiceRpcFactory {} private static class DefaultTestServiceRpcFactory implements TestServiceRpcFactory { @@ -209,7 +209,7 @@ private static class DefaultTestServiceRpc implements TestServiceRpc { DefaultTestServiceRpc(TestServiceOptions options) {} } - private static class TestServiceOptions + static class TestServiceOptions extends ServiceOptions { private static class Builder extends ServiceOptions.Builder { From 4f936f5dca19937b4d345e28e1dd12f03336766f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 15 Oct 2018 17:10:29 -0700 Subject: [PATCH 6/7] Temporarily using Java 7 build to test Java 11 --- .kokoro/presubmit/java7.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg index 584e8ea60b9c..b81a66a3c45e 100644 --- a/.kokoro/presubmit/java7.cfg +++ b/.kokoro/presubmit/java7.cfg @@ -3,5 +3,5 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" } From 03c30ed4066adc023ffcd0b772c06f2cb12adf31 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 29 Nov 2018 14:58:45 -0800 Subject: [PATCH 7/7] Restore the java 7 test to use the java 7 image --- .kokoro/presubmit/java7.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg index b81a66a3c45e..584e8ea60b9c 100644 --- a/.kokoro/presubmit/java7.cfg +++ b/.kokoro/presubmit/java7.cfg @@ -3,5 +3,5 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" }