You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/01/10 16:24:54 UTC
[commons-crypto] branch master updated: Pick up maven-javadoc-plugin version from parent POM
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new e13443e Pick up maven-javadoc-plugin version from parent POM
e13443e is described below
commit e13443e3fca4c3f481a36f255aa484166b1dd1fe
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jan 10 11:24:50 2023 -0500
Pick up maven-javadoc-plugin version from parent POM
---
Makefile.common | 101 +++++++++++++++++++++++++++++++++-----------------------
pom.xml | 1 -
2 files changed, 59 insertions(+), 43 deletions(-)
diff --git a/Makefile.common b/Makefile.common
index 9c2068e..e4e4043 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -65,49 +65,54 @@ os_folder := $(shell echo $(OS_NAME) | tr A-Z a-z)
# cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
CROSS_PREFIX :=
-Default_CC := $(CROSS_PREFIX)gcc
-Default_CXX := $(CROSS_PREFIX)g++
-Default_STRIP := $(CROSS_PREFIX)strip
-Default_CFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
-Default_CXXFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
-Default_LINKFLAGS := -shared -static
-Default_LIBNAME := libcommons-crypto.so
+Default_CC := $(CROSS_PREFIX)gcc
+Default_CXX := $(CROSS_PREFIX)g++
+Default_STRIP := $(CROSS_PREFIX)strip
+Default_CFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
+Default_CXXFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
+Default_LINKFLAGS := -shared -static
+Default_LIBNAME := libcommons-crypto.so
+Default_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Default_COMMONS_CRYPTO_FLAGS :=
-Linux-x86_CC := $(CROSS_PREFIX)gcc
-Linux-x86_CXX := $(CROSS_PREFIX)g++
-Linux-x86_STRIP := $(CROSS_PREFIX)strip
-Linux-x86_CXXFLAGS := -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -m32
-Linux-x86_CFLAGS := -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -m32
-Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Linux-x86_LIBNAME := libcommons-crypto.so
+Linux-x86_CC := $(CROSS_PREFIX)gcc
+Linux-x86_CXX := $(CROSS_PREFIX)g++
+Linux-x86_STRIP := $(CROSS_PREFIX)strip
+Linux-x86_CXXFLAGS := -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -m32
+Linux-x86_CFLAGS := -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -m32
+Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-x86_LIBNAME := libcommons-crypto.so
+Linux-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-x86_COMMONS_CRYPTO_FLAGS:=
-Linux-x86_64_CC := $(CROSS_PREFIX)gcc
-Linux-x86_64_CXX := $(CROSS_PREFIX)g++
-Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
-Linux-x86_64_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -Wall -Werror
-Linux-x86_64_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -Wall -Werror
-Linux-x86_64_LINKFLAGS := -shared -static-libgcc
-Linux-x86_64_LIBNAME := libcommons-crypto.so
+Linux-x86_64_CC := $(CROSS_PREFIX)gcc
+Linux-x86_64_CXX := $(CROSS_PREFIX)g++
+Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
+Linux-x86_64_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -Wall -Werror
+Linux-x86_64_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -Wall -Werror
+Linux-x86_64_LINKFLAGS := -shared -static-libgcc
+Linux-x86_64_LIBNAME := libcommons-crypto.so
+Linux-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-x86_64_COMMONS_CRYPTO_FLAGS :=
-Linux-ppc_CC := gcc
-Linux-ppc_CXX := g++
-Linux-ppc_STRIP := strip
-Linux-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32
-Linux-ppc_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32
-Linux-ppc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Linux-ppc_LIBNAME := libcommons-crypto.so
+Linux-ppc_CC := gcc
+Linux-ppc_CXX := g++
+Linux-ppc_STRIP := strip
+Linux-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32
+Linux-ppc_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32
+Linux-ppc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-ppc_LIBNAME := libcommons-crypto.so
+Linux-ppc_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-ppc_COMMONS_CRYPTO_FLAGS :=
-Linux-ppc64_CC := gcc
-Linux-ppc64_CXX := g++
-Linux-ppc64_STRIP := strip
-Linux-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
-Linux-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
-Linux-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Linux-ppc64_LIBNAME := libcommons-crypto.so
+Linux-ppc64_CC := gcc
+Linux-ppc64_CXX := g++
+Linux-ppc64_STRIP := strip
+Linux-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
+Linux-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
+Linux-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-ppc64_LIBNAME := libcommons-crypto.so
+Linux-ppc64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-ppc64_COMMONS_CRYPTO_FLAGS :=
AIX-ppc64_CC := gcc
@@ -119,13 +124,14 @@ AIX-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I"$(JAVA_HOME)/includ
AIX-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ -lcrypt
AIX-ppc64_COMMONS_CRYPTO_FLAGS :=
-SunOS-x86_CC := gcc
-SunOS-x86_CXX := g++
-SunOS-x86_STRIP := strip
-SunOS-x86_CFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden
-SunOS-x86_CXXFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden
-SunOS-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-SunOS-x86_LIBNAME := libcommons-crypto.so
+SunOS-x86_CC := gcc
+SunOS-x86_CXX := g++
+SunOS-x86_STRIP := strip
+SunOS-x86_CFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden
+SunOS-x86_CXXFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden
+SunOS-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+SunOS-x86_LIBNAME := libcommons-crypto.so
+SunOS-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
SunOS-x86_COMMONS_CRYPTO_FLAGS :=
SunOS-sparc_CC := gcc
@@ -135,6 +141,7 @@ SunOS-sparc_CFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include
SunOS-sparc_CXXFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden
SunOS-sparc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
SunOS-sparc_LIBNAME := libcommons-crypto.so
+SunOS-sparc_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
SunOS-sparc_COMMONS_CRYPTO_FLAGS :=
SunOS-x86_64_CC := gcc
@@ -144,6 +151,7 @@ SunOS-x86_64_CFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/includ
SunOS-x86_64_CXXFLAGS := -include lib/inc_linux/jni_md.h -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -m64
SunOS-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
SunOS-x86_64_LIBNAME := libcommons-crypto.so
+SunOS-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
SunOS-x86_64_COMMONS_CRYPTO_FLAGS :=
# '-include lib/inc_linux/jni_md.h' is used to force the use of our version,
@@ -158,6 +166,7 @@ Linux-arm_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisi
Linux-arm_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=softfp
Linux-arm_LINKFLAGS := -shared -static-libgcc
Linux-arm_LIBNAME := libcommons-crypto.so
+Linux-arm_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-arm_COMMONS_CRYPTO_FLAGS:=
Linux-armhf_CC := $(CROSS_PREFIX)gcc
@@ -167,6 +176,7 @@ Linux-armhf_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvi
Linux-armhf_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=hard
Linux-armhf_LINKFLAGS := -shared -static-libgcc
Linux-armhf_LIBNAME := libcommons-crypto.so
+Linux-armhf_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-armhf_COMMONS_CRYPTO_FLAGS:=
Linux-aarch64_CC := $(CROSS_PREFIX)gcc
@@ -176,6 +186,7 @@ Linux-aarch64_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_ma
Linux-aarch64_CFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -Wall -Werror
Linux-aarch64_LINKFLAGS := -shared -static-libgcc
Linux-aarch64_LIBNAME := libcommons-crypto.so
+Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
Linux-aarch64_COMMONS_CRYPTO_FLAGS :=
Mac-x86_CC := gcc -arch i386
@@ -185,6 +196,7 @@ Mac-x86_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-v
Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -L/usr/local/lib
Mac-x86_LIBNAME := libcommons-crypto.jnilib
+Mac-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
Mac-x86_COMMONS_CRYPTO_FLAGS :=
Mac-x86_64_CC := gcc -arch $(OS_ARCH)
@@ -194,6 +206,7 @@ Mac-x86_64_CFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacos
Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include
Mac-x86_64_LINKFLAGS := -dynamiclib -L/usr/local/lib
Mac-x86_64_LIBNAME := libcommons-crypto.jnilib
+Mac-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
Mac-x86_64_COMMONS_CRYPTO_FLAGS :=
FreeBSD-x86_64_CC := $(CROSS_PREFIX)gcc
@@ -203,6 +216,7 @@ FreeBSD-x86_64_CFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC
FreeBSD-x86_64_CXXFLAGS := -I"$(JAVA_HOME)/include" -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
FreeBSD-x86_64_LINKFLAGS := -shared -static-libgcc
FreeBSD-x86_64_LIBNAME := libcommons-crypto.so
+FreeBSD-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so
FreeBSD-x86_64_COMMONS_CRYPTO_FLAGS :=
Windows-x86_CC := $(CROSS_PREFIX)gcc
@@ -212,6 +226,7 @@ Windows-x86_CFLAGS := -I/usr/share/mingw-w64/include -I"$(JAVA_HOME)/inclu
Windows-x86_CXXFLAGS := -I/usr/share/mingw-w64/include -I"$(JAVA_HOME)/include" -I"$(OPENSSL_HOME)/include" -Ilib/inc_win -O2 -fno-inline
Windows-x86_LINKFLAGS := -Wl,--kill-at -shared -static
Windows-x86_LIBNAME := commons-crypto.dll
+Windows-x86_LIBNAME_OSSL3 := commons-crypto-ossl3.dll
Windows-x86_COMMONS_CRYPTO_FLAGS :=
Windows-x86_64_CC := $(CROSS_PREFIX)gcc
@@ -221,6 +236,7 @@ Windows-x86_64_CFLAGS := -I/usr/share/mingw-w64/include -I"$(JAVA_HOME)/in
Windows-x86_64_CXXFLAGS := -I/usr/share/mingw-w64/include -I"$(JAVA_HOME)/include" -I"$(OPENSSL_HOME)/include" -Ilib/inc_win -O2 -fno-inline
Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static
Windows-x86_64_LIBNAME := commons-crypto.dll
+Windows-x86_64_LIBNAME_OSSL3 := commons-crypto-ossl3.dll
Windows-x86_64_COMMONS-CRYPTO_FLAGS :=
@@ -232,6 +248,7 @@ CFLAGS := $($(os_arch)_CFLAGS)
CXXFLAGS := $($(os_arch)_CXXFLAGS)
LINKFLAGS := $($(os_arch)_LINKFLAGS)
LIBNAME := $($(os_arch)_LIBNAME)
+LIBNAME_OSSL3 := $($(os_arch)_LIBNAME_OSSL3)
COMMONS-CRYPTO_FLAGS := $($(os_arch)_COMMONS-CRYPTO_FLAGS)
diff --git a/pom.xml b/pom.xml
index 7f059d4..8267f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,6 @@ The following provides more details on the included cryptographic software:
<commons.pmd.version>3.19.0</commons.pmd.version>
<commons.pmd-impl.version>6.52.0</commons.pmd-impl.version>
- <commons.javadoc.version>3.4.1</commons.javadoc.version>
<japicmp.skip>false</japicmp.skip>
<commons.japicmp.version>0.17.1</commons.japicmp.version>
<commons.spotbugs.version>4.7.3.0</commons.spotbugs.version>