From 0b7156a741f8d484e65a697ee8babf096523e22a Mon Sep 17 00:00:00 2001
From: Jim Clarke <JimClarke5@me.com>
Date: Sat, 9 Jan 2021 19:25:05 -0500
Subject: [PATCH 1/2] Add profile for JDK11 and  Automatic-Module-Name to jars

---
 ndarray/pom.xml                               | 15 +++++++++++++++
 pom.xml                                       |  8 ++++++++
 tensorflow-core/tensorflow-core-api/pom.xml   |  8 ++++++++
 .../tensorflow-core-generator/pom.xml         | 19 +++++++++++++++----
 .../tensorflow-core-platform-gpu/pom.xml      |  2 ++
 .../tensorflow-core-platform-mkl-gpu/pom.xml  |  2 ++
 .../tensorflow-core-platform-mkl/pom.xml      |  2 ++
 .../tensorflow-core-platform/pom.xml          |  2 ++
 tensorflow-framework/pom.xml                  | 12 ++++++++++++
 9 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/ndarray/pom.xml b/ndarray/pom.xml
index bedf291731c..d228fbdb32a 100644
--- a/ndarray/pom.xml
+++ b/ndarray/pom.xml
@@ -32,6 +32,10 @@
     Utility library for N-dimensional data I/O operations.
   </description>
 
+  <properties>
+    <java.module.name>org.tensorflow.ndarray</java.module.name>
+  </properties>
+
   <dependencies>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
@@ -57,6 +61,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index eb6f943919d..147d3eb9cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,14 @@
         </repository>
       </repositories>
     </profile>
+
+    <profile>
+      <id>jdk11</id>
+      <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+      </properties>
+    </profile>
   </profiles>
 
   <!-- http://central.sonatype.org/pages/requirements.html#developer-information -->
diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index f0953383920..8e303f1f235 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -21,6 +21,7 @@
     <javacpp.build.skip>${native.build.skip}</javacpp.build.skip>
     <javacpp.parser.skip>${native.build.skip}</javacpp.parser.skip>
     <javacpp.compiler.skip>${native.build.skip}</javacpp.compiler.skip>
+    <java.module.name>org.tensorflow.core.api</java.module.name>
   </properties>
 
   <dependencies>
@@ -330,6 +331,13 @@
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.1.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
         <executions>
           <execution>
             <!--
diff --git a/tensorflow-core/tensorflow-core-generator/pom.xml b/tensorflow-core/tensorflow-core-generator/pom.xml
index 83f4b24da74..8a0e7cdb83f 100644
--- a/tensorflow-core/tensorflow-core-generator/pom.xml
+++ b/tensorflow-core/tensorflow-core-generator/pom.xml
@@ -13,6 +13,10 @@
   <name>TensorFlow Core Annotation Processor</name>
   <description>Annotation processor for TensorFlow Java client</description>
 
+  <properties>
+    <java.module.name>org.tensorflow.core.generator</java.module.name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -33,14 +37,21 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/tensorflow-core/tensorflow-core-platform-gpu/pom.xml b/tensorflow-core/tensorflow-core-platform-gpu/pom.xml
index d3c99be8e66..d675bb9cda1 100644
--- a/tensorflow-core/tensorflow-core-platform-gpu/pom.xml
+++ b/tensorflow-core/tensorflow-core-platform-gpu/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
     <javacpp.platform.extension>-gpu</javacpp.platform.extension>
+    <java.module.name>org.tensorflow.core.platform.gpu</java.module.name>
   </properties>
 
   <dependencies>
@@ -80,6 +81,7 @@
               <archive>
                 <manifestEntries>
                   <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64-gpu.jar ${javacpp.moduleId}-windows-x86_64-gpu.jar</Class-Path>
+                  <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
                 </manifestEntries>
               </archive>
             </configuration>
diff --git a/tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml b/tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml
index 56a1281da82..b3a1075ca6c 100644
--- a/tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml
+++ b/tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
     <javacpp.platform.extension>-mkl-gpu</javacpp.platform.extension>
+    <java.module.name>org.tensorflow.core.platform.mkl</java.module.name>
   </properties>
 
   <dependencies>
@@ -97,6 +98,7 @@
               <archive>
                 <manifestEntries>
                   <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64-mkl-gpu.jar ${javacpp.moduleId}-windows-x86_64-mkl-gpu.jar</Class-Path>
+                  <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
                 </manifestEntries>
               </archive>
             </configuration>
diff --git a/tensorflow-core/tensorflow-core-platform-mkl/pom.xml b/tensorflow-core/tensorflow-core-platform-mkl/pom.xml
index 9071241831b..63a020d4f7f 100644
--- a/tensorflow-core/tensorflow-core-platform-mkl/pom.xml
+++ b/tensorflow-core/tensorflow-core-platform-mkl/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
     <javacpp.platform.extension>-mkl</javacpp.platform.extension>
+    <java.module.name>org.tensorflow.core.platform.mkl</java.module.name>
   </properties>
 
   <dependencies>
@@ -115,6 +116,7 @@
               <archive>
                 <manifestEntries>
                   <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64-mkl.jar ${javacpp.moduleId}-macosx-x86_64-mkl.jar ${javacpp.moduleId}-windows-x86_64-mkl.jar</Class-Path>
+                  <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
                 </manifestEntries>
               </archive>
             </configuration>
diff --git a/tensorflow-core/tensorflow-core-platform/pom.xml b/tensorflow-core/tensorflow-core-platform/pom.xml
index ea275250280..d4110e305e6 100644
--- a/tensorflow-core/tensorflow-core-platform/pom.xml
+++ b/tensorflow-core/tensorflow-core-platform/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
+    <java.module.name>org.tensorflow.core.platform</java.module.name>
   </properties>
 
   <dependencies>
@@ -91,6 +92,7 @@
               <archive>
                 <manifestEntries>
                   <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
+                  <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
                 </manifestEntries>
               </archive>
             </configuration>
diff --git a/tensorflow-framework/pom.xml b/tensorflow-framework/pom.xml
index 8ff762cb434..74c4c2c2084 100644
--- a/tensorflow-framework/pom.xml
+++ b/tensorflow-framework/pom.xml
@@ -35,6 +35,7 @@
 
   <properties>
     <javacpp.platform.extension></javacpp.platform.extension>
+    <java.module.name>org.tensorflow.framework</java.module.name>
   </properties>
 
   <dependencies>
@@ -74,6 +75,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

From e1224b995014c2adb5349d7f5dc008784f0c524a Mon Sep 17 00:00:00 2001
From: Jim Clarke <JimClarke5@me.com>
Date: Mon, 25 Jan 2021 10:32:48 -0500
Subject: [PATCH 2/2] add maven.compiler.release=11

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 147d3eb9cd6..4e79a6ca61c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,7 @@
       <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
       </properties>
     </profile>
   </profiles>