Unnecessary profiles; use -Dtarget.name instead (#263)

* Unnecessary profiles; use -Dtarget.name instead These profiles just clutter the pom. in any case, they don't cover all possible target names
apache · Nov 14, 2023 · 5d7f69d · 5d7f69d
1 parent 444f98b
commit 5d7f69d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 74 deletions.
diff --git a/pom.xml b/pom.xml
@@ -145,72 +145,6 @@ The following provides more details on the included cryptographic software:
   </properties>
 
   <profiles>
-    <profile>
-      <id>win32</id>
-      <properties>
-        <target.name>win32</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>win64</id>
-      <properties>
-        <target.name>win64</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>mac32</id>
-      <properties>
-        <target.name>mac32</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>mac64</id>
-      <properties>
-        <target.name>mac64</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>macArm64</id>
-      <properties>
-        <target.name>macArm64</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux32</id>
-      <properties>
-        <target.name>linux32</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux64</id>
-      <properties>
-        <target.name>linux64</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux-arm</id>
-      <properties>
-        <target.name>linux-arm</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux-armhf</id>
-      <properties>
-        <target.name>linux-armhf</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux-aarch64</id>
-      <properties>
-        <target.name>linux-aarch64</target.name>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux-riscv64</id>
-      <properties>
-        <target.name>linux-riscv64</target.name>
-      </properties>
-    </profile>
     <profile>
       <id>jacoco</id>
       <activation>

diff --git a/src/docker/build.sh b/src/docker/build.sh
@@ -28,18 +28,18 @@ cp /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl
 mvn -V -B -ntp clean package -Drat.skip
 
 # use process-classes rather than package to speed up builds
-mvn -DskipTests -Drat.skip process-classes -P linux-aarch64
-mvn -DskipTests -Drat.skip process-classes -P linux-riscv64
-mvn -DskipTests -Drat.skip process-classes -P win64
-mvn -DskipTests -Drat.skip process-classes -P linux64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-aarch64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-riscv64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=win64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux64
 
 # Ensure the correct config file is installed
 cp /usr/include/i386-linux-gnu/openssl/opensslconf.h /usr/include/openssl
 
 # Run the 32-bit builds.
-mvn -DskipTests -Drat.skip process-classes -P linux-armhf
-mvn -DskipTests -Drat.skip process-classes -P linux-arm
-mvn -DskipTests -Drat.skip process-classes -P win32
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-armhf
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-arm
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=win32
 
 # see separate script for optional linux32 build
 

diff --git a/src/docker/build_linux32.sh b/src/docker/build_linux32.sh
@@ -29,7 +29,7 @@ cp /usr/include/i386-linux-gnu/openssl/opensslconf.h /usr/include/openssl
 # Needed for linux32, but causes linux 64 builds to fail
 apt-get --assume-yes install g++-multilib
 
-mvn -DskipTests package -P linux32
+mvn -DskipTests package -Dtarget.name=linux32
 
 # Show generated files
 find target/classes/org/apache/commons/crypto/native -type f -ls