From 733d5b3f9a40121a744a77f456dcf7fd816eb492 Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Wed, 24 Mar 2021 14:45:36 +1100
Subject: [PATCH] chore: configures project pom to java 8 (#1003)

* chore: configures project pom to java 8

Configures source / target compilation to be Java 8.

* chore: updates clirr

Clirr does not seem to work with Java 8. The methods added here are not
new additions to the interface, but started to fail as we migrated to
Java 8. I am adding those to the exclusions in order to unblock CI.
---
 google-cloud-spanner-bom/pom.xml              | 16 +++++++++++++++-
 .../clirr-ignored-differences.xml             | 14 ++++++++++++++
 .../cloud/spanner/SpannerApiFuturesTest.java  |  2 +-
 pom.xml                                       | 19 +++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 9e2ef3411b..4f37ad15f4 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -107,6 +107,20 @@
 
   <build>
     <plugins>
+      <!-- TODO: Remove this once the shared configuration updates to use Java 8 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+          <compilerArgument>-Xlint:deprecation</compilerArgument>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -116,4 +130,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/google-cloud-spanner/clirr-ignored-differences.xml b/google-cloud-spanner/clirr-ignored-differences.xml
index efc5fd4de3..641389cda9 100644
--- a/google-cloud-spanner/clirr-ignored-differences.xml
+++ b/google-cloud-spanner/clirr-ignored-differences.xml
@@ -578,4 +578,18 @@
     <className>com/google/cloud/spanner/connection/Connection</className>
     <method>com.google.api.core.ApiFuture closeAsync()</method>
   </difference>
+
+  <!-- Clirr seems to fail for these methods when upgrading to Java 8 -->
+  <!-- Adding these to unblock the CI -->
+  <!-- FIXME: Remove the methods below once clirr is fixed -->
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/AsyncTransactionManager$CommitTimestampFuture</className>
+    <method>java.lang.Object get(long, java.util.concurrent.TimeUnit)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/AsyncTransactionManager$CommitTimestampFuture</className>
+    <method>java.lang.Object get()</method>
+  </difference>
 </differences>
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerApiFuturesTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerApiFuturesTest.java
index 8b0d03717a..ca2411a23a 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerApiFuturesTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerApiFuturesTest.java
@@ -49,7 +49,7 @@ public void testGetNull() {
 
   @Test
   public void testGetOrNull() {
-    assertThat(SpannerApiFutures.getOrNull(null)).isNull();
+    assertThat(SpannerApiFutures.getOrNull((ApiFuture<Object>) null)).isNull();
   }
 
   @Test
diff --git a/pom.xml b/pom.xml
index 28f53728b2..0aac24e0fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,25 @@
     <module>google-cloud-spanner-bom</module>
   </modules>
 
+  <build>
+    <plugins>
+      <!-- TODO: Remove this once the shared configuration updates to use Java 8 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+          <compilerArgument>-Xlint:deprecation</compilerArgument>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <reporting>
     <plugins>
       <plugin>