diff --git a/pom.xml b/pom.xml index daffa093f..dd605c0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -145,72 +145,6 @@ The following provides more details on the included cryptographic software: - - win32 - - win32 - - - - win64 - - win64 - - - - mac32 - - mac32 - - - - mac64 - - mac64 - - - - macArm64 - - macArm64 - - - - linux32 - - linux32 - - - - linux64 - - linux64 - - - - linux-arm - - linux-arm - - - - linux-armhf - - linux-armhf - - - - linux-aarch64 - - linux-aarch64 - - - - linux-riscv64 - - linux-riscv64 - - jacoco diff --git a/src/docker/build.sh b/src/docker/build.sh index fb240dbcd..c032fb4ed 100755 --- 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 index 4077bea37..1d14ca9d0 100755 --- 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