From e56be8214e62551650b8c0bff3ac9332fb8d2ede Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Tue, 6 Jul 2021 15:06:12 -0700
Subject: [PATCH 01/11] Initial multi-release jar support

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 tensorflow-core/tensorflow-core-api/pom.xml   | 48 +++++++++++++++++++
 .../src/main/java/org/tensorflow/MRTest.java  | 24 ++++++++++
 .../src/main/java9/org/tensorflow/MRTest.java | 27 +++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
 create mode 100644 tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java

diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index 4ebe1234e80..2a9078d5e9a 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -22,6 +22,9 @@
     <java.module.name>org.tensorflow.core.api</java.module.name>
     <ndarray.version>0.3.1</ndarray.version>
     <truth.version>1.0.1</truth.version>
+
+    <java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
+    <java9.build.outputDirectory>${project.build.directory}/classes-java9</java9.build.outputDirectory>
   </properties>
 
   <dependencies>
@@ -143,6 +146,50 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>compile-java9</id>
+            <phase>compile</phase>
+            <configuration>
+              <target>
+                <mkdir dir="${java9.build.outputDirectory}" />
+                <javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
+                  classpath="${project.build.outputDirectory}" includeantruntime="false"
+                  target="9" source="9" release="9"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.2.0</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${java9.build.outputDirectory}</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
@@ -372,6 +419,7 @@
           <archive>
             <manifestEntries>
               <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+              <Multi-Release>true</Multi-Release>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
new file mode 100644
index 00000000000..8d9ea407292
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
@@ -0,0 +1,24 @@
+/*
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
+
+*/
+package org.tensorflow;
+
+public class MRTest {
+  public static int version() {
+    return 8;
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
new file mode 100644
index 00000000000..e283f6c87e5
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
@@ -0,0 +1,27 @@
+/*
+  Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ =======================================================================
+
+ */
+package org.tensorflow;
+
+import java.lang.ref.Cleaner;
+
+public class MRTest {
+  public static int version(){
+    Cleaner.create();
+    return 9;
+  }
+}

From 98886fef4a2f51ec200b90d531ca02c9b430c154 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Sun, 11 Jul 2021 17:29:24 -0700
Subject: [PATCH 02/11] Add test, make package private

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .../src/main/java/org/tensorflow/MRTest.java  |  4 +-
 .../src/main/java9/org/tensorflow/MRTest.java |  7 +---
 .../java/org/tensorflow/MultiReleaseTest.java | 38 +++++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java

diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
index 8d9ea407292..c0dafb416ef 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/MRTest.java
@@ -17,8 +17,8 @@
 */
 package org.tensorflow;
 
-public class MRTest {
-  public static int version() {
+class MRTest {
+  static int version() {
     return 8;
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
index e283f6c87e5..f95db519a62 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
@@ -17,11 +17,8 @@
  */
 package org.tensorflow;
 
-import java.lang.ref.Cleaner;
-
-public class MRTest {
-  public static int version(){
-    Cleaner.create();
+class MRTest {
+  static int version(){
     return 9;
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
new file mode 100644
index 00000000000..709fb7dc032
--- /dev/null
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
@@ -0,0 +1,38 @@
+/*
+  Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ =======================================================================
+
+ */
+package org.tensorflow;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MultiReleaseTest {
+
+  @Test
+  public void testMultirelease(){
+    String javaVersion = System.getProperty("java.version");
+    System.out.println("Testing on Java version " + javaVersion);
+    int value = MRTest.version();
+    if(javaVersion.compareTo("9") >= 0){
+      assertEquals(9, value);
+    } else {
+      assertEquals(8, value);
+    }
+  }
+
+}

From 6330c52eb193381f193ee54f0b60d159a0d4b1b6 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Sun, 11 Jul 2021 17:39:01 -0700
Subject: [PATCH 03/11] Add JDK 8 test to CI

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 969ebe9aecc..606a29f0db1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,6 +40,32 @@ jobs:
       - name: Run lint checks
         run: |
           mvn compiler:compile -Pdev,jdk11 -B -U -e
+  quick-build-jdk8:
+    if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
+    runs-on: ubuntu-latest
+    container: centos:7
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+      - name: Install environment
+        run: |
+          yum -y update
+          yum -y install centos-release-scl-rh epel-release
+          yum -y install java-1.8.0-openjdk-devel devtoolset-7
+          echo Downloading Maven
+          curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
+          tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
+          ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
+      - name: Build project
+        run: |
+          source scl_source enable devtoolset-7 || true
+          export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
+          echo $JAVA_HOME
+          mvn -version
+          mvn clean install -Pdev -B -U -e -Dlint.skip=true
+      - name: Run lint checks
+        run: |
+          mvn compiler:compile -Pdev -B -U -e
   check-format:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest

From 5d0c66de98f40c3a864fd4946d0c7a33ded313fd Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Sun, 11 Jul 2021 18:28:06 -0700
Subject: [PATCH 04/11] Use setup-java, don't lint check

---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 606a29f0db1..dd69d20dc6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,12 +46,16 @@ jobs:
     container: centos:7
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v1      
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8 
       - name: Install environment
         run: |
           yum -y update
           yum -y install centos-release-scl-rh epel-release
-          yum -y install java-1.8.0-openjdk-devel devtoolset-7
+          yum -y install devtoolset-7
           echo Downloading Maven
           curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
           tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
@@ -63,9 +67,6 @@ jobs:
           echo $JAVA_HOME
           mvn -version
           mvn clean install -Pdev -B -U -e -Dlint.skip=true
-      - name: Run lint checks
-        run: |
-          mvn compiler:compile -Pdev -B -U -e
   check-format:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest

From a6af976622c1b025e39003c4126c70209c36a0ba Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Sun, 11 Jul 2021 20:10:39 -0700
Subject: [PATCH 05/11] Use compiler plugin instead of ant

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 tensorflow-core/tensorflow-core-api/pom.xml   | 63 +++++--------------
 .../java/org/tensorflow/MultiReleaseTest.java | 29 +++++----
 2 files changed, 30 insertions(+), 62 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index 2a9078d5e9a..fde9a53c51a 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -22,9 +22,6 @@
     <java.module.name>org.tensorflow.core.api</java.module.name>
     <ndarray.version>0.3.1</ndarray.version>
     <truth.version>1.0.1</truth.version>
-
-    <java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
-    <java9.build.outputDirectory>${project.build.directory}/classes-java9</java9.build.outputDirectory>
   </properties>
 
   <dependencies>
@@ -146,50 +143,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>compile-java9</id>
-            <phase>compile</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${java9.build.outputDirectory}" />
-                <javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
-                  classpath="${project.build.outputDirectory}" includeantruntime="false"
-                  target="9" source="9" release="9"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.2.0</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${java9.build.outputDirectory}</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
@@ -216,6 +169,22 @@
               <generatedSourcesDirectory>${project.basedir}/src/gen/annotations</generatedSourcesDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>compile-java-9</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>9</release>
+              <source>9</source>
+              <target>9</target>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+              </compileSourceRoots>
+              <multiReleaseOutput>true</multiReleaseOutput>
+            </configuration>
+          </execution>
           <!--
           Compile JavaCPP presets
             This must be done prematurely, at the generate-sources phase, since the javacpp-plugin
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
index 709fb7dc032..9db7d0b3840 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
@@ -1,20 +1,20 @@
 /*
-  Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- =======================================================================
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
 
- */
+*/
 package org.tensorflow;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,15 +24,14 @@
 public class MultiReleaseTest {
 
   @Test
-  public void testMultirelease(){
+  public void testMultirelease() {
     String javaVersion = System.getProperty("java.version");
     System.out.println("Testing on Java version " + javaVersion);
     int value = MRTest.version();
-    if(javaVersion.compareTo("9") >= 0){
+    if (javaVersion.compareTo("9") >= 0) {
       assertEquals(9, value);
     } else {
       assertEquals(8, value);
     }
   }
-
 }

From e05a910bd3e82d94d630979ee5d2f11c75fc88f2 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 15:02:28 -0700
Subject: [PATCH 06/11] Java 11 instead of 9

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 tensorflow-core/tensorflow-core-api/pom.xml            | 10 +++++-----
 .../main/{java9 => java11}/org/tensorflow/MRTest.java  |  2 +-
 .../src/test/java/org/tensorflow/MultiReleaseTest.java |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename tensorflow-core/tensorflow-core-api/src/main/{java9 => java11}/org/tensorflow/MRTest.java (98%)

diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index fde9a53c51a..0197635b856 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -170,17 +170,17 @@
             </configuration>
           </execution>
           <execution>
-            <id>compile-java-9</id>
+            <id>compile-java-11</id>
             <phase>compile</phase>
             <goals>
               <goal>compile</goal>
             </goals>
             <configuration>
-              <release>9</release>
-              <source>9</source>
-              <target>9</target>
+              <release>11</release>
+              <source>11</source>
+              <target>11</target>
               <compileSourceRoots>
-                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                <compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
               </compileSourceRoots>
               <multiReleaseOutput>true</multiReleaseOutput>
             </configuration>
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
similarity index 98%
rename from tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
rename to tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
index f95db519a62..0752159e033 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java9/org/tensorflow/MRTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
@@ -19,6 +19,6 @@
 
 class MRTest {
   static int version(){
-    return 9;
+    return 11;
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
index 9db7d0b3840..9581f4e5e45 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
@@ -28,8 +28,8 @@ public void testMultirelease() {
     String javaVersion = System.getProperty("java.version");
     System.out.println("Testing on Java version " + javaVersion);
     int value = MRTest.version();
-    if (javaVersion.compareTo("9") >= 0) {
-      assertEquals(9, value);
+    if (javaVersion.compareTo("11") >= 0) {
+      assertEquals(11, value);
     } else {
       assertEquals(8, value);
     }

From 22de0659d12663c3bde3f554e7e79e456ffc9fa4 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 15:02:46 -0700
Subject: [PATCH 07/11] Update CI test

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .github/workflows/ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd69d20dc6a..ae75f2a053f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,29 +40,25 @@ jobs:
       - name: Run lint checks
         run: |
           mvn compiler:compile -Pdev,jdk11 -B -U -e
-  quick-build-jdk8:
+  quick-build-jdk9:
     if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: ubuntu-latest
     container: centos:7
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1      
+        uses: actions/checkout@v1
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 8 
+          java-version: 9
       - name: Install environment
         run: |
-          yum -y update
-          yum -y install centos-release-scl-rh epel-release
-          yum -y install devtoolset-7
           echo Downloading Maven
           curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
           tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
           ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
       - name: Build project
         run: |
-          source scl_source enable devtoolset-7 || true
           export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
           echo $JAVA_HOME
           mvn -version

From 21ce279934e6fa4690dba07b7adcb2c37fe8b03f Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 16:12:22 -0700
Subject: [PATCH 08/11] Try CI fix

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae75f2a053f..1c472c00ed3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,8 +59,6 @@ jobs:
           ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
       - name: Build project
         run: |
-          export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
-          echo $JAVA_HOME
           mvn -version
           mvn clean install -Pdev -B -U -e -Dlint.skip=true
   check-format:

From 03940917a6bb834b3696d00a3a449ac506080f7b Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 16:17:19 -0700
Subject: [PATCH 09/11] More CI tests

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .github/workflows/ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c472c00ed3..8ec38ca87cc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 9
+          java-version: 11
       - name: Install environment
         run: |
           echo Downloading Maven
@@ -61,6 +61,14 @@ jobs:
         run: |
           mvn -version
           mvn clean install -Pdev -B -U -e -Dlint.skip=true
+      - name: Setup Java 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Java 8 tests
+        run: |
+          mvn -version
+          mvn surefire:test -Pdev -B -U -e -Dlint.skip=true
   check-format:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest

From 883133a61c0ae6a126f07f06ddb9503a41d55bf3 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 16:50:09 -0700
Subject: [PATCH 10/11] Format java 11 sources

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 tensorflow-core/tensorflow-core-api/pom.xml   | 14 ++++++++++
 .../main/java11/org/tensorflow/MRTest.java    | 26 +++++++++----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index 0197635b856..7fc261401a9 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -499,6 +499,20 @@
           </descriptorRefs>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>${spotless.version}</version>
+        <configuration>
+          <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+              <include>src/main/java11/**/*.java</include>
+            </includes>
+          </java>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
index 0752159e033..b05d1317579 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java11/org/tensorflow/MRTest.java
@@ -1,24 +1,24 @@
 /*
-  Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+ Copyright 2021 The TensorFlow Authors. All Rights Reserved.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- =======================================================================
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=======================================================================
 
- */
+*/
 package org.tensorflow;
 
 class MRTest {
-  static int version(){
+  static int version() {
     return 11;
   }
 }

From 34351e2683ec1fdedbdfc3d39b126ce0af70eb06 Mon Sep 17 00:00:00 2001
From: Ryan Nett <JNett96@gmail.com>
Date: Mon, 12 Jul 2021 17:04:56 -0700
Subject: [PATCH 11/11] Fix test

Signed-off-by: Ryan Nett <JNett96@gmail.com>
---
 .github/workflows/ci.yml                                      | 2 +-
 .../src/test/java/org/tensorflow/MultiReleaseTest.java        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ec38ca87cc..692ebac7fff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Run lint checks
         run: |
           mvn compiler:compile -Pdev,jdk11 -B -U -e
-  quick-build-jdk9:
+  test-mr:
     if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: ubuntu-latest
     container: centos:7
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
index 9581f4e5e45..4bbde9b4536 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/MultiReleaseTest.java
@@ -28,7 +28,9 @@ public void testMultirelease() {
     String javaVersion = System.getProperty("java.version");
     System.out.println("Testing on Java version " + javaVersion);
     int value = MRTest.version();
-    if (javaVersion.compareTo("11") >= 0) {
+    int majorVersion = Integer.parseInt(javaVersion.substring(0, javaVersion.indexOf('.')));
+
+    if (majorVersion >= 11) {
       assertEquals(11, value);
     } else {
       assertEquals(8, value);