Use compiler plugin instead of ant

Signed-off-by: Ryan Nett <[email protected]>

Author: rnett

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

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);
     }
   }
-
 }