Activate local build profile by default

+ clean up regarding Java modules

Author: karllessard

CONTRIBUTING.md

@@ -15,7 +15,7 @@ For dependencies, we can use anything compliant with [this list](https://opensou
 
 ## Building
 
-To build all the artifacts locally, simply invoke the command `mvn install -Djavacpp.platform.host` at the root of this repository (or the Maven command of your choice). It is also
+To build all the artifacts locally, simply invoke the command `mvn install` at the root of this repository (or the Maven command of your choice). It is also
 possible to build artifacts with support for CUDA® by adding the `-Djavacpp.platform.extension=-gpu` argument to the Maven command.
 
 ### JDK 16+
@@ -120,7 +120,7 @@ Once these steps have been executed, you can run `mvn install` to build the new
 ### Generating Java Bindings
 
 After upgrading the TensorFlow library, you need to regenerate all Java bindings that depends on the native code. That includes Java protos, C API bindings (JavaCPP) and
-operator classes. You can trigger the regeneration of these bindings with the Maven command `mvn clean install -Pgenerating -Djavacpp.platform.host`.
+operator classes. You can trigger the regeneration of these bindings with the Maven command `mvn clean install -Pgenerating`.
 
 This will trigger a small Bazel build of the TensorFlow sources to regenerate the Java protos, so make sure your [environment](CONTRIBUTING.md#native-builds) is setup properly.
 

tensorflow-core/pom.xml

@@ -66,14 +66,43 @@
 
  <profiles>
  <profile>
- <id>javacpp-platform-default</id>
+ <!--
+ When deploying, the build packages and distributes native binaries for all supported platforms. These native artifacts
+ must have already been built, tested and published priorly on their respective platform.
+ -->
+ <id>deploying</id>
+ <properties>
+ <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
+ </properties>
+ </profile>
+
+ <profile>
+ <!--
+ All supported platforms are being replaced by the current host platform, mostly useful for local builds.
+ The artifacts produced by this build can only run on the current host (or other machines of the same
+ platform). This is the default profile.
+ -->
+ <id>javacpp-platform-host</id>
  <activation>
+ <activeByDefault>true</activeByDefault>
  <property>
- <name>!javacpp.platform</name>
+ <name>javacpp.platform.host</name>
  </property>
  </activation>
  <properties>
  <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
+ <javacpp.platform.linux-armhf>${os.name}-${os.arch}</javacpp.platform.linux-armhf>
+ <javacpp.platform.linux-arm64>${os.name}-${os.arch}</javacpp.platform.linux-arm64>
+ <javacpp.platform.linux-x86_64>${os.name}-${os.arch}</javacpp.platform.linux-x86_64>
+ <javacpp.platform.macosx-arm64>${os.name}-${os.arch}</javacpp.platform.macosx-arm64>
+ <javacpp.platform.macosx-x86_64>${os.name}-${os.arch}</javacpp.platform.macosx-x86_64>
+ <javacpp.platform.windows-x86_64>${os.name}-${os.arch}</javacpp.platform.windows-x86_64>
+ <javacpp.platform.linux-armhf.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
+ <javacpp.platform.linux-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
+ <javacpp.platform.linux-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
+ <javacpp.platform.macosx-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
+ <javacpp.platform.macosx-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
+ <javacpp.platform.windows-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
  </properties>
  </profile>
 
@@ -106,30 +135,6 @@
  </properties>
  </profile>
 
- <profile>
- <id>javacpp-platform-host</id>
- <activation>
- <property>
- <name>javacpp.platform.host</name>
- </property>
- </activation>
- <properties>
- <javacpp.platform>${os.name}-${os.arch}</javacpp.platform>
- <javacpp.platform.linux-armhf>${os.name}-${os.arch}</javacpp.platform.linux-armhf>
- <javacpp.platform.linux-arm64>${os.name}-${os.arch}</javacpp.platform.linux-arm64>
- <javacpp.platform.linux-x86_64>${os.name}-${os.arch}</javacpp.platform.linux-x86_64>
- <javacpp.platform.macosx-arm64>${os.name}-${os.arch}</javacpp.platform.macosx-arm64>
- <javacpp.platform.macosx-x86_64>${os.name}-${os.arch}</javacpp.platform.macosx-x86_64>
- <javacpp.platform.windows-x86_64>${os.name}-${os.arch}</javacpp.platform.windows-x86_64>
- <javacpp.platform.linux-armhf.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf.extension>
- <javacpp.platform.linux-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64.extension>
- <javacpp.platform.linux-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64.extension>
- <javacpp.platform.macosx-arm64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-arm64.extension>
- <javacpp.platform.macosx-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
- <javacpp.platform.windows-x86_64.extension>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
- </properties>
- </profile>
-
  <profile>
  <id>javacpp.platform.custom-true</id>
  <activation>

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

@@ -15,7 +15,6 @@
  <description>Platform-dependent native code and pure-Java code for the TensorFlow machine intelligence library.</description>
 
  <properties>
- <java.module.name>org.tensorflow.core.api</java.module.name>
  <ndarray.version>0.4.0</ndarray.version>
  <truth.version>1.1.5</truth.version>
  <test.download.skip>false</test.download.skip>

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

@@ -13,10 +13,6 @@
  <name>TensorFlow Generators</name>
  <description>Code generators for TensorFlow Java client</description>
 
- <properties>
- <java.module.name>org.tensorflow.core.generator</java.module.name>
- </properties>
-
  <dependencies>
  <dependency>
  <groupId>org.tensorflow</groupId>
@@ -70,17 +66,6 @@
 
  <build>
  <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
  <plugin>
  <groupId>com.diffplug.spotless</groupId>
  <artifactId>spotless-maven-plugin</artifactId>

tensorflow-core/tensorflow-core-native/pom.xml

@@ -24,7 +24,6 @@
  <dist.download.skip>false</dist.download.skip>
  <dist.download.url/>
  <dist.download.folder>${project.build.directory}/dist/</dist.download.folder>
- <java.module.name>org.tensorflow.core.native</java.module.name>
  <nativeSourceDirectory>${project.basedir}/src/main/native</nativeSourceDirectory>
  </properties>
 

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

@@ -28,7 +28,7 @@
  <name>TensorFlow API Platform</name>
 
  <properties>
- <java.module.name>org.tensorflow.core.platform</java.module.name>
+ <java.module.name>tensorflow.platform</java.module.name>
  </properties>
 
  <dependencies>

tensorflow-framework/pom.xml

@@ -35,7 +35,6 @@
 
  <properties>
  <javacpp.platform.extension></javacpp.platform.extension>
- <java.module.name>org.tensorflow.framework</java.module.name>
  </properties>
 
  <dependencies>
@@ -76,17 +75,6 @@
 
  <build>
  <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.3.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>