Java 11 compatibility (#3821)

* Add the javax.annotation-api as a compile scope to the google-api-grpc projects * Upgrade maven-compiler-plugin 3.5.1->3.7.0 and maven-jar-plugin 2.6->3.1.0 * Add annotation-api compile dependency to google-cloud-clients * Fix objensis version 3.1.0->2.6 * Fix service option test visibility * Temporarily using Java 7 build to test Java 11 * Restore the java 7 test to use the java 7 image
googleapis · Nov 30, 2018 · 3a4efc7 · 3a4efc7
1 parent 6573662
commit 3a4efc7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
@@ -89,6 +89,14 @@
       <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
   <dependencyManagement>
     <dependencies>
       <!-- Common dependencies -->
@@ -751,7 +759,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

diff --git a/...le-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/...le-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<TestServiceOptions> {}
+  interface TestService extends Service<TestServiceOptions> {}
 
   private static class TestServiceImpl extends BaseService<TestServiceOptions>
       implements TestService {
@@ -209,7 +209,7 @@ private static class DefaultTestServiceRpc implements TestServiceRpc {
     DefaultTestServiceRpc(TestServiceOptions options) {}
   }
 
-  private static class TestServiceOptions
+  static class TestServiceOptions
       extends ServiceOptions<TestService, TestServiceOptions> {
     private static class Builder
         extends ServiceOptions.Builder<TestService, TestServiceOptions, Builder> {

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
@@ -170,6 +170,14 @@
     <objenesis.version>2.6</objenesis.version>
   </properties>
   <!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
+  <dependencies>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -580,7 +588,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.1.0</version>
         <configuration>
           <archive>
             <addMavenDescriptor>true</addMavenDescriptor>
@@ -606,7 +614,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
@@ -94,7 +94,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
@@ -44,7 +44,7 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>${java.source.version}</source>

diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
@@ -39,7 +39,7 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>${java.source.version}</source>

diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
@@ -85,7 +85,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -59,7 +59,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>