Skip to content

Commit d6d07cd

Browse files
authored
Add Java 11 support - Initial Phase (#185)
* Add profile for JDK11 and Automatic-Module-Name to jars * add maven.compiler.release=11
1 parent 5e4b214 commit d6d07cd

File tree

9 files changed

+67
-4
lines changed

9 files changed

+67
-4
lines changed

ndarray/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
Utility library for N-dimensional data I/O operations.
3333
</description>
3434

35+
<properties>
36+
<java.module.name>org.tensorflow.ndarray</java.module.name>
37+
</properties>
38+
3539
<dependencies>
3640
<dependency>
3741
<groupId>org.junit.jupiter</groupId>
@@ -57,6 +61,17 @@
5761

5862
<build>
5963
<plugins>
64+
<plugin>
65+
<artifactId>maven-jar-plugin</artifactId>
66+
<version>3.2.0</version>
67+
<configuration>
68+
<archive>
69+
<manifestEntries>
70+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
71+
</manifestEntries>
72+
</archive>
73+
</configuration>
74+
</plugin>
6075
<plugin>
6176
<groupId>org.apache.maven.plugins</groupId>
6277
<artifactId>maven-surefire-plugin</artifactId>

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,15 @@
165165
</repository>
166166
</repositories>
167167
</profile>
168+
169+
<profile>
170+
<id>jdk11</id>
171+
<properties>
172+
<maven.compiler.source>11</maven.compiler.source>
173+
<maven.compiler.target>11</maven.compiler.target>
174+
<maven.compiler.release>11</maven.compiler.release>
175+
</properties>
176+
</profile>
168177
</profiles>
169178

170179
<!-- http://central.sonatype.org/pages/requirements.html#developer-information -->

tensorflow-core/tensorflow-core-api/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<javacpp.build.skip>${native.build.skip}</javacpp.build.skip>
2222
<javacpp.parser.skip>${native.build.skip}</javacpp.parser.skip>
2323
<javacpp.compiler.skip>${native.build.skip}</javacpp.compiler.skip>
24+
<java.module.name>org.tensorflow.core.api</java.module.name>
2425
</properties>
2526

2627
<dependencies>
@@ -330,6 +331,13 @@
330331
<plugin>
331332
<artifactId>maven-jar-plugin</artifactId>
332333
<version>3.1.0</version>
334+
<configuration>
335+
<archive>
336+
<manifestEntries>
337+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
338+
</manifestEntries>
339+
</archive>
340+
</configuration>
333341
<executions>
334342
<execution>
335343
<!--

tensorflow-core/tensorflow-core-generator/pom.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<name>TensorFlow Core Annotation Processor</name>
1414
<description>Annotation processor for TensorFlow Java client</description>
1515

16+
<properties>
17+
<java.module.name>org.tensorflow.core.generator</java.module.name>
18+
</properties>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>com.google.guava</groupId>
@@ -33,14 +37,21 @@
3337

3438
<build>
3539
<plugins>
40+
<plugin>
41+
<artifactId>maven-jar-plugin</artifactId>
42+
<version>3.2.0</version>
43+
<configuration>
44+
<archive>
45+
<manifestEntries>
46+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
47+
</manifestEntries>
48+
</archive>
49+
</configuration>
50+
</plugin>
3651
<plugin>
3752
<groupId>org.apache.maven.plugins</groupId>
3853
<artifactId>maven-compiler-plugin</artifactId>
3954
<version>3.8.0</version>
40-
<configuration>
41-
<source>1.8</source>
42-
<target>1.8</target>
43-
</configuration>
4455
</plugin>
4556
</plugins>
4657
</build>

tensorflow-core/tensorflow-core-platform-gpu/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<properties>
3131
<javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
3232
<javacpp.platform.extension>-gpu</javacpp.platform.extension>
33+
<java.module.name>org.tensorflow.core.platform.gpu</java.module.name>
3334
</properties>
3435

3536
<dependencies>
@@ -80,6 +81,7 @@
8081
<archive>
8182
<manifestEntries>
8283
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64-gpu.jar ${javacpp.moduleId}-windows-x86_64-gpu.jar</Class-Path>
84+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
8385
</manifestEntries>
8486
</archive>
8587
</configuration>

tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<properties>
3131
<javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
3232
<javacpp.platform.extension>-mkl-gpu</javacpp.platform.extension>
33+
<java.module.name>org.tensorflow.core.platform.mkl</java.module.name>
3334
</properties>
3435

3536
<dependencies>
@@ -97,6 +98,7 @@
9798
<archive>
9899
<manifestEntries>
99100
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86_64-mkl-gpu.jar ${javacpp.moduleId}-windows-x86_64-mkl-gpu.jar</Class-Path>
101+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
100102
</manifestEntries>
101103
</archive>
102104
</configuration>

tensorflow-core/tensorflow-core-platform-mkl/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<properties>
3131
<javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
3232
<javacpp.platform.extension>-mkl</javacpp.platform.extension>
33+
<java.module.name>org.tensorflow.core.platform.mkl</java.module.name>
3334
</properties>
3435

3536
<dependencies>
@@ -115,6 +116,7 @@
115116
<archive>
116117
<manifestEntries>
117118
<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>
119+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
118120
</manifestEntries>
119121
</archive>
120122
</configuration>

tensorflow-core/tensorflow-core-platform/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
<properties>
3131
<javacpp.moduleId>tensorflow-core-api</javacpp.moduleId>
32+
<java.module.name>org.tensorflow.core.platform</java.module.name>
3233
</properties>
3334

3435
<dependencies>
@@ -91,6 +92,7 @@
9192
<archive>
9293
<manifestEntries>
9394
<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>
95+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
9496
</manifestEntries>
9597
</archive>
9698
</configuration>

tensorflow-framework/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
<properties>
3737
<javacpp.platform.extension></javacpp.platform.extension>
38+
<java.module.name>org.tensorflow.framework</java.module.name>
3839
</properties>
3940

4041
<dependencies>
@@ -74,6 +75,17 @@
7475

7576
<build>
7677
<plugins>
78+
<plugin>
79+
<artifactId>maven-jar-plugin</artifactId>
80+
<version>3.2.0</version>
81+
<configuration>
82+
<archive>
83+
<manifestEntries>
84+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
85+
</manifestEntries>
86+
</archive>
87+
</configuration>
88+
</plugin>
7789
<plugin>
7890
<groupId>org.apache.maven.plugins</groupId>
7991
<artifactId>maven-surefire-plugin</artifactId>

0 commit comments

Comments
 (0)