diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index ac554e765629..17e1171ed647 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 + + @@ -751,7 +759,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7 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 55d90b6510ec..cbb4dd04f127 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 { @@ -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 { diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 14cd400929aa..9360d53c5a0f 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -170,6 +170,14 @@ 2.6 + + + javax.annotation + javax.annotation-api + 1.2 + compile + + @@ -580,7 +588,7 @@ maven-jar-plugin - 2.6 + 3.1.0 true @@ -606,7 +614,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 9d4533de767c..7e43179bded0 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 b79d35e2b30e..d4e4de224c62 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 63966a0e2bef..b818841b4660 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 f2ad20728fc4..9af5da129c98 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -85,7 +85,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 1870975ad72b..8ee9d8365a73 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -59,7 +59,7 @@ maven-compiler-plugin - 3.5.1 + 3.7.0 1.7 1.7