[commons-parent] branch master updated: Bump some dependencies
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-parent.git The following commit(s) were added to refs/heads/master by this push: new 89cb1c4 Bump some dependencies 89cb1c4 is described below commit 89cb1c44fe31b32bc145b8028d357eaf97696c0c Author: Gary Gregory AuthorDate: Mon Oct 23 18:07:26 2023 -0400 Bump some dependencies - maven-failsafe-plugin from 3.1.2 to 3.2.1 - maven-jxr-plugin from 3.3.0 to 3.3.1 - maven-surefire-plugin from 3.1.2 to 3.2.1 - maven-surefire-report-plugin from 3.1.2 to 3.2.1 --- pom.xml | 8 src/changes/changes.xml | 4 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 04a12fa..1a23ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -147,13 +147,13 @@ 3.11.0 2.7.9 0.7.0 -3.1.2 +3.2.1 5.1.9 0.8.11 0.18.2 3.3.0 3.6.0 -3.3.0 +3.3.1 3.21.0 6.55.0 3.4.5 @@ -206,8 +206,8 @@ 3.12.1 4.7.3.6 4.8.0 -3.1.2 -3.1.2 +3.2.1 +3.2.1 3.5.3 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 117054d..8f57c01 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -64,6 +64,10 @@ The type attribute can be add,update,fix,remove. Bump com.github.spotbugs:spotbugs from 4.7.3 to 4.8.0 #317. Bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.11 #321. Bump com.github.siom79.japicmp:japicmp-maven-plugin from 0.18.1 to 0.18.2 #320. + Bump maven-failsafe-plugin from 3.1.2 to 3.2.1. + Bump maven-jxr-plugin from 3.3.0 to 3.3.1. + Bump maven-surefire-plugin from 3.1.2 to 3.2.1. + Bump maven-surefire-report-plugin from 3.1.2 to 3.2.1.
[commons-crypto] branch master updated: Better name
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 2d6f82f Better name 2d6f82f is described below commit 2d6f82fb47a0ddc8a6659203906f624a4f3f0f0e Author: Gary Gregory AuthorDate: Mon Oct 23 17:50:14 2023 -0400 Better name --- Makefile.common | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.common b/Makefile.common index d6043a8..fd2f18d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -189,15 +189,15 @@ Linux-aarch64_LIBNAME := libcommons-crypto.so Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so Linux-aarch64_COMMONS_CRYPTO_FLAGS := -ifndef Mac-INC_OPENSSL -Mac-INC_OPENSSL := /usr/local/opt/openssl/include +ifndef Mac_INC_OPENSSL +Mac_INC_OPENSSL := /usr/local/opt/openssl/include endif Mac-x86_CC:= gcc -arch i386 Mac-x86_CXX := g++ -arch i386 Mac-x86_STRIP := strip -x -Mac-x86_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) -Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) +Mac-x86_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac_INC_OPENSSL) +Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac_INC_OPENSSL) Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -L/usr/local/lib Mac-x86_LIBNAME := libcommons-crypto.jnilib Mac-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib @@ -206,8 +206,8 @@ Mac-x86_COMMONS_CRYPTO_FLAGS := Mac-x86_64_CC:= gcc -arch $(OS_ARCH) Mac-x86_64_CXX := gcc -arch $(OS_ARCH) Mac-x86_64_STRIP := strip -x -Mac-x86_64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) -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$(Mac-INC_OPENSSL) +Mac-x86_64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include -I$(Mac_INC_OPENSSL) +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$(Mac_INC_OPENSSL) 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 @@ -216,8 +216,8 @@ Mac-x86_64_COMMONS_CRYPTO_FLAGS := Mac-arm64_CC:= gcc -arch $(OS_ARCH) Mac-arm64_CXX := gcc -arch $(OS_ARCH) Mac-arm64_STRIP := strip -x -Mac-arm64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) -Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) +Mac-arm64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac_INC_OPENSSL) +Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac_INC_OPENSSL) Mac-arm64_LINKFLAGS := -dynamiclib -L/usr/local/lib Mac-arm64_LIBNAME := libcommons-crypto.jnilib Mac-arm64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
[commons-crypto] branch master updated: Paramertize looking for OpenSSL headers on macOS
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 b7e85f2 Paramertize looking for OpenSSL headers on macOS b7e85f2 is described below commit b7e85f20413487ccb99e1750c0b55cc71bf53ec1 Author: Gary Gregory AuthorDate: Mon Oct 23 17:39:17 2023 -0400 Paramertize looking for OpenSSL headers on macOS --- Makefile.common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.common b/Makefile.common index ec820e5..d6043a8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -189,7 +189,9 @@ Linux-aarch64_LIBNAME := libcommons-crypto.so Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so Linux-aarch64_COMMONS_CRYPTO_FLAGS := +ifndef Mac-INC_OPENSSL Mac-INC_OPENSSL := /usr/local/opt/openssl/include +endif Mac-x86_CC:= gcc -arch i386 Mac-x86_CXX := g++ -arch i386
[commons-crypto] branch master updated: Define and reuse Mac-INC_OPENSSL
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 48d11ec Define and reuse Mac-INC_OPENSSL 48d11ec is described below commit 48d11ec41096074930a37c14ba15917f3d9acae8 Author: Gary Gregory AuthorDate: Mon Oct 23 17:04:36 2023 -0400 Define and reuse Mac-INC_OPENSSL --- Makefile.common | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.common b/Makefile.common index 3d70ea2..ec820e5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -189,11 +189,13 @@ Linux-aarch64_LIBNAME := libcommons-crypto.so Linux-aarch64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.so Linux-aarch64_COMMONS_CRYPTO_FLAGS := +Mac-INC_OPENSSL := /usr/local/opt/openssl/include + Mac-x86_CC:= gcc -arch i386 Mac-x86_CXX := g++ -arch i386 Mac-x86_STRIP := strip -x -Mac-x86_CFLAGS:= -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_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_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) +Mac-x86_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc -L/usr/local/lib Mac-x86_LIBNAME := libcommons-crypto.jnilib Mac-x86_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib @@ -202,8 +204,8 @@ Mac-x86_COMMONS_CRYPTO_FLAGS := Mac-x86_64_CC:= gcc -arch $(OS_ARCH) Mac-x86_64_CXX := gcc -arch $(OS_ARCH) Mac-x86_64_STRIP := strip -x -Mac-x86_64_CFLAGS:= -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_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_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) +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$(Mac-INC_OPENSSL) 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 @@ -212,8 +214,8 @@ Mac-x86_64_COMMONS_CRYPTO_FLAGS := Mac-arm64_CC:= gcc -arch $(OS_ARCH) Mac-arm64_CXX := gcc -arch $(OS_ARCH) Mac-arm64_STRIP := strip -x -Mac-arm64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include -Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include +Mac-arm64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) +Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I$(Mac-INC_OPENSSL) Mac-arm64_LINKFLAGS := -dynamiclib -L/usr/local/lib Mac-arm64_LIBNAME := libcommons-crypto.jnilib Mac-arm64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib
[commons-crypto] branch master updated: Add experimental builds for Apple Silicon
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 57ca7a5 Add experimental builds for Apple Silicon 57ca7a5 is described below commit 57ca7a59038f3b8769be13662c52bb938cf93fcb Author: Gary Gregory AuthorDate: Mon Oct 23 15:32:38 2023 -0400 Add experimental builds for Apple Silicon --- .github/workflows/maven.yml | 6 -- 1 file changed, 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2e3d63b..f918d77 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,12 +45,6 @@ jobs: - java: 21 os: macos-13-arm64 experimental: true - - java: 21 -os: macos-13-arm64 -experimental: true - - java: 21 -os: macos-13-arm64 -experimental: true #include: # - java: 22-ea #os: ubuntu-20.04
[commons-crypto] branch master updated: Add experimental builds for Apple Silicon
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 05acd81 Add experimental builds for Apple Silicon 05acd81 is described below commit 05acd81acbd3149762bd70affb12cd7f17def113 Author: Gary Gregory AuthorDate: Mon Oct 23 15:31:39 2023 -0400 Add experimental builds for Apple Silicon --- .github/workflows/maven.yml | 10 ++ Makefile| 3 +++ Makefile.common | 12 +++- pom.xml | 8 +++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dc5cf37..2e3d63b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,6 +41,16 @@ jobs: # These names are used in conditional statements below. java: [ 8, 11, 17, 21 ] experimental: [false] +include: + - java: 21 +os: macos-13-arm64 +experimental: true + - java: 21 +os: macos-13-arm64 +experimental: true + - java: 21 +os: macos-13-arm64 +experimental: true #include: # - java: 22-ea #os: ubuntu-20.04 diff --git a/Makefile b/Makefile index a839b95..c3419cf 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,9 @@ mac32: mac64: $(MAKE) native OS_NAME=Mac OS_ARCH=x86_64 +macArm64: + $(MAKE) native OS_NAME=Mac OS_ARCH=arm64-apple-macos11 + linux32: $(MAKE) native OS_NAME=Linux OS_ARCH=x86 diff --git a/Makefile.common b/Makefile.common index 1dc075c..3d70ea2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -53,7 +53,7 @@ endif # os=Default is meant to be generic Unix/Linux -known_os_archs := Linux-x86 Linux-x86_64 Linux-aarch64 Linux-arm Linux-armhf Linux-ppc Linux-ppc64 Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc64 +known_os_archs := Linux-x86 Linux-x86_64 Linux-aarch64 Linux-arm Linux-armhf Linux-ppc Linux-ppc64 Mac-x86 Mac-x86_64 Mac-arm64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc64 os_arch := $(OS_NAME)-$(OS_ARCH) ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs))) @@ -209,6 +209,16 @@ Mac-x86_64_LIBNAME := libcommons-crypto.jnilib Mac-x86_64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib Mac-x86_64_COMMONS_CRYPTO_FLAGS := +Mac-arm64_CC:= gcc -arch $(OS_ARCH) +Mac-arm64_CXX := gcc -arch $(OS_ARCH) +Mac-arm64_STRIP := strip -x +Mac-arm64_CFLAGS:= -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include +Mac-arm64_CXXFLAGS := -Ilib/inc_mac -I"$(JAVA_HOME)/include" -O2 -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden -I/usr/local/include -I/usr/local/opt/openssl/include +Mac-arm64_LINKFLAGS := -dynamiclib -L/usr/local/lib +Mac-arm64_LIBNAME := libcommons-crypto.jnilib +Mac-arm64_LIBNAME_OSSL3 := libcommons-crypto-ossl3.jnilib +Mac-arm64_COMMONS_CRYPTO_FLAGS := + FreeBSD-x86_64_CC := $(CROSS_PREFIX)gcc FreeBSD-x86_64_CXX := $(CROSS_PREFIX)g++ FreeBSD-x86_64_STRIP:= $(CROSS_PREFIX)strip diff --git a/pom.xml b/pom.xml index f1ee9d7..9242412 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ The following provides more details on the included cryptographic software: true 5.13.0 - all @@ -291,6 +291,12 @@ The following provides more details on the included cryptographic software: mac64 + + macArm64 + +macArm64 + + linux32
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons DBCP 2.11.0 RC1 Deployer properties:"userAgent" = "Apache-Maven/3.9.5 (Java 21; Mac OS X 14.0)""userId" = "ggregory""ip" = "98.180.65.92"Details:The following artifacts have been staged/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-javadoc.jar.asc(SHA1: 225ea7bdea3709d8b731c8d93110f9dadc2b4eea)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-cyclonedx.xml(SHA1: f18f905390e0ab3cfa57c30e7c7f6c3e22b448c1)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-cyclonedx.json.asc(SHA1: d815c980bab1b3b59387efc327d24ba42d50e0fc)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.pom(SHA1: 215f8a0321ea4afc9f7dd56dd2850ccf79acc80a)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-sources.jar.asc(SHA1: 7b4b8aac171b812794077b7e838c2731b8752923)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-tests.jar.asc(SHA1: 74cfda79867c160ba96f89b4b5d0bb7a07b048ff)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.jar.asc(SHA1: 715431fcfa0eae7d526826116edfbcbd302f2daa)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-cyclonedx.json(SHA1: 3eab98c6e5b4134ef6659d74f4f04ca36319b01a)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.jar(SHA1: 5553126edbdc3d2dd24118f687d09d6d066fca1b)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-cyclonedx.xml.asc(SHA1: 2d587ecc0e67bc49a81668104adb242c826dd1b1)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-sources.jar(SHA1: 37326f31955699606c5b61a039b58e02f0caf2f8)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-javadoc.jar(SHA1: c7c32603a145dc2e63693950cf25fe6e595078fb)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.spdx.rdf.xml(SHA1: 43e13fdbb8bbd8ad909b3d0c6a49a338d28da50a)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-test-sources.jar.asc(SHA1: 189f1632045ac0ec75e1bca65fce9314f514b070)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-tests.jar(SHA1: 243ecdab117a99ff7d05c2b8a777a257ace8fcdc)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.spdx.rdf.xml.asc(SHA1: edd373b21c8a5b49b672f8923faa7e25ed797282)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0-test-sources.jar(SHA1: be484f6c65b58cd8c86c6cec86f84171261d948b)/org/apache/commons/commons-dbcp2/2.11.0/commons-dbcp2-2.11.0.pom.asc(SHA1: fe148debe05999b7eaf7fc1d0fdf0ad9a813244b)Action performed by Gary D. Gregory (ggregory)
svn commit: r64680 - in /dev/commons/dbcp/2.11.0-RC1: ./ binaries/ site/ site/apidocs/ site/apidocs/legal/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/apidocs/org/
Author: ggregory Date: Mon Oct 23 17:38:37 2023 New Revision: 64680 Log: Staging release: commons-dbcp2, version: 2.11.0 [This commit notification would consist of 159 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[commons-dbcp] annotated tag commons-dbcp-2.11.0-RC1 created (now 308d69b2)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag commons-dbcp-2.11.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git at 308d69b2 (tag) tagging e57ce3cf019ffa9534b88735c454c54afbe9849f (commit) replaces rel/commons-dbcp-2.10.0 by Gary Gregory on Mon Oct 23 13:31:18 2023 -0400 - Log - Tag Apache Commons DBCP release 2.11.0 RC1 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmU2reYACgkQhv3H4qES Yssafwf/V/4YrFTGNc1Bb5m52LJ/2PZaCcICJmGmT9u5SYq++lVocNBlAtZ2RoYQ ev3tgDW87lyywcH7xntncWwtAiyIr1C8RpTZejzGyn6PEBrAYWoFmgXcfSF2R3AP oZPa8V7KoN72JYjsIo/vr9BMYulxvmDdbjX4AY6s51pjGmt6oT0Et0VgjuD6ddB0 3GHlP/ClgeofK8NxrBQEqwXxluVg+aUJI69mJCBzI2UD8i92On/rE++cnQLoWNL2 71HMJQQ6GhiPgYe9lUh7B8niUa0+qQs7ofWhSCEbn69BPB10b5f9u9dnKBpxhe1d ejSPnR4StHnR0IXJni7V+IUGZz5XQw== =egat -END PGP SIGNATURE- --- This annotated tag includes the following new commits: new e57ce3cf Update POM version for Apache Commons DBCP release 2.11.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[commons-dbcp] 01/01: Update POM version for Apache Commons DBCP release 2.11.0
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to annotated tag commons-dbcp-2.11.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git commit e57ce3cf019ffa9534b88735c454c54afbe9849f Author: Gary Gregory AuthorDate: Mon Oct 23 13:30:39 2023 -0400 Update POM version for Apache Commons DBCP release 2.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cdd80bc..57fd30c9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 commons-dbcp2 - 2.11.0-SNAPSHOT + 2.11.0 Apache Commons DBCP 2001
[commons-dbcp] branch master updated: Prepare for the next release candidate
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-dbcp.git The following commit(s) were added to refs/heads/master by this push: new 320c62fd Prepare for the next release candidate 320c62fd is described below commit 320c62fdc51bead3955834799dabf10a03ff69a7 Author: Gary Gregory AuthorDate: Mon Oct 23 13:20:35 2023 -0400 Prepare for the next release candidate --- README.md | 78 ++--- RELEASE-NOTES.txt | 31 src/changes/changes.xml | 2 +- src/changes/release-notes.vm| 1 + src/site/xdoc/download_dbcp.xml | 26 +++--- src/site/xdoc/mail-lists.xml| 38 ++-- 6 files changed, 82 insertions(+), 94 deletions(-) diff --git a/README.md b/README.md index d84859ff..b22e2f09 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Apache Commons DBCP [](https://github.com/apache/commons-dbcp/actions/workflows/maven.yml) [](https://app.codecov.io/gh/apache/commons-dbcp) [](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-dbcp2/?gav=true) -[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.10.0) +[](https://javadoc.io/doc/org.apache.commons/commons-dbcp2/2.11.0) [](https://github.com/apache/commons-dbcp/actions/workflows/codeql-analysis.yml) [](https://api.securityscorecards.dev/projects/github.com/apache/commons-dbcp) @@ -59,8 +59,8 @@ More information can be found on the [Apache Commons DBCP homepage](https://comm The [Javadoc](https://commons.apache.org/proper/commons-dbcp/apidocs) can be browsed. Questions related to the usage of Apache Commons DBCP should be posted to the [user mailing list][ml]. -Where can I get the latest release? +Getting the latest release +-- You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-dbcp/download_dbcp.cgi). Alternatively, you can pull it from the central Maven repositories: @@ -69,17 +69,25 @@ Alternatively, you can pull it from the central Maven repositories: org.apache.commons commons-dbcp2 - 2.10.0 + 2.11.0 ``` +Building + + +Building requires a Java JDK and [Apache Maven](https://maven.apache.org/). +The required Java version is found in the `pom.xml` as the `maven.compiler.source` property. + +From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks. + Contributing We accept Pull Requests via GitHub. The [developer mailing list](https://commons.apache.org/mail-lists.html) is the main channel of communication for contributors. There are some guidelines which will make applying PRs easier for us: + No tabs! Please use spaces for indentation. -+ Respect the code style. ++ Respect the existing code style for each file. + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. + Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```. @@ -88,13 +96,13 @@ You can learn more about contributing via GitHub in our [contribution guidelines License --- -This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). +This code is licensed under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). See the `NOTICE.txt` file for required notices and attributions. -Donations -- -You like Apache Commons DBCP? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development. +Donating + +You like Apache Commons DBCP? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support development. Additional Resources @@ -108,54 +116,4 @@ Additional Resources Apache Commons Components - -| Component | GitHub Repository | Apache Homepage | -| - | - | | -| Apache Commons BCEL | [commons-bcel]
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close Apache Commons CLI 1.6.0 Deployer properties:"userAgent" = "Apache-Maven/3.9.5 (Java 21; Mac OS X 14.0)""userId" = "ggregory""ip" = "98.180.65.92"Details:The following artifacts have been staged/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.pom.asc(SHA1: 05520d551693a68a5c67235adaea4bc9c4ff9829)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.jar.asc(SHA1: e876df87aa668e2a9b5f01ee3fc2cf8dcd850d9c)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-cyclonedx.xml.asc(SHA1: 3f93b5e8347bc73de6e437c4644fa0ab9970250b)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-cyclonedx.xml(SHA1: f3a886a835d73dd34794d208e7e519f0cbfdc23e)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.jar(SHA1: 38166a23afb5bd5520f739b87b3be87f7f0fb96d)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-javadoc.jar(SHA1: 8949924ed15e959894c4bf87601990d8a8da6a7b)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-sources.jar.asc(SHA1: cf86b925c46ad9301a8ffbbaeb22ddd112dd2402)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-cyclonedx.json.asc(SHA1: 0a8308a4b7367cbd7b29c6af58a754853ada86de)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-test-sources.jar.asc(SHA1: dfd13b5bb833edd1019c7b05e7841fcd35130967)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.spdx.json.asc(SHA1: b6a95307035cfcdd355c1fad43f4ea91689d48df)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.spdx.json(SHA1: b35ec55996cf5602219148f3343188333bbaf64d)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-test-sources.jar(SHA1: 14c2a39a73c2441f76a84949df3014a62253)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-javadoc.jar.asc(SHA1: e3f733bdcbfa2ba1ec8487c2c75f12c073076b8a)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-tests.jar(SHA1: 0ea50cb79c974d4e9a85fd097c64fbee0500bddc)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0.pom(SHA1: 9e6b0715c07684e0f55960cfc17f7538dbc8a4f3)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-sources.jar(SHA1: 1aff83a90fe36191684d5384f115b338c84f8ec6)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-tests.jar.asc(SHA1: 19c7205300a5e0a28c5af757eccdb38732cd3150)/commons-cli/commons-cli/1.6.0/commons-cli-1.6.0-cyclonedx.json(SHA1: af1204631815a304bb6196bdaae9aa0a23c2ed5f)Action performed by Gary D. Gregory (ggregory)
svn commit: r64679 - in /dev/commons/cli/1.6.0-RC1: ./ binaries/ site/ site/apidocs/ site/apidocs/legal/ site/apidocs/org/ site/apidocs/org/apache/ site/apidocs/org/apache/commons/ site/apidocs/org/ap
Author: ggregory Date: Mon Oct 23 17:00:20 2023 New Revision: 64679 Log: Staging release: commons-cli, version: 1.6.0 [This commit notification would consist of 76 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[commons-cli] 01/04: Update POM version numbers for Apache release 1.5.0
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to annotated tag commons-cli-1.6.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-cli.git commit 4990187649bd2f2030920aba39878d724deba9b4 Author: Gary Gregory AuthorDate: Sat Oct 23 09:17:48 2021 -0400 Update POM version numbers for Apache release 1.5.0 --- RELEASE-NOTES.txt | 2 +- pom.xml| 2 +- src/site/xdoc/download_cli.xml | 230 - 3 files changed, 117 insertions(+), 117 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e8a5cc4..befcd1e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,5 @@ Apache Commons CLI -Version 1.5.0-SNAPSHOT +Version 1.5.0 Release Notes diff --git a/pom.xml b/pom.xml index 615b1ce..1a368fc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 commons-cli commons-cli - 1.5.0-SNAPSHOT + 1.5.0 Apache Commons CLI 2002 diff --git a/src/site/xdoc/download_cli.xml b/src/site/xdoc/download_cli.xml index 845cc7f..9f6cbc9 100644 --- a/src/site/xdoc/download_cli.xml +++ b/src/site/xdoc/download_cli.xml @@ -1,118 +1,118 @@ - - - - - -Download Apache Commons CLI -Apache Commons Documentation Team - - - - - -We recommend you use a mirror to download our release -builds, but you must https://www.apache.org/info/verification.html";>verify the integrity of -the downloaded files using signatures downloaded from our main -distribution directories. Recent releases (48 hours) may not yet -be available from all the mirrors. - - - -You are currently using [preferred]. If you -encounter a problem with this mirror, please select another -mirror. If all mirrors are failing, there are backup -mirrors (at the end of the mirrors list) that should be -available. - -[if-any logo][end] - - - - - Other mirrors: - - [if-any http] -[for http][http][end] - [end] - [if-any ftp] -[for ftp][ftp][end] - [end] - [if-any backup] -[for backup][backup] (backup)[end] - [end] - - - - - - -It is essential that you -https://www.apache.org/info/verification.html";>verify the integrity -of downloaded files, preferably using the PGP signature (*.asc files); -failing that using the SHA512 hash (*.sha512 checksum files). - - -The https://www.apache.org/dist/commons/KEYS";>KEYS -file contains the public PGP keys used by Apache Commons developers -to sign releases. - - - + + + + + +Download Apache Commons CLI +Apache Commons Documentation Team + + + + + +We recommend you use a mirror to download our release +builds, but you must https://www.apache.org/info/verification.html";>verify the integrity of +the downloaded files using signatures downloaded from our main +distribution directories. Recent releases (48 hours) may not yet +be available from all the mirrors. + + + +You are currently using [preferred]. If you +encounter a problem with this mirror, please select another +mirror. If all mirrors are failing, there are backup +mirrors (at the end of the mirrors list) that should be +available. + +[if-any logo][end] + + + + + Other mirrors: + + [if-any http] +[for http][http][end] + [end] + [if-any ftp] +[for ftp][ftp][end] + [end] + [if-any backup] +[for backup][backup] (backup)[end] + [end] + + + + + + +It is essential that you +https://www.apache.org/info/verification.html";>verify the integrity +of downloaded files, preferably using the PGP signature (*.asc files); +failing that using the SHA512 hash (*.sha512 checksum files). + + +The https://www.apache.org/dist/commons/KEYS";>KEYS +file contains the public PGP keys used by Apache Commons developers +to sign releases. + + +
[commons-cli] 04/04: Remove duplicate property
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to annotated tag commons-cli-1.6.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-cli.git commit 0d29a55998aa52be8832497527e266630f97c371 Author: Gary Gregory AuthorDate: Mon Oct 23 12:55:19 2023 -0400 Remove duplicate property --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index cfe7ca8..8ae2a49 100644 --- a/pom.xml +++ b/pom.xml @@ -208,8 +208,6 @@ org.apache.commons.cli CLI 12310463 - -RC1 https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-cli site-content utf-8
[commons-cli] 02/04: Merge branch 'master' into release
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to annotated tag commons-cli-1.6.0-RC1
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
commit 0f36e628a7f7cfd966540be0cd20a0ad10ce213e
Merge: 4990187 e17fee4
Author: Gary Gregory
AuthorDate: Mon Oct 23 09:53:45 2023 -0400
Merge branch 'master' into release
.asf.yaml | 28 +-
.travis.yml => .github/GH-ROBOTS.txt | 47 +-
.github/dependabot.yml | 6 +-
.github/workflows/codeql-analysis.yml | 85 +++
.github/workflows/{maven.yml => coverage.yml} | 29 +-
.github/workflows/maven.yml| 97 +--
.github/workflows/scorecards-analysis.yml | 69 ++
.gitignore | 7 +-
CONTRIBUTING.md| 2 +-
NOTICE.txt | 2 +-
README.md | 47 +-
RELEASE-NOTES.txt | 73 +-
pom.xml| 72 +-
src/changes/changes.xml| 824 -
src/changes/release-notes.vm | 2 +-
src/conf/checkstyle.xml| 257 ---
.../java/org/apache/commons/cli/CommandLine.java | 93 +--
.../java/org/apache/commons/cli/DefaultParser.java | 6 +-
.../java/org/apache/commons/cli/HelpFormatter.java | 14 +-
src/main/java/org/apache/commons/cli/Option.java | 34 +-
.../java/org/apache/commons/cli/OptionBuilder.java | 2 +-
src/main/java/org/apache/commons/cli/Options.java | 7 +-
src/main/java/org/apache/commons/cli/Parser.java | 15 +
.../apache/commons/cli/PatternOptionBuilder.java | 9 +-
.../java/org/apache/commons/cli/TypeHandler.java | 26 +-
src/main/java/org/apache/commons/cli/Util.java | 6 +-
src/site/xdoc/download_cli.xml | 256 +++
src/site/xdoc/index.xml| 6 +-
src/site/xdoc/issue-tracking.xml | 2 +-
src/site/xdoc/mail-lists.xml | 40 +-
src/site/xdoc/usage.xml| 14 +-
...erTestCase.java => AbstractParserTestCase.java} | 24 +-
.../org/apache/commons/cli/ApplicationTest.java| 10 +-
.../org/apache/commons/cli/BasicParserTest.java| 8 +-
.../org/apache/commons/cli/CommandLineTest.java| 25 +
.../org/apache/commons/cli/DefaultParserTest.java | 4 +-
.../java/org/apache/commons/cli/GnuParserTest.java | 8 +-
.../org/apache/commons/cli/HelpFormatterTest.java | 13 +-
.../java/org/apache/commons/cli/OptionTest.java| 38 +-
.../org/apache/commons/cli/PosixParserTest.java| 8 +-
.../org/apache/commons/cli/TypeHandlerTest.java| 65 +-
.../java/org/apache/commons/cli/ValuesTest.java| 4 +-
.../org/apache/commons/cli/bug/BugCLI162Test.java | 2 +-
.../org/apache/commons/cli/bug/BugCLI252Test.java | 10 +-
.../java/org/apache/commons/cli/bug/BugsTest.java | 4 +
45 files changed, 1410 insertions(+), 990 deletions(-)
[commons-cli] 03/04: Update POM version for Apache Commons CLI release 1.6.0
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to annotated tag commons-cli-1.6.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-cli.git commit e59f2aabdffac5fcdf6108f3d4a0327afdfd36ce Author: Gary Gregory AuthorDate: Mon Oct 23 12:51:54 2023 -0400 Update POM version for Apache Commons CLI release 1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ebca44..cfe7ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 commons-cli commons-cli - 1.6.0-SNAPSHOT + 1.6.0 Apache Commons CLI 2002
[commons-cli] annotated tag commons-cli-1.6.0-RC1 created (now 47e00d4)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to annotated tag commons-cli-1.6.0-RC1 in repository https://gitbox.apache.org/repos/asf/commons-cli.git at 47e00d4 (tag) tagging 0d29a55998aa52be8832497527e266630f97c371 (commit) replaces commons-cli-1.5.0 by Gary Gregory on Mon Oct 23 12:55:56 2023 -0400 - Log - Tag Apache Commons CLI release 1.6.0 RC1 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmU2pZwACgkQhv3H4qES Ysu8pAf+LEh3iEGDDoXE43dF8klj6ZSbG30a87RVfqbtFrjpDOIl5gCR/f7WG9Av tm1RTzpKtNMxiVsvQWQe5Fng2hJ1dokN7DY+0C/1n7fw4Bq9IgyTEi61JJDfttVw C6L+kRF8iS10H8WhrXaFNqj4ND1bD4qp1VDYWytWFldW4s41HQkmaXhmeXk+7SHe 9tw7XSf4Z5TKeaprTJtOcfy2vt+kUP3cLxzDYoe54HAtAz49dj7HzviHXz+CtgjY mdAM7TK7qTjUrxKRjiI3zbuVYStRdvxpqDLS2IfIC/1Xc/FdfakKwtYNMKajAu8f mTNkyjbXi9Kc2AE8zalGk3JThqIRZA== =kJnF -END PGP SIGNATURE- --- This annotated tag includes the following new commits: new 4990187 Update POM version numbers for Apache release 1.5.0 new 0f36e62 Merge branch 'master' into release new e59f2aa Update POM version for Apache Commons CLI release 1.6.0 new 0d29a55 Remove duplicate property The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[commons-dbcp] 02/06: Update call sites of deprecated APIs from Apache Commons Pool
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-dbcp.git commit c7e6989fa62a45717f3d4190e7b545f3647c35f4 Author: Gary Gregory AuthorDate: Mon Oct 23 12:43:30 2023 -0400 Update call sites of deprecated APIs from Apache Commons Pool --- .../org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java index 4abecb5e..9ec3451b 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -126,7 +126,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable private boolean defaultTestOnBorrow = BaseObjectPoolConfig.DEFAULT_TEST_ON_BORROW; private boolean defaultTestOnReturn = BaseObjectPoolConfig.DEFAULT_TEST_ON_RETURN; private boolean defaultTestWhileIdle = BaseObjectPoolConfig.DEFAULT_TEST_WHILE_IDLE; -private Duration defaultDurationBetweenEvictionRuns = BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS; +private Duration defaultDurationBetweenEvictionRuns = BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS; // Connection factory properties private String validationQuery;
[commons-dbcp] 03/06: Update call sites of deprecated APIs from Apache Commons Pool
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-dbcp.git
commit 4e6a616c675c83b25b0d5caa31dc8c91f722a055
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:43:35 2023 -0400
Update call sites of deprecated APIs from Apache Commons Pool
---
.../apache/commons/dbcp2/datasources/PerUserPoolDataSource.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
index bce6ef95..dbc4ed3c 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
@@ -724,16 +724,16 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
pool.setLifo(getPerUserLifo(userName));
pool.setMaxIdle(getPerUserMaxIdle(userName));
pool.setMaxTotal(getPerUserMaxTotal(userName));
-pool.setMaxWait(Duration.ofMillis(getPerUserMaxWaitMillis(userName)));
-pool.setMinEvictableIdle(getPerUserMinEvictableIdleDuration(userName));
+pool.setMaxWait(getPerUserMaxWaitDuration(userName));
+
pool.setMinEvictableIdleDuration(getPerUserMinEvictableIdleDuration(userName));
pool.setMinIdle(getPerUserMinIdle(userName));
pool.setNumTestsPerEvictionRun(getPerUserNumTestsPerEvictionRun(userName));
-
pool.setSoftMinEvictableIdle(getPerUserSoftMinEvictableIdleDuration(userName));
+
pool.setSoftMinEvictableIdleDuration(getPerUserSoftMinEvictableIdleDuration(userName));
pool.setTestOnCreate(getPerUserTestOnCreate(userName));
pool.setTestOnBorrow(getPerUserTestOnBorrow(userName));
pool.setTestOnReturn(getPerUserTestOnReturn(userName));
pool.setTestWhileIdle(getPerUserTestWhileIdle(userName));
-
pool.setTimeBetweenEvictionRuns(getPerUserDurationBetweenEvictionRuns(userName));
+
pool.setDurationBetweenEvictionRuns(getPerUserDurationBetweenEvictionRuns(userName));
pool.setSwallowedExceptionListener(new SwallowedExceptionLogger(log));
[commons-dbcp] 04/06: Update call sites of deprecated APIs from Apache Commons Pool
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-dbcp.git
commit 988816f287f001471ed2293ffde15cd537aa0113
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:43:39 2023 -0400
Update call sites of deprecated APIs from Apache Commons Pool
---
.../org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
index eb647447..eb302006 100644
---
a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
+++
b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
@@ -177,10 +177,10 @@ public class SharedPoolDataSource extends
InstanceKeyDataSource {
config.setMaxTotal(getMaxTotal());
config.setMaxTotalPerKey(getDefaultMaxTotal());
config.setMaxWait(getDefaultMaxWait());
-config.setMinEvictableIdleTime(getDefaultMinEvictableIdleDuration());
+
config.setMinEvictableIdleDuration(getDefaultMinEvictableIdleDuration());
config.setMinIdlePerKey(getDefaultMinIdle());
config.setNumTestsPerEvictionRun(getDefaultNumTestsPerEvictionRun());
-
config.setSoftMinEvictableIdleTime(getDefaultSoftMinEvictableIdleDuration());
+
config.setSoftMinEvictableIdleDuration(getDefaultSoftMinEvictableIdleDuration());
config.setTestOnCreate(getDefaultTestOnCreate());
config.setTestOnBorrow(getDefaultTestOnBorrow());
config.setTestOnReturn(getDefaultTestOnReturn());
[commons-dbcp] 05/06: Javadoc
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-dbcp.git
commit 6ed192887de02ecde75ada9ea18c462688d4
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:44:34 2023 -0400
Javadoc
---
src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
index 80432698..efdc9f64 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java
@@ -31,7 +31,7 @@ public interface BasicDataSourceMXBean extends
DataSourceMXBean {
* See {@link BasicDataSource#getPassword()}
*
* @return {@link BasicDataSource#getPassword()}
- * @deprecated exposing password via JMX is an Information Exposure issue.
+ * @deprecated Exposing passwords via JMX is an Information Exposure issue.
*/
@Deprecated
String getPassword();
[commons-dbcp] 01/06: Update call sites of deprecated APIs from Apache Commons Pool
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-dbcp.git
commit f82332821cc0a6a36a7a731e9c5cd9271ad21183
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:43:23 2023 -0400
Update call sites of deprecated APIs from Apache Commons Pool
---
.../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index 1c7ee353..7285c037 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -112,7 +112,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
// PreparedStatement pool properties
private boolean poolPreparedStatements;
private int maxIdle = 10;
-private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS;
+private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS;
private int numTestsPerEvictionRun = -1;
private Duration minEvictableIdleDuration =
BaseObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_DURATION;
@@ -418,7 +418,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
// evictor settings are the same as the connection pool
settings.
config.setTimeBetweenEvictionRuns(getDurationBetweenEvictionRuns());
config.setNumTestsPerEvictionRun(getNumTestsPerEvictionRun());
-config.setMinEvictableIdleTime(getMinEvictableIdleDuration());
+
config.setMinEvictableIdleDuration(getMinEvictableIdleDuration());
} else {
// Since there is a limit, create a prepared statement pool
without an eviction thread;
// pool has LRU functionality so when the limit is reached,
15% of the pool is cleared.
@@ -426,7 +426,7 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
config.setMaxTotal(getMaxPreparedStatements());
config.setTimeBetweenEvictionRuns(Duration.ofMillis(-1));
config.setNumTestsPerEvictionRun(0);
-config.setMinEvictableIdleTime(Duration.ZERO);
+config.setMinEvictableIdleDuration(Duration.ZERO);
}
stmtPool = new GenericKeyedObjectPool<>(pooledConnection, config);
pooledConnection.setStatementPool(stmtPool);
[commons-dbcp] 06/06: Add missing @Deprecated
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-dbcp.git
commit 97be8b4705764ee6f36bc84eb18aac8bf8a8fe68
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:45:10 2023 -0400
Add missing @Deprecated
---
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index f07496c3..b41cdfe0 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -1212,7 +1212,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the password passed to the JDBC driver to establish connections.
*
* @return the connection password
+ * @deprecated Exposing passwords via JMX is an Information Exposure issue.
*/
+@Deprecated
@Override
public String getPassword() {
return this.password;
[commons-dbcp] branch master updated (7f418833 -> 97be8b47)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git from 7f418833 Update call sites of deprecated APIs from Apache Commons Pool new f8233282 Update call sites of deprecated APIs from Apache Commons Pool new c7e6989f Update call sites of deprecated APIs from Apache Commons Pool new 4e6a616c Update call sites of deprecated APIs from Apache Commons Pool new 988816f2 Update call sites of deprecated APIs from Apache Commons Pool new 6ed19288 Javadoc new 97be8b47 Add missing @Deprecated The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 ++ src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java | 2 +- .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 6 +++--- .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 2 +- .../apache/commons/dbcp2/datasources/PerUserPoolDataSource.java | 8 .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java| 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-)
[commons-dbcp] branch master updated: Update call sites of deprecated APIs from Apache Commons Pool
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-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new 7f418833 Update call sites of deprecated APIs from Apache Commons Pool
7f418833 is described below
commit 7f418833add9fc0fea334e47633821791ee96c6b
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:31:39 2023 -0400
Update call sites of deprecated APIs from Apache Commons Pool
---
src/changes/changes.xml| 1 +
.../java/org/apache/commons/dbcp2/BasicDataSource.java | 14 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4f432739..eebd8587 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,7 @@ The type attribute can be add,update,fix,remove.
+ Update call
sites of deprecated APIs from Apache Commons Pool.
Add DataSourceMXBean.getUserName() and deprecate
getUsername().
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index d3b1799c..f07496c3 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -257,7 +257,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* The number of milliseconds to sleep between runs of the idle object
evictor thread. When non-positive, no idle
* object evictor thread will be run.
*/
-private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS;
+private Duration durationBetweenEvictionRuns =
BaseObjectPoolConfig.DEFAULT_DURATION_BETWEEN_EVICTION_RUNS;
/**
* The number of objects to examine during each run of the idle object
evictor thread (if any).
@@ -493,8 +493,8 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
gop.setTestOnBorrow(testOnBorrow);
gop.setTestOnReturn(testOnReturn);
gop.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
-gop.setMinEvictableIdle(minEvictableIdleDuration);
-gop.setSoftMinEvictableIdle(softMinEvictableIdleDuration);
+gop.setMinEvictableIdleDuration(minEvictableIdleDuration);
+gop.setSoftMinEvictableIdleDuration(softMinEvictableIdleDuration);
gop.setTestWhileIdle(testWhileIdle);
gop.setLifo(lifo);
gop.setSwallowedExceptionListener(new SwallowedExceptionLogger(log,
logExpiredConnections));
@@ -2030,7 +2030,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setDurationBetweenEvictionRuns(final Duration
timeBetweenEvictionRunsMillis) {
this.durationBetweenEvictionRuns = timeBetweenEvictionRunsMillis;
-setConnectionPool(GenericObjectPool::setTimeBetweenEvictionRuns,
timeBetweenEvictionRunsMillis);
+setConnectionPool(GenericObjectPool::setDurationBetweenEvictionRuns,
timeBetweenEvictionRunsMillis);
}
/**
@@ -2262,7 +2262,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setMinEvictableIdle(final Duration
minEvictableIdleDuration) {
this.minEvictableIdleDuration = minEvictableIdleDuration;
-setConnectionPool(GenericObjectPool::setMinEvictableIdle,
minEvictableIdleDuration);
+setConnectionPool(GenericObjectPool::setMinEvictableIdleDuration,
minEvictableIdleDuration);
}
/**
@@ -2413,7 +2413,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
public synchronized void setSoftMinEvictableIdle(final Duration
softMinEvictableIdleTimeMillis) {
this.softMinEvictableIdleDuration = softMinEvictableIdleTimeMillis;
-setConnectionPool(GenericObjectPool::setSoftMinEvictableIdle,
softMinEvictableIdleTimeMillis);
+setConnectionPool(GenericObjectPool::setSoftMinEvictableIdleDuration,
softMinEvictableIdleTimeMillis);
}
/**
@@ -2590,7 +2590,7 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
*/
protected void startPoolMaintenance() {
if (connectionPool != null &&
durationBetweenEvictionRuns.compareTo(Duration.ZERO) > 0) {
-
connectionPool.setTimeBetweenEvictionRuns(durationBetweenEvictionRuns);
+
connectionPool.setDurationBetweenEvictionRuns(durationBetweenEvictionRuns);
}
}
svn commit: r1913236 - /commons/cms-site/trunk/content/xdoc/dormant.xml
Author: sebb Date: Mon Oct 23 16:20:23 2023 New Revision: 1913236 URL: http://svn.apache.org/viewvc?rev=1913236&view=rev Log: Start collecting details on marking a component as dormant Modified: commons/cms-site/trunk/content/xdoc/dormant.xml Modified: commons/cms-site/trunk/content/xdoc/dormant.xml URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/content/xdoc/dormant.xml?rev=1913236&r1=1913235&r2=1913236&view=diff == --- commons/cms-site/trunk/content/xdoc/dormant.xml (original) +++ commons/cms-site/trunk/content/xdoc/dormant.xml Mon Oct 23 16:20:23 2023 @@ -108,5 +108,33 @@ + + +Some notes on what needs to be changed when a component is made dormant. + + += work in progress - to be completed = + + +==https://svn.apache.org/repos/asf/commons/cms-site/trunk changes== +content/resources/.htaccess - change redirect (this affects site move) +content/site.xml - drop entry +content/xdoc/components.xml - drop entry +content/xdoc/dormant.xml - add entry +==Git component repo changes== +Update README.md for the component: add note re dormancy +Add '(Dormant)' to description in .asf.yaml +We don't ask for repo to be made read-only in case revival occurs +pom.xml - change site URLs: s/proper/dormant/ +delete dependabot.yml +disable GH CI builds - change to workflow_dispatch only +==other changes== + https://svn.apache.org/repos/infra/websites/production/commons/content - Move site from proper to dormant (try to coordinate this with htaccess change) +https://dist.apache.org/repos/dist/[dev|release]/commons/COMPONENT - drop COMPONENT folders + +Does DOAP need updating? Maybe drop DOAP from projects.a.o? + + +
[commons-dbcp] 01/02: Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3
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-dbcp.git commit 36d74a41c66746c6205c0f5976002676b320221f Author: Gary Gregory AuthorDate: Mon Oct 23 12:16:01 2023 -0400 Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3 --- pom.xml | 2 +- src/changes/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12c5ca81..3cdd80bc 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ jakarta.transaction jakarta.transaction-api - 1.3.1 + 1.3.3 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 04fdc089..4f432739 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -71,6 +71,7 @@ The type attribute can be add,update,fix,remove. Bump commons-parent from 60 to 64. Bump org.slf4j:slf4j-simple from 2.0.7 to 2.0.9 #301. Bump org.apache.commons:commons-pool2 from 2.11.1 to 2.12.0. + Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3.
[commons-dbcp] branch master updated (fced9384 -> 40986ebe)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git from fced9384 Add DataSourceMXBean.getUserName() and deprecate getUsername() new 36d74a41 Bump jakarta.transaction:jakarta.transaction-api from 1.3.1 to 1.3.3 new 40986ebe Static is never null or empty. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml| 2 +- src/changes/changes.xml| 1 + .../commons/dbcp2/BasicDataSourceFactory.java | 24 ++ 3 files changed, 13 insertions(+), 14 deletions(-)
[commons-dbcp] 02/02: Static is never null or empty.
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-dbcp.git
commit 40986ebe3cce4929f380f0e536ead1321cf0eb39
Author: Gary Gregory
AuthorDate: Mon Oct 23 12:16:17 2023 -0400
Static is never null or empty.
---
.../commons/dbcp2/BasicDataSourceFactory.java | 24 ++
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index e832ca8c..11dfbc17 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -420,20 +420,18 @@ public class BasicDataSourceFactory implements
ObjectFactory {
*container for info messages
*/
private void validatePropertyNames(final Reference ref, final Name name,
final List warnMessages,
-final List infoMessages) {
+final List infoMessages) {
final String nameString = name != null ? "Name = " + name.toString() +
" " : "";
-if (NUPROP_WARNTEXT != null && !NUPROP_WARNTEXT.isEmpty()) {
-NUPROP_WARNTEXT.forEach((propertyName, value) -> {
-final RefAddr ra = ref.get(propertyName);
-if (ra != null && !ALL_PROPERTY_NAMES.contains(ra.getType())) {
-final StringBuilder stringBuilder = new
StringBuilder(nameString);
-final String propertyValue =
Objects.toString(ra.getContent(), null);
-stringBuilder.append(value).append(" You have set value of
\"").append(propertyValue).append("\" for \"").append(propertyName)
+NUPROP_WARNTEXT.forEach((propertyName, value) -> {
+final RefAddr ra = ref.get(propertyName);
+if (ra != null && !ALL_PROPERTY_NAMES.contains(ra.getType())) {
+final StringBuilder stringBuilder = new
StringBuilder(nameString);
+final String propertyValue = Objects.toString(ra.getContent(),
null);
+stringBuilder.append(value).append(" You have set value of
\"").append(propertyValue).append("\" for \"").append(propertyName)
.append("\" property, which is being ignored.");
-warnMessages.add(stringBuilder.toString());
-}
-});
-}
+warnMessages.add(stringBuilder.toString());
+}
+});
final Enumeration allRefAddrs = ref.getAll();
while (allRefAddrs.hasMoreElements()) {
@@ -445,7 +443,7 @@ public class BasicDataSourceFactory implements
ObjectFactory {
final String propertyValue = Objects.toString(ra.getContent(),
null);
final StringBuilder stringBuilder = new
StringBuilder(nameString);
stringBuilder.append("Ignoring unknown property:
").append("value of \"").append(propertyValue).append("\" for
\"").append(propertyName)
-.append("\" property");
+.append("\" property");
infoMessages.add(stringBuilder.toString());
}
}
svn commit: r64676 - /dev/commons/ognl/
Author: sebb Date: Mon Oct 23 16:01:03 2023 New Revision: 64676 Log: Dormant Removed: dev/commons/ognl/
[commons-dbcp] branch master updated: Add DataSourceMXBean.getUserName() and deprecate getUsername()
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-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new fced9384 Add DataSourceMXBean.getUserName() and deprecate getUsername()
fced9384 is described below
commit fced9384f3936bb4d5504f29ca7211be1ad951ce
Author: Gary Gregory
AuthorDate: Mon Oct 23 11:35:15 2023 -0400
Add DataSourceMXBean.getUserName() and deprecate getUsername()
---
pom.xml | 4 ++--
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 ++
.../org/apache/commons/dbcp2/ConnectionFactoryFactory.java | 2 +-
src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java | 12
.../apache/commons/dbcp2/managed/BasicManagedDataSource.java | 2 +-
.../org/apache/commons/dbcp2/TestBasicDataSourceFactory.java | 1 +
7 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73e11a9d..12c5ca81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
4.0.0
commons-dbcp2
- 2.10.1-SNAPSHOT
+ 2.11.0-SNAPSHOT
Apache Commons DBCP
2001
@@ -303,7 +303,7 @@
RC1
org.apache.commons.dbcp2
-2.10.0
+2.11.0
for JDBC 4.2 on Java 8
sha512
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 49065ffc..04fdc089 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,9 +62,10 @@ The type attribute can be add,update,fix,remove.
EvictionTimer
-->
-
+
+ Add DataSourceMXBean.getUserName() and deprecate
getUsername().
Bump h2 from 2.2.220 to 2.2.224, #308.
Bump
commons-parent from 60 to 64.
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index e308e86e..d3b1799c 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -1440,7 +1440,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the JDBC connection {code userName} property.
*
* @return the {code userName} passed to the JDBC driver to establish
connections
+ * @deprecated
*/
+@Deprecated
@Override
public String getUsername() {
return this.userName;
diff --git
a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
index ba17862b..23ce4e4b 100644
--- a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
@@ -42,7 +42,7 @@ final class ConnectionFactoryFactory {
final Properties connectionProperties =
basicDataSource.getConnectionProperties();
final String url = basicDataSource.getUrl();
// Set up the driver connection factory we will use
-final String user = basicDataSource.getUsername();
+final String user = basicDataSource.getUserName();
if (user != null) {
connectionProperties.put(Constants.KEY_USER, user);
} else {
diff --git a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
index 56fb5c88..d3208c20 100644
--- a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
@@ -274,9 +274,21 @@ public interface DataSourceMXBean {
* See {@link BasicDataSource#getUsername()}.
*
* @return {@link BasicDataSource#getUsername()}.
+ * @deprecated Use {@link #getUserName()}.
*/
+@Deprecated
String getUsername();
+/**
+ * See {@link BasicDataSource#getUsername()}.
+ *
+ * @return {@link BasicDataSource#getUsername()}.
+ * @since 2.11.0
+ */
+default String getUserName() {
+return getUsername();
+}
+
/**
* See {@link BasicDataSource#getValidationQuery()}.
*
diff --git
a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
index b2a56323..91e644c2 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
@@ -102,7 +102,7 @@ public class BasicManagedDataSource extends BasicDataSource
{
// finally, create the XAConnectionFactory using the XA data source
final XAConnectionFactory xaConnectionFactory = new
DataSourceXAConnectionFactory(getTransactionManager(),
-xaDataSourceInstance, getUsername(),
Uti
[commons-jelly] 01/02: Camel-case parameter names
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-jelly.git
commit dddeed4d66960c6b139c36cb41f4122c5279f065
Author: Gary Gregory
AuthorDate: Mon Oct 23 10:34:18 2023 -0400
Camel-case parameter names
---
.../java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
index 4fca3b4d..75a6b746 100644
---
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
+++
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
@@ -109,11 +109,11 @@ public class DataSourceWrapper implements DataSource {
}
/**
- * Always throws a SQLException. Username and password are set
+ * Always throws a SQLException. User name and password are set
* in the constructor and can not be changed.
*/
@Override
-public Connection getConnection(String username, String password)
+public Connection getConnection(String userName, String password)
throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
[commons-jelly] 02/02: Camel-case parameter names and private names
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-jelly.git
commit 999ea1939e758e054a84b376d5e8a72a27ac0129
Author: Gary Gregory
AuthorDate: Mon Oct 23 10:35:29 2023 -0400
Camel-case parameter names and private names
---
.../java/org/apache/commons/jelly/tags/soap/InvokeTag.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
index 75546f1a..26a554fa 100644
---
a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
+++
b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
@@ -41,7 +41,7 @@ public class InvokeTag extends TagSupport {
private String endpoint = null;
private String namespace = null;
private String method = null;
-private String username;
+private String userName;
private String password;
private Service service;
private Object params;
@@ -85,8 +85,8 @@ public class InvokeTag extends TagSupport {
call.setTargetEndpointAddress(new java.net.URL(endpoint));
call.setOperationName(new QName(namespace, method));
-if ( username != null && !username.equals("") ) {
-call.setUsername( username );
+if ( userName != null && !userName.equals("") ) {
+call.setUsername( userName );
call.setPassword( password );
}
@@ -168,11 +168,11 @@ public class InvokeTag extends TagSupport {
}
/**
- * Set the username for the SOAP call.
+ * Set the user name for the SOAP call.
*/
-public void setUsername(String username)
+public void setUsername(String userName)
{
-this.username = username;
+this.userName = userName;
}
[commons-jelly] branch master updated (18eea6c5 -> 999ea193)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-jelly.git from 18eea6c5 Camel-case internal names new dddeed4d Camel-case parameter names new 999ea193 Camel-case parameter names and private names The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/commons/jelly/tags/soap/InvokeTag.java | 12 ++-- .../org/apache/commons/jelly/tags/sql/DataSourceWrapper.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
[commons-net] branch master updated: Camel-case parameter names
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-net.git
The following commit(s) were added to refs/heads/master by this push:
new 76cb8013 Camel-case parameter names
76cb8013 is described below
commit 76cb8013795bb7146af35d97bbfaf2bc043b09dc
Author: Gary Gregory
AuthorDate: Mon Oct 23 10:35:46 2023 -0400
Camel-case parameter names
---
.../java/org/apache/commons/net/bsd/RCommandClient.java | 2 +-
.../java/org/apache/commons/net/bsd/RLoginClient.java| 16
.../java/org/apache/commons/net/ftp/FTPHTTPClient.java | 8
.../commons/net/imap/AuthenticatingIMAPClient.java | 2 +-
.../commons/net/smtp/AuthenticatingSMTPClient.java | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
index 433fecb5..13b57203 100644
--- a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
@@ -246,7 +246,7 @@ public class RCommandClient extends RExecClient {
}
/**
- * Same as rcommand(localUsername, remoteUsername, command, false);
+ * Same as rcommand(localUserName, remoteUserName, command, false);
*
* @param localUser the local user
* @param remoteUser the remote user
diff --git a/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
b/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
index 16958706..d7f96971 100644
--- a/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
@@ -59,13 +59,13 @@ public class RLoginClient extends RCommandClient {
/**
* Same as the other rlogin method, but no terminal speed is defined.
*
- * @param localUsername the local user
- * @param remoteUsername the remote user
+ * @param localUserName the local user
+ * @param remoteUserName the remote user
* @param terminalType the terminal type
* @throws IOException on error
*/
-public void rlogin(final String localUsername, final String
remoteUsername, final String terminalType) throws IOException {
-rexec(localUsername, remoteUsername, terminalType, false);
+public void rlogin(final String localUserName, final String
remoteUserName, final String terminalType) throws IOException {
+rexec(localUserName, remoteUserName, terminalType, false);
}
/**
@@ -78,14 +78,14 @@ public class RLoginClient extends RCommandClient {
* If user authentication fails, the rlogind daemon will request that a
password be entered interactively. You will be able to read the prompt from the
* output stream of the RLoginClient and write the password to the input
stream of the RLoginClient.
*
- * @param localUsername The user account on the local machine that is
trying to log in to the remote host.
- * @param remoteUsername The account name on the server that is being
logged in to.
+ * @param localUserName The user account on the local machine that is
trying to log in to the remote host.
+ * @param remoteUserName The account name on the server that is being
logged in to.
* @param terminalType The name of the user's terminal (e.g., "vt100",
"network", etc.)
* @param terminalSpeed The speed of the user's terminal, expressed as a
baud rate or bps (e.g., 9600 or 38400)
* @throws IOException If the rlogin() attempt fails. The exception will
contain a message indicating the nature of the failure.
*/
-public void rlogin(final String localUsername, final String
remoteUsername, final String terminalType, final int terminalSpeed) throws
IOException {
-rexec(localUsername, remoteUsername, terminalType + "/" +
terminalSpeed, false);
+public void rlogin(final String localUserName, final String
remoteUserName, final String terminalType, final int terminalSpeed) throws
IOException {
+rexec(localUserName, remoteUserName, terminalType + "/" +
terminalSpeed, false);
}
}
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
index 8c9630c1..5dc6bc8d 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -43,7 +43,7 @@ public class FTPHTTPClient extends FTPClient {
private static final byte[] CRLF = { '\r', '\n' };
private final String proxyHost;
private final int proxyPort;
-private final String proxyUsername;
+private final String proxyUserName;
private final String proxyPassword;
private final Charset charset;
private String tunnelHost; // Save the host when setting up a tunne
[commons-vfs] branch master updated: Javadoc
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-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 973044d1 Javadoc
973044d1 is described below
commit 973044d1305b9d676ad6f1802e7b682250fc0ff8
Author: Gary Gregory
AuthorDate: Mon Oct 23 10:32:32 2023 -0400
Javadoc
---
.../java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
index e2a0d443..01edf0fc 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
@@ -94,7 +94,7 @@ public class SftpStreamProxy implements Proxy {
private final int proxyPort;
/**
- * Username used to connect to the proxy host.
+ * User name used to connect to the proxy host.
*/
private final String proxyUser;
[commons-cli] branch master updated: Add version comment
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-cli.git The following commit(s) were added to refs/heads/master by this push: new 6be8bf1 Add version comment 6be8bf1 is described below commit 6be8bf17b5262f29a01c7683d89378cac6a6c0c0 Author: Gary Gregory AuthorDate: Mon Oct 23 10:00:31 2023 -0400 Add version comment --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d9fb99f..79d43ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,7 +34,7 @@ jobs: experimental: true steps: -- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 +- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.4.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
[commons-cli] branch master updated: Add experimental Java 22-EA build
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-cli.git The following commit(s) were added to refs/heads/master by this push: new 7820194 Add experimental Java 22-EA build 7820194 is described below commit 78201942269c194b4aea82dd3f8921d2b34776c2 Author: Gary Gregory AuthorDate: Mon Oct 23 10:00:07 2023 -0400 Add experimental Java 22-EA build --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2fb5ace..d9fb99f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,9 +29,9 @@ jobs: matrix: java: [ 8, 11, 17, 21 ] experimental: [false] -#include: -# - java: 22-ea -#experimental: true +include: + - java: 22-ea +experimental: true steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
[commons-cli] branch master updated: Prepare for the next release candidate
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-cli.git The following commit(s) were added to refs/heads/master by this push: new e17fee4 Prepare for the next release candidate e17fee4 is described below commit e17fee46b6bcb1bf2cca341ceeb18983f70a65f5 Author: Gary Gregory AuthorDate: Mon Oct 23 09:51:17 2023 -0400 Prepare for the next release candidate --- README.md| 221 + RELEASE-NOTES.txt| 69 +++ pom.xml | 1 + src/changes/changes.xml | 2 +- src/site/xdoc/download_cli.xml | 256 +++ src/site/xdoc/issue-tracking.xml | 2 +- src/site/xdoc/mail-lists.xml | 40 +++--- 7 files changed, 336 insertions(+), 255 deletions(-) diff --git a/README.md b/README.md index 4aff0a7..8f7ac53 100644 --- a/README.md +++ b/README.md @@ -1,106 +1,119 @@ - - -Apache Commons CLI -=== - + + +Apache Commons CLI +=== + [](https://github.com/apache/commons-cli/actions/workflows/maven.yml) -[](https://app.codecov.io/gh/apache/commons-cli/branch/master) -[](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/?gav=true) -[](https://javadoc.io/doc/commons-cli/commons-cli/1.5.0) +[](https://app.codecov.io/gh/apache/commons-cli) +[](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/?gav=true) +[](https://javadoc.io/doc/commons-cli/commons-cli/1.6.0) [](https://github.com/apache/commons-cli/actions/workflows/codeql-analysis.yml) - -Apache Commons CLI provides a simple API for presenting, processing and validating a Command Line Interface. - -Documentation -- - -More information can be found on the [Apache Commons CLI homepage](https://commons.apache.org/proper/commons-cli). -The [Javadoc](https://commons.apache.org/proper/commons-cli/apidocs) can be browsed. -Questions related to the usage of Apache Commons CLI should be posted to the [user mailing list][ml]. - -Where can I get the latest release? -You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-cli/download_cli.cgi). - -Alternatively, you can pull it from the central Maven repositories: - -```xml - - commons-cli - commons-cli - 1.5.0 - -``` - -Contributing - - -We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors. -There are some guidelines which will make applying PRs easier for us: -+ No tabs! Please use spaces for indentation. -+ Respect the code style. -+ Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. -+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```. - -If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas). -You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md). - -License -This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). - -See the `NOTICE.txt` file for required notices and attributions. - -Donations -- -You like Apache Commons CLI? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development. - -Additional Resources - - -+ [Apache Commons Homepage](https://commons.apache.org/) -+ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/CLI) -+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) -+ `#apache-commons` IRC channel on `irc.freenode.org` - -[ml]:https://commons.apache.org/mail-lists.html +[](https://api.securityscorecards.dev/projects/github.com/apache/commons-cli) + +Apache Commons CLI provides a si
[commons-codec] branch master updated: Add comment
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-codec.git The following commit(s) were added to refs/heads/master by this push: new ca65f2dc Add comment ca65f2dc is described below commit ca65f2dc3adc2650940284aa0592c234528fceca Author: Gary Gregory AuthorDate: Mon Oct 23 08:40:21 2023 -0400 Add comment --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7082f1d7..a2d797d0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,7 +34,7 @@ jobs: experimental: true steps: -- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 +- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
[commons-codec] 05/05: Add experimental Java 22-EA GHA build
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-codec.git commit eb5959555e59db0c8b14dad96dfefaed46907f50 Author: Gary Gregory AuthorDate: Mon Oct 23 08:39:15 2023 -0400 Add experimental Java 22-EA GHA build --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 67b91fe6..7082f1d7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,9 +29,9 @@ jobs: matrix: java: [ 8, 11, 17, 21 ] experimental: [false] -#include: -# - java: 22-ea -#experimental: true +include: + - java: 22-ea +experimental: true steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
[commons-codec] 04/05: Fix commons.rc.version
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-codec.git
commit ee91fc302956ca4ca301d35f9de858d967f7bf02
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:37:56 2023 -0400
Fix commons.rc.version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 146abe3f..9963385f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@ limitations under the License.
1.16.1
1.16.0
-R1
+RC1
true
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
[commons-codec] 03/05: Pick up commons.release-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-codec.git
commit 58d4223ccbd7572d663c0407ec624a8cf994c140
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:37:45 2023 -0400
Pick up commons.release-plugin.version from parent POM
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c6c71dc..146abe3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,7 +276,6 @@ limitations under the License.
1.16.1
1.16.0
R1
-1.7
true
scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}
[commons-codec] 02/05: Update commons.release.version to match pom version
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-codec.git
commit 552df8f58cc0e22162d18ced535c25aa97d2a95b
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:36:57 2023 -0400
Update commons.release.version to match pom version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1082fe4c..6c6c71dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@ limitations under the License.
${basedir}/src/conf/checkstyle.xml
false
-1.16.0
+1.16.1
1.16.0
R1
1.7
[commons-codec] branch master updated (cb921ea3 -> eb595955)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-codec.git from cb921ea3 Fix up GHA badges new 931bb815 Sort members new 552df8f5 Update commons.release.version to match pom version new 58d4223c Pick up commons.release-plugin.version from parent POM new ee91fc30 Fix commons.rc.version new eb595955 Add experimental Java 22-EA GHA build The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/maven.yml|6 +- pom.xml|5 +- .../org/apache/commons/codec/binary/Base64.java| 54 +- .../apache/commons/codec/binary/BaseNCodec.java| 232 +-- .../java/org/apache/commons/codec/binary/Hex.java |4 +- .../java/org/apache/commons/codec/cli/Digest.java | 24 +- .../org/apache/commons/codec/digest/Blake3.java| 670 - .../org/apache/commons/codec/digest/HmacUtils.java | 212 +-- .../apache/commons/codec/digest/MurmurHash2.java | 136 +- .../apache/commons/codec/digest/MurmurHash3.java | 1522 ++-- .../org/apache/commons/codec/digest/UnixCrypt.java | 86 +- .../org/apache/commons/codec/digest/XXHash32.java | 140 +- .../commons/codec/language/ColognePhonetic.java| 90 +- .../codec/language/DaitchMokotoffSoundex.java | 46 +- .../commons/codec/language/DoubleMetaphone.java| 466 +++--- .../apache/commons/codec/language/Metaphone.java | 150 +- .../org/apache/commons/codec/language/Nysiis.java |6 +- .../commons/codec/language/RefinedSoundex.java | 12 +- .../org/apache/commons/codec/language/Soundex.java | 18 +- .../codec/language/bm/BeiderMorseEncoder.java | 28 +- .../org/apache/commons/codec/language/bm/Lang.java | 16 +- .../commons/codec/language/bm/Languages.java | 172 +-- .../commons/codec/language/bm/PhoneticEngine.java | 80 +- .../org/apache/commons/codec/language/bm/Rule.java | 48 +- .../java/org/apache/commons/codec/net/BCodec.java | 188 +-- .../org/apache/commons/codec/net/PercentCodec.java | 198 +-- .../java/org/apache/commons/codec/net/QCodec.java | 192 +-- .../commons/codec/net/QuotedPrintableCodec.java| 444 +++--- .../org/apache/commons/codec/net/RFC1522Codec.java | 134 +- .../org/apache/commons/codec/net/URLCodec.java | 220 +-- .../org/apache/commons/codec/CharsetsTest.java | 12 +- .../commons/codec/StringEncoderComparatorTest.java | 18 +- .../apache/commons/codec/binary/Base16Test.java| 388 ++--- .../codec/binary/Base32InputStreamTest.java| 124 +- .../codec/binary/Base32OutputStreamTest.java | 70 +- .../apache/commons/codec/binary/Base32Test.java| 278 ++-- .../commons/codec/binary/Base64Codec13Test.java| 496 +++ .../codec/binary/Base64InputStreamTest.java| 248 ++-- .../codec/binary/Base64OutputStreamTest.java | 100 +- .../apache/commons/codec/binary/Base64Test.java| 610 .../commons/codec/binary/BaseNCodecTest.java | 446 +++--- .../apache/commons/codec/binary/BaseNTestData.java | 108 +- .../commons/codec/binary/BinaryCodecTest.java | 714 - .../codec/binary/CharSequenceUtilsTest.java| 66 +- .../org/apache/commons/codec/binary/HexTest.java | 272 ++-- .../commons/codec/binary/StringUtilsTest.java | 112 +- .../apache/commons/codec/digest/Apr1CryptTest.java | 42 +- .../org/apache/commons/codec/digest/B64Test.java | 12 +- .../apache/commons/codec/digest/Blake3Test.java|8 +- .../codec/digest/Blake3TestVectorsTest.java| 44 +- .../org/apache/commons/codec/digest/CryptTest.java | 14 +- .../apache/commons/codec/digest/Md5CryptTest.java | 26 +- .../commons/codec/digest/MurmurHash2Test.java | 32 +- .../commons/codec/digest/MurmurHash3Test.java | 1092 +++--- .../commons/codec/digest/PureJavaCrc32CTest.java | 36 +- .../commons/codec/digest/PureJavaCrc32Test.java| 478 +++--- .../commons/codec/digest/Sha256CryptTest.java | 60 +- .../commons/codec/digest/Sha512CryptTest.java | 58 +- .../apache/commons/codec/digest/UnixCryptTest.java | 42 +- .../apache/commons/codec/digest/XXHash32Test.java | 56 +- .../codec/language/ColognePhoneticTest.java| 60 +- .../codec/language/DaitchMokotoffSoundexTest.java |8 +- .../language/MatchRatingApproachEncoderTest.java | 374 ++--- .../commons/codec/language/MetaphoneTest.java | 144 +- .../apache/commons/codec/language/SoundexTest.java | 58 +- .../bm/CacheSubSequencePerformanceTest.java| 58 +- .../language/bm/PhoneticEngineRegressionTest.java | 214 +-- .../org/apac
[commons-imaging] branch master updated: Remove trailing whitespace
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-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new cac5f8b7 Remove trailing whitespace
cac5f8b7 is described below
commit cac5f8b76bac84ddcb34511f7d5530a55433a9a7
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:32:04 2023 -0400
Remove trailing whitespace
---
.../java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
index 5b2b06e6..13b63d37 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
@@ -101,7 +101,7 @@ final class Dct {
* "JPEG still image data compression standard", by Pennebaker and
Mitchell,
* chapter 4, figure "4-8".
*
- * @param vector vector.
+ * @param vector vector.
*/
public static void forwardDct8(final float[] vector) {
final float a00 = vector[0] + vector[7];
@@ -225,7 +225,7 @@ final class Dct {
* easy equations and properly explains constants and scaling factors.
Terms
* have been inlined and the negation optimized out of existence.
*
- * @param vector vector.
+ * @param vector vector.
*/
public static void inverseDct8(final float[] vector) {
// B1
[commons-imaging] branch master updated: Remove trailing whitespace
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-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 2ef288b1 Remove trailing whitespace
2ef288b1 is described below
commit 2ef288b1a32c4b4fda31015573798f81d1a5e1ac
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:32:26 2023 -0400
Remove trailing whitespace
---
.../formats/png/transparencyfilters/AbstractTransparencyFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
index 1a61b833..aba06a0b 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
@@ -39,7 +39,7 @@ public abstract class AbstractTransparencyFilter extends
BinaryFileParser {
/**
* Gets the byte at the given offset.
*
- * @param offset offset.
+ * @param offset offset.
* @return a byte.
*/
public byte getByte(final int offset) {
[commons-imaging] 03/07: Fix Javadoc typo
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-imaging.git
commit 0042f7646d40551ca817e8edd70eb00566235f6b
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:21:18 2023 -0400
Fix Javadoc typo
---
.../java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index a1a572f3..28227b2a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -61,7 +61,7 @@ public class IptcParser extends BinaryFileParser {
* Block types (or Image Resource IDs) that are not recommended to be
* interpreted when libraries process Photoshop IPTC metadata.
*
- * @see https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/";> Adobe
Photoshop File Formats Specification
+ * @see https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/";>Adobe
Photoshop File Formats Specification
* @see https://issues.apache.org/jira/browse/IMAGING-246>IMAGING-246
* @since 1.0-alpha2
*/
[commons-imaging] 04/07: Fix Javadoc @see tag
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-imaging.git
commit 2e04da6ed6c075a67db1b8f70d26a3e2bc466a5d
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:21:37 2023 -0400
Fix Javadoc @see tag
---
.../java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index 28227b2a..0302e754 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -62,7 +62,7 @@ public class IptcParser extends BinaryFileParser {
* interpreted when libraries process Photoshop IPTC metadata.
*
* @see https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/";>Adobe
Photoshop File Formats Specification
- * @see https://issues.apache.org/jira/browse/IMAGING-246>IMAGING-246
+ * @see https://issues.apache.org/jira/browse/IMAGING-246";>IMAGING-246
* @since 1.0-alpha2
*/
private static final List PHOTOSHOP_IGNORED_BLOCK_TYPE =
Arrays.asList(1084, 1085, 1086, 1087);
[commons-imaging] 06/07: Javadeoc
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-imaging.git
commit 0eb6b55d57146c8d85945d2cd33562b1d5d513b7
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:23:16 2023 -0400
Javadeoc
---
.../png/transparencyfilters/AbstractTransparencyFilter.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
index 187d20e2..1a61b833 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
@@ -25,6 +25,11 @@ public abstract class AbstractTransparencyFilter extends
BinaryFileParser {
private final byte[] bytes;
+/**
+ * Constructs a new instance.
+ *
+ * @param bytes bytes.
+ */
public AbstractTransparencyFilter(final byte[] bytes) {
this.bytes = bytes.clone();
}
@@ -32,13 +37,18 @@ public abstract class AbstractTransparencyFilter extends
BinaryFileParser {
public abstract int filter(int rgb, int index) throws ImagingException,
IOException;
/**
- * @return a byte
+ * Gets the byte at the given offset.
+ *
+ * @param offset offset.
+ * @return a byte.
*/
public byte getByte(final int offset) {
return bytes[offset];
}
/**
+ * Gets the length.
+ *
* @return the length
*/
public int getLength() {
[commons-imaging] 05/07: Format nits
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-imaging.git
commit 8c5294946068e2b22b92b9b75fac5ec99a9b66f1
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:22:17 2023 -0400
Format nits
---
.../formats/png/transparencyfilters/AbstractTransparencyFilter.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
index de5a6890..187d20e2 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/AbstractTransparencyFilter.java
@@ -22,15 +22,14 @@ import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.BinaryFileParser;
public abstract class AbstractTransparencyFilter extends BinaryFileParser {
+
private final byte[] bytes;
public AbstractTransparencyFilter(final byte[] bytes) {
this.bytes = bytes.clone();
-
}
-public abstract int filter(int rgb, int index) throws ImagingException,
-IOException;
+public abstract int filter(int rgb, int index) throws ImagingException,
IOException;
/**
* @return a byte
[commons-imaging] 02/07: No need to nest
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-imaging.git
commit 0e282bae0079b4308029d40632549352e2d97292
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:20:36 2023 -0400
No need to nest
---
src/main/java/org/apache/commons/imaging/common/ByteConversions.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
index 4ecb679d..d53f7151 100644
--- a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
+++ b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
@@ -358,11 +358,10 @@ public final class ByteConversions {
return (byte0 << 56) | (byte1 << 48) | (byte2 << 40)
| (byte3 << 32) | (byte4 << 24) | (byte5 << 16)
| (byte6 << 8) | byte7 ;
-} else {
- return (byte7 << 56) | (byte6 << 48) | (byte5 << 40)
+}
+return (byte7 << 56) | (byte6 << 48) | (byte5 << 40)
| (byte4 << 32) | (byte3 << 24) | (byte2 << 16)
| (byte1 << 8) | byte0;
-}
}
/**
[commons-imaging] 01/07: Sort members
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-imaging.git
commit 0c999b88419aeb4088cd1ad32902402cfc43
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:20:06 2023 -0400
Sort members
---
.../commons/imaging/common/ByteConversions.java| 176 +++---
.../imaging/formats/webp/WebPImageParser.java | 258 ++---
.../imaging/formats/webp/chunks/WebPChunk.java | 64 ++---
.../imaging/formats/webp/chunks/WebPChunkVp8.java | 40 ++--
.../imaging/formats/webp/chunks/WebPChunkVp8l.java | 30 +--
.../imaging/formats/webp/chunks/WebPChunkVp8x.java | 60 ++---
.../imaging/common/BinaryFileFunctionsTest.java| 4 +-
.../imaging/formats/tiff/TiffBigTiffTest.java | 32 +--
.../commons/imaging/formats/webp/WebPBaseTest.java | 10 +-
.../imaging/formats/webp/WebPMetadataTest.java | 22 +-
.../commons/imaging/formats/webp/WebPReadTest.java | 40 ++--
.../commons/imaging/roundtrip/ImageAsserts.java| 46 ++--
12 files changed, 391 insertions(+), 391 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
index 04805a3e..4ecb679d 100644
--- a/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
+++ b/src/main/java/org/apache/commons/imaging/common/ByteConversions.java
@@ -131,6 +131,42 @@ public final class ByteConversions {
return result;
}
+/**
+ * Encodes an eight-byte (long) into an array of bytes based on
+ * the specified byte order.
+ *
+ * @param value a standard data primitive of type long
+ * @param byteOrder the byte order to be used for encoding
+ * @return an array of length 8
+ */
+public static byte[] toBytes(final long value, final ByteOrder byteOrder) {
+final byte[] result = new byte[8];
+toBytes(value, byteOrder, result, 0);
+return result;
+}
+
+private static void toBytes(final long value, final ByteOrder byteOrder,
final byte[] result, final int offset) {
+if (byteOrder == ByteOrder.BIG_ENDIAN) {
+result[offset + 0] = (byte) (value >> 56);
+result[offset + 1] = (byte) (value >> 48);
+result[offset + 2] = (byte) (value >> 40);
+result[offset + 3] = (byte) (value >> 32);
+result[offset + 4] = (byte) (value >> 24);
+result[offset + 5] = (byte) (value >> 16);
+result[offset + 6] = (byte) (value >> 8);
+result[offset + 7] = (byte) value;
+} else {
+result[offset + 7] = (byte) (value >> 56);
+result[offset + 6] = (byte) (value >> 48);
+result[offset + 5] = (byte) (value >> 40);
+result[offset + 4] = (byte) (value >> 32);
+result[offset + 3] = (byte) (value >> 24);
+result[offset + 2] = (byte) (value >> 16);
+result[offset + 1] = (byte) (value >> 8);
+result[offset + 0] = (byte) value;
+}
+}
+
public static byte[] toBytes(final RationalNumber value, final ByteOrder
byteOrder) {
final byte[] result = new byte[8];
toBytes(value, byteOrder, result, 0);
@@ -201,42 +237,6 @@ public final class ByteConversions {
return result;
}
-/**
- * Encodes an eight-byte (long) into an array of bytes based on
- * the specified byte order.
- *
- * @param value a standard data primitive of type long
- * @param byteOrder the byte order to be used for encoding
- * @return an array of length 8
- */
-public static byte[] toBytes(final long value, final ByteOrder byteOrder) {
-final byte[] result = new byte[8];
-toBytes(value, byteOrder, result, 0);
-return result;
-}
-
-private static void toBytes(final long value, final ByteOrder byteOrder,
final byte[] result, final int offset) {
-if (byteOrder == ByteOrder.BIG_ENDIAN) {
-result[offset + 0] = (byte) (value >> 56);
-result[offset + 1] = (byte) (value >> 48);
-result[offset + 2] = (byte) (value >> 40);
-result[offset + 3] = (byte) (value >> 32);
-result[offset + 4] = (byte) (value >> 24);
-result[offset + 5] = (byte) (value >> 16);
-result[offset + 6] = (byte) (value >> 8);
-result[offset + 7] = (byte) value;
-} else {
-result[offset + 7] = (byte) (value >> 56);
-result[offset + 6] = (byte) (value >> 48);
-result[offset + 5] = (byte) (value >> 40);
-result[offset + 4] = (byte) (value >> 32);
-result[offset + 3] = (byte) (value >> 24);
-result[offset + 2] = (byte) (value >> 16);
-result[offset + 1] = (byte) (value >> 8);
-result[offset + 0] = (byte) value;
-
[commons-imaging] branch master updated (159abb23 -> 5178a358)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-imaging.git from 159abb23 Fix up GHA badges new 0c999b88 Sort members new 0e282bae No need to nest new 0042f764 Fix Javadoc typo new 2e04da6e Fix Javadoc @see tag new 8c529494 Format nits new 0eb6b55d Javadeoc new 5178a358 Javadeoc The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../commons/imaging/common/ByteConversions.java| 175 +++--- .../commons/imaging/formats/jpeg/decoder/Dct.java | 4 + .../imaging/formats/jpeg/iptc/IptcParser.java | 4 +- .../AbstractTransparencyFilter.java| 17 +- .../imaging/formats/webp/WebPImageParser.java | 258 ++--- .../imaging/formats/webp/chunks/WebPChunk.java | 64 ++--- .../imaging/formats/webp/chunks/WebPChunkVp8.java | 40 ++-- .../imaging/formats/webp/chunks/WebPChunkVp8l.java | 30 +-- .../imaging/formats/webp/chunks/WebPChunkVp8x.java | 60 ++--- .../imaging/common/BinaryFileFunctionsTest.java| 4 +- .../imaging/formats/tiff/TiffBigTiffTest.java | 32 +-- .../commons/imaging/formats/webp/WebPBaseTest.java | 10 +- .../imaging/formats/webp/WebPMetadataTest.java | 22 +- .../commons/imaging/formats/webp/WebPReadTest.java | 40 ++-- .../commons/imaging/roundtrip/ImageAsserts.java| 46 ++-- 15 files changed, 409 insertions(+), 397 deletions(-)
[commons-imaging] 07/07: Javadeoc
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-imaging.git
commit 5178a35853da2d192932f8f7f0f9c8e4a6607c8a
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:23:57 2023 -0400
Javadeoc
---
.../java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java | 4
1 file changed, 4 insertions(+)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
index 21c3640a..5b2b06e6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
@@ -100,6 +100,8 @@ final class Dct {
* Fast forward Dct using AA&N. Taken from the book
* "JPEG still image data compression standard", by Pennebaker and
Mitchell,
* chapter 4, figure "4-8".
+ *
+ * @param vector vector.
*/
public static void forwardDct8(final float[] vector) {
final float a00 = vector[0] + vector[7];
@@ -222,6 +224,8 @@ final class Dct {
* [BROEKN URL]
http://vsr.finermatik.tu-chemnitz.de/~jan/MPEG/HTML/IDCT.html which gives
* easy equations and properly explains constants and scaling factors.
Terms
* have been inlined and the negation optimized out of existence.
+ *
+ * @param vector vector.
*/
public static void inverseDct8(final float[] vector) {
// B1
[commons-compress] 01/04: Remove unused import
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-compress.git commit 145c80f6e2f8b252ce869e8ac3d04f9db97b0a42 Author: Gary Gregory AuthorDate: Mon Oct 23 08:15:51 2023 -0400 Remove unused import --- .../java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java index 1a5b0d11..3cda410d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java @@ -16,7 +16,6 @@ */ package org.apache.commons.compress.archivers.zip; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Map;
[commons-compress] 04/04: Remove trailing whitespace
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-compress.git
commit 2300b272d58519334a4edd75ac44152362909fa1
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:17:08 2023 -0400
Remove trailing whitespace
---
src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
index 4a97bd10..f9f1ea54 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
@@ -623,7 +623,7 @@ public class TarUtils {
/**
* For PAX Format 0.1, the sparse headers are stored in a single variable
: GNU.sparse.map
- *
+ *
*
* GNU.sparse.map:
*Map of non-null data chunks. It is a string consisting of
comma-separated values "offset,size[,offset-1,size-1...]"
[commons-compress] 03/04: Add missing @Deprecated
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-compress.git
commit bb34530cbc42acd34db1b50743f2413cfb89da0a
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:16:31 2023 -0400
Add missing @Deprecated
---
.../java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
index c10d8a68..18460128 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
@@ -134,6 +134,7 @@ public class LZMAUtils {
* {@code false} otherwise
* @deprecated Use {@link #isCompressedFileName(String)}.
*/
+@Deprecated
public static boolean isCompressedFilename(final String fileName) {
return fileNameUtil.isCompressedFileName(fileName);
}
[commons-compress] 02/04: Javadoc
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-compress.git
commit 13b9c6c6a094fe154049bc70bc9b36e22d58db8e
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:16:15 2023 -0400
Javadoc
---
.../org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
index 3cda410d..dce2d518 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
@@ -24,7 +24,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.ZipException;
/**
- * ZipExtraField related methods
+ * {@link ZipExtraField} related methods.
+ *
* @NotThreadSafe because the HashMap is not synchronized.
*/
// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
[commons-compress] branch master updated (bc50be9f -> 2300b272)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git from bc50be9f Fix up GHA badges new 145c80f6 Remove unused import new 13b9c6c6 Javadoc new bb34530c Add missing @Deprecated new 2300b272 Remove trailing whitespace The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java | 2 +- .../org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java| 4 ++-- .../java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
[commons-configuration] 01/03: XML format indent
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-configuration.git commit 117990a15aeb4611022e2223d69c501bdde1753e Author: Gary Gregory AuthorDate: Mon Oct 23 08:03:05 2023 -0400 XML format indent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63561c81..b27642a1 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ Tools to assist in the reading of configuration/preferences files in various formats - + https://commons.apache.org/proper/commons-configuration/
[commons-configuration] branch master updated (d73fb203 -> 388ab01a)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from d73fb203 Take prefix delimiter into account when SubsetConfiguration.getKeysInternal() is called #300. new 117990a1 XML format indent new d1b4d0ed Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git new 388ab01a Document new APIs and update next version to 2.10.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 6 +++--- src/changes/changes.xml | 12 +++- 2 files changed, 14 insertions(+), 4 deletions(-)
[commons-configuration] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git
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-configuration.git commit d1b4d0ed4894a095ab602c6c2b3705a9faaefa23 Merge: 117990a1 d73fb203 Author: Gary Gregory AuthorDate: Mon Oct 23 08:05:54 2023 -0400 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration.git src/changes/changes.xml| 3 ++ .../configuration2/AbstractConfiguration.java | 30 +++ .../configuration2/ImmutableConfiguration.java | 20 .../configuration2/PrefixedKeysIterator.java | 19 ++- .../configuration2/SubsetConfiguration.java| 2 +- .../configuration2/TestSubsetConfiguration.java| 58 ++ 6 files changed, 130 insertions(+), 2 deletions(-)
[commons-configuration] 03/03: Document new APIs and update next version to 2.10.0
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-configuration.git
commit 388ab01a1a7897e1940ec9cee9b4d19a9b415b3a
Author: Gary Gregory
AuthorDate: Mon Oct 23 08:09:57 2023 -0400
Document new APIs and update next version to 2.10.0
---
pom.xml | 4 ++--
src/changes/changes.xml | 12 +++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b27642a1..8066b2a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
4.0.0
commons-configuration2
- 2.9.1-SNAPSHOT
+ 2.10.0-SNAPSHOT
Apache Commons Configuration
2001
@@ -534,7 +534,7 @@
configuration
org.apache.commons.configuration2
-2.9.1
+2.10.0
(Java 8)
commons-configuration-${commons.release.2.version}
1.10
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e15aab20..541969ed 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,7 +23,7 @@
Apache Commons Community
-
+
[StepSecurity] ci: Harden GitHub Actions #307.
@@ -34,6 +34,16 @@
Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called #300.
+
+
+Add AbstractConfiguration.getKeysInternal(String, String) #300.
+
+
+Add ImmutableConfiguration.getKeys(String, String) #300.
+
+
+Add PrefixedKeysIterator.PrefixedKeysIterator(Iterator
[commons-configuration] branch master updated (77ad6773 -> d73fb203)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git from 77ad6773 Take prefix delimiter into account when SubsetConfiguration.getKeysInternal() is called (#300) add d73fb203 Take prefix delimiter into account when SubsetConfiguration.getKeysInternal() is called #300. No new revisions were added by this update. Summary of changes: src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+)
[commons-configuration] branch master updated: Take prefix delimiter into account when SubsetConfiguration.getKeysInternal() is called (#300)
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-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 77ad6773 Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called (#300)
77ad6773 is described below
commit 77ad67731e495f7aa0db1823d58b631fc04d8657
Author: KeijoB
AuthorDate: Mon Oct 23 14:04:24 2023 +0200
Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called (#300)
* Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called
* Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called - added JUnit test
* Take prefix delimiter into account when
SubsetConfiguration.getKeysInternal() is called - added JUnit test for negative
example
* Add Javadoc since tag
* Update Javadoc since tag
* Add Javadoc since tag
-
Co-authored-by: Gary Gregory
---
.../configuration2/AbstractConfiguration.java | 30 +++
.../configuration2/ImmutableConfiguration.java | 20
.../configuration2/PrefixedKeysIterator.java | 19 ++-
.../configuration2/SubsetConfiguration.java| 2 +-
.../configuration2/TestSubsetConfiguration.java| 58 ++
5 files changed, 127 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 8125a57e..e6fdd6b7 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -770,6 +770,21 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
}
}
+/**
+ * {@inheritDoc} This implementation returns keys that either match the
prefix or start with the prefix followed by the delimiter.
+ * So the call {@code getKeys("db");} will find the keys {@code db},
{@code db@user}, or {@code db@password},
+ * but not the key {@code dbdriver}.
+ */
+@Override
+public final Iterator getKeys(final String prefix, final String
delimiter) {
+beginRead(false);
+try {
+return getKeysInternal(prefix, delimiter);
+} finally {
+endRead();
+}
+}
+
/**
* Actually creates an iterator for iterating over the keys in this
configuration. This method is called by
* {@code getKeys()}, it has to be defined by concrete subclasses.
@@ -793,6 +808,21 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
return new PrefixedKeysIterator(getKeysInternal(), prefix);
}
+/**
+ * Gets an {@code Iterator} with all property keys starting with the
specified prefix and specified delimiter. This method is called by
+ * {@link #getKeys(String)}. It is fully implemented by delegating to
{@code getKeysInternal()} and returning a special
+ * iterator which filters for the passed in prefix. Subclasses can
override it if they can provide a more efficient way
+ * to iterate over specific keys only.
+ *
+ * @param prefix the prefix for the keys to be taken into account
+ * @param delimiter the prefix delimiter
+ * @return an {@code Iterator} returning the filtered keys
+ * @since 2.10.0
+ */
+protected Iterator getKeysInternal(final String prefix, final
String delimiter) {
+return new PrefixedKeysIterator(getKeysInternal(), prefix, delimiter);
+}
+
/**
* {@inheritDoc} This implementation ensures proper synchronization.
Subclasses have to define the abstract
* {@code getPropertyInternal()} method which is called from here.
diff --git
a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
index b6c8d7f2..06af63e5 100644
---
a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java
@@ -508,6 +508,26 @@ public interface ImmutableConfiguration {
*/
Iterator getKeys(String prefix);
+/**
+ * Gets the list of the keys contained in the configuration that match the
specified prefix. For instance, if the
+ * configuration contains the following keys:
+ * {@code db@user, db@pwd, db@url, window.xpos, window.ypos},
+ * an invocation of {@code getKeys("db","@");}
+ * will return the keys below:
+ * {@code db@user, db@pwd, db@url}.
+ * Note that the prefix itself is included in the result set if there is a
matching key. The exact behavior - how the
+ * prefix is ac
[commons-crypto] 02/02: Format tweak
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
commit 650568a50144f1c5a98376d13def85b09c62f00b
Author: Gary Gregory
AuthorDate: Mon Oct 23 07:27:29 2023 -0400
Format tweak
---
src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
index a9802be..4f60dd8 100644
--- a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
+++ b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
@@ -84,8 +84,7 @@ public final class ReflectionUtils {
* @return the class object, or {@code null} if it could not be found or
initialization failed.
*/
private static Class getClassByNameOrNull(final String name) {
-final Set set =
-INIT_ERROR_CLASSES.computeIfAbsent(CLASS_LOADER, k ->
Collections.synchronizedSet(new HashSet<>()));
+final Set set =
INIT_ERROR_CLASSES.computeIfAbsent(CLASS_LOADER, k ->
Collections.synchronizedSet(new HashSet<>()));
if (set.contains(name)) {
return null;
[commons-crypto] 01/02: Rename private var
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
commit c97137e168ab737bd984ab1fcef15f82e4cc9041
Author: Gary Gregory
AuthorDate: Mon Oct 23 07:27:02 2023 -0400
Rename private var
---
.../org/apache/commons/crypto/utils/ReflectionUtils.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
index e941dee..a9802be 100644
--- a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
+++ b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
@@ -46,11 +46,11 @@ public final class ReflectionUtils {
private static final Map>>> CACHE_CLASSES = new WeakHashMap<>();
private static final ConcurrentMap>
INIT_ERROR_CLASSES = new ConcurrentHashMap<>();
-private static final ClassLoader CLASSLOADER;
+private static final ClassLoader CLASS_LOADER;
static {
final ClassLoader threadClassLoader =
Thread.currentThread().getContextClassLoader();
-CLASSLOADER = threadClassLoader != null ? threadClassLoader :
CryptoCipher.class.getClassLoader();
+CLASS_LOADER = threadClassLoader != null ? threadClassLoader :
CryptoCipher.class.getClassLoader();
}
/**
@@ -68,7 +68,7 @@ public final class ReflectionUtils {
public static Class getClassByName(final String name) throws
ClassNotFoundException {
final Class ret = getClassByNameOrNull(name);
if (ret == null) {
-if (INIT_ERROR_CLASSES.get(CLASSLOADER).contains(name)) {
+if (INIT_ERROR_CLASSES.get(CLASS_LOADER).contains(name)) {
throw new IllegalStateException("Class " + name + "
initialization error");
}
throw new ClassNotFoundException("Class " + name + " not found");
@@ -85,7 +85,7 @@ public final class ReflectionUtils {
*/
private static Class getClassByNameOrNull(final String name) {
final Set set =
-INIT_ERROR_CLASSES.computeIfAbsent(CLASSLOADER, k ->
Collections.synchronizedSet(new HashSet<>()));
+INIT_ERROR_CLASSES.computeIfAbsent(CLASS_LOADER, k ->
Collections.synchronizedSet(new HashSet<>()));
if (set.contains(name)) {
return null;
@@ -94,7 +94,7 @@ public final class ReflectionUtils {
final Map>> map;
synchronized (CACHE_CLASSES) {
-map = CACHE_CLASSES.computeIfAbsent(CLASSLOADER, k ->
Collections.synchronizedMap(new WeakHashMap<>()));
+map = CACHE_CLASSES.computeIfAbsent(CLASS_LOADER, k ->
Collections.synchronizedMap(new WeakHashMap<>()));
}
Class clazz = null;
@@ -105,7 +105,7 @@ public final class ReflectionUtils {
if (clazz == null) {
try {
-clazz = Class.forName(name, true, CLASSLOADER);
+clazz = Class.forName(name, true, CLASS_LOADER);
} catch (final ClassNotFoundException e) {
// Leave a marker that the class isn't found
map.put(name, new WeakReference<>(NEGATIVE_CACHE_SENTINEL));
[commons-crypto] branch master updated (f0c92d5 -> 650568a)
This is an automated email from the ASF dual-hosted git repository. ggregory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git from f0c92d5 [CRYPTO-169][FOLLOWUP] Fix reentrancy of `CryptoRandomFactory#getCryptoRandom` (#259) new c97137e Rename private var new 650568a Format tweak The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/commons/crypto/utils/ReflectionUtils.java| 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-)
[commons-crypto] branch master updated: [CRYPTO-169][FOLLOWUP] Fix reentrancy of `CryptoRandomFactory#getCryptoRandom` (#259)
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 f0c92d5 [CRYPTO-169][FOLLOWUP] Fix reentrancy of
`CryptoRandomFactory#getCryptoRandom` (#259)
f0c92d5 is described below
commit f0c92d52ab1b5f91a0b6aae1ce6df9c2b9ec2656
Author: YangJie
AuthorDate: Mon Oct 23 19:25:11 2023 +0800
[CRYPTO-169][FOLLOWUP] Fix reentrancy of
`CryptoRandomFactory#getCryptoRandom` (#259)
* fix reentrancy of CryptoRandomFactory#getCryptoRandom
* java 8 and 11
* add INIT_ERROR_CLASSES to ReflectionUtils
* revert import format
* fix import
* declare ConcurrentMap
* reuse test
---
.../commons/crypto/random/CryptoRandomFactory.java | 8
.../commons/crypto/utils/ReflectionUtils.java | 21 -
.../crypto/random/CryptoRandomFactoryTest.java | 7 +--
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git
a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
index 8239ae0..8acdf9c 100644
--- a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
+++ b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
@@ -198,14 +198,6 @@ public class CryptoRandomFactory {
} catch (final Exception e) {
lastException = e;
errorMessage.append("CryptoRandom: [" + className + "] failed
with " + e.getMessage());
-} catch (final ExceptionInInitializerError initializerError) {
-Throwable t = initializerError.getCause();
-if (t instanceof Exception) {
-lastException = (Exception) t;
-errorMessage.append("CryptoRandom: [" + className + "]
initialization failed with " + t.getMessage());
-} else {
-throw initializerError;
-}
}
}
diff --git a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
index f5fa8ca..e941dee 100644
--- a/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
+++ b/src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java
@@ -21,8 +21,12 @@ import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.apache.commons.crypto.cipher.CryptoCipher;
@@ -40,6 +44,7 @@ public final class ReflectionUtils {
}
private static final Map>>> CACHE_CLASSES = new WeakHashMap<>();
+private static final ConcurrentMap>
INIT_ERROR_CLASSES = new ConcurrentHashMap<>();
private static final ClassLoader CLASSLOADER;
@@ -63,6 +68,9 @@ public final class ReflectionUtils {
public static Class getClassByName(final String name) throws
ClassNotFoundException {
final Class ret = getClassByNameOrNull(name);
if (ret == null) {
+if (INIT_ERROR_CLASSES.get(CLASSLOADER).contains(name)) {
+throw new IllegalStateException("Class " + name + "
initialization error");
+}
throw new ClassNotFoundException("Class " + name + " not found");
}
return ret;
@@ -73,9 +81,16 @@ public final class ReflectionUtils {
* couldn't be loaded. This is to avoid the overhead of creating an
exception.
*
* @param name the class name.
- * @return the class object, or {@code null} if it could not be found.
+ * @return the class object, or {@code null} if it could not be found or
initialization failed.
*/
private static Class getClassByNameOrNull(final String name) {
+final Set set =
+INIT_ERROR_CLASSES.computeIfAbsent(CLASSLOADER, k ->
Collections.synchronizedSet(new HashSet<>()));
+
+if (set.contains(name)) {
+return null;
+}
+
final Map>> map;
synchronized (CACHE_CLASSES) {
@@ -95,6 +110,10 @@ public final class ReflectionUtils {
// Leave a marker that the class isn't found
map.put(name, new WeakReference<>(NEGATIVE_CACHE_SENTINEL));
return null;
+} catch (final ExceptionInInitializerError error) {
+// Leave a marker that the class initialization failed
+set.add(name);
+return null;
}
// two putters can race here, but they'll put the same class
map.put(name, new WeakReference<>(clazz))
[commons-jexl] branch master updated: Document need for privacy
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 1710e348 Document need for privacy
1710e348 is described below
commit 1710e34837a6bd2617f64956a819907fa8804aa8
Author: Sebb
AuthorDate: Mon Oct 23 11:31:23 2023 +0100
Document need for privacy
---
src/main/java/org/apache/commons/jexl3/JexlFeatures.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index 7b732bed..805cdf36 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -130,13 +130,21 @@ public final class JexlFeatures {
* All features.
* N.B. ensure this is updated if additional features are added.
*/
-private static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
+private static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
// MUST REMAIN PRIVATE
-/**
+/*
+ * *WARNING*
+ * Static fields may be inlined by the Java compiler, so their _values_
effectively form part of the external API.
+ * Classes that reference them need to be recompiled to pick up new values.
+ * This means that changes in value are not binary compatible.
+ * Such fields must be private or problems may occur.
+ */
+
+ /**
* The default features flag mask.
* Meant for compatibility with scripts written before 3.3.1
*/
-private static final long DEFAULT_FEATURES =
+private static final long DEFAULT_FEATURES = // MUST REMAIN PRIVATE
1L << LOCAL_VAR
| 1L << SIDE_EFFECT
| 1L << SIDE_EFFECT_GLOBAL
@@ -159,7 +167,7 @@ public final class JexlFeatures {
* The canonical scripting (since 3.3.1) features flag mask based on the
original default.
* Adds lexical, lexical-shade and const-capture but removes
comparator-names and pragma-anywhere
*/
-private static final long SCRIPT_FEATURES =
+private static final long SCRIPT_FEATURES = // MUST REMAIN PRIVATE
( DEFAULT_FEATURES
| 1L << LEXICAL
| 1L << LEXICAL_SHADE
[commons-jexl] branch master updated: Needs to track feature list
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 68860d95 Needs to track feature list
68860d95 is described below
commit 68860d95e342da0791585d7c6a907bf0c04b1f7c
Author: Sebb
AuthorDate: Mon Oct 23 11:23:07 2023 +0100
Needs to track feature list
So move closer together
---
src/main/java/org/apache/commons/jexl3/JexlFeatures.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index 62536618..7b732bed 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -126,6 +126,12 @@ public final class JexlFeatures {
/** Captured variables are const. */
public static final int CONST_CAPTURE = 22;
+/**
+ * All features.
+ * N.B. ensure this is updated if additional features are added.
+ */
+private static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
+
/**
* The default features flag mask.
* Meant for compatibility with scripts written before 3.3.1
@@ -161,11 +167,6 @@ public final class JexlFeatures {
& ~(1L << COMPARATOR_NAMES)
& ~(1L << PRAGMA_ANYWHERE);
-/**
- * All features.
- */
-private static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
-
/**
* Creates an all features enabled set.
* @return a new instance of all features set
[commons-jexl] branch master updated: JEXL-410: reduced unnecessary public exposure;
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new fc3e19ad JEXL-410: reduced unnecessary public exposure;
fc3e19ad is described below
commit fc3e19ad1106696711d8ac95b137e44325a4cb52
Author: Henri Biestro
AuthorDate: Mon Oct 23 11:05:22 2023 +0200
JEXL-410: reduced unnecessary public exposure;
---
src/test/java/org/apache/commons/jexl3/FeaturesTest.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
index 1ab59642..c19a50fc 100644
--- a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.jexl3;
import java.util.Arrays;
+import java.util.Collection;
import org.junit.Assert;
import org.junit.Test;
@@ -373,8 +374,8 @@ public class FeaturesTest extends JexlTestCase {
@Test
public void test410a() {
-long x = JexlFeatures.ALL_FEATURES;
-Assert.assertEquals(23, Long.bitCount(x));
+long x = JexlFeatures.createAll().getFlags();
+Assert.assertEquals(CONST_CAPTURE + 1, Long.bitCount(x));
Assert.assertTrue((x & (1L << CONST_CAPTURE)) != 0);
JexlFeatures all = JexlFeatures.createAll();
@@ -396,7 +397,8 @@ public class FeaturesTest extends JexlTestCase {
Assert.assertFalse(features.supportsComparatorNames());
final JexlEngine jexl = new JexlBuilder().features(features).create();
-for(String varName : JexlFeatures.RESERVED_WORDS) {
+Collection reserved = features.getReservedNames();
+for(String varName : reserved) {
String src = "var " + varName;
//JexlScript script = jexl.createScript(src);
Assert.assertThrows(JexlException.Feature.class, () ->
jexl.createScript(src));
[commons-jexl] branch master updated: JEXL-410: reduced unnecessary public exposure;
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 093cfbd9 JEXL-410: reduced unnecessary public exposure;
093cfbd9 is described below
commit 093cfbd9c5003db8634b1a06e564f0debab2ccc0
Author: Henri Biestro
AuthorDate: Mon Oct 23 11:05:47 2023 +0200
JEXL-410: reduced unnecessary public exposure;
---
src/main/java/org/apache/commons/jexl3/JexlFeatures.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index 71349412..62536618 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -130,7 +130,7 @@ public final class JexlFeatures {
* The default features flag mask.
* Meant for compatibility with scripts written before 3.3.1
*/
-public static final long DEFAULT_FEATURES =
+private static final long DEFAULT_FEATURES =
1L << LOCAL_VAR
| 1L << SIDE_EFFECT
| 1L << SIDE_EFFECT_GLOBAL
@@ -153,7 +153,7 @@ public final class JexlFeatures {
* The canonical scripting (since 3.3.1) features flag mask based on the
original default.
* Adds lexical, lexical-shade and const-capture but removes
comparator-names and pragma-anywhere
*/
-public static final long SCRIPT_FEATURES =
+private static final long SCRIPT_FEATURES =
( DEFAULT_FEATURES
| 1L << LEXICAL
| 1L << LEXICAL_SHADE
@@ -164,7 +164,7 @@ public final class JexlFeatures {
/**
* All features.
*/
-public static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
+private static final long ALL_FEATURES = (1L << (CONST_CAPTURE + 1)) - 1L;
/**
* Creates an all features enabled set.
@@ -221,7 +221,7 @@ public final class JexlFeatures {
* try, catch, throw, finally, switch, case, default, class,
instanceof, jexl, $jexl
* @since 3.3.1
*/
-public static final Set RESERVED_WORDS =
+private static final Set RESERVED_WORDS =
Collections.unmodifiableSet(
new HashSet<>((Arrays.asList(
"try", "catch", "throw", "finally", "switch", "case",
"default", "class", "instanceof", "jexl", "$jexl";
@@ -362,6 +362,13 @@ public final class JexlFeatures {
return nameSpaces;
}
+/**
+ * @return these features"s flags
+ */
+public long getFlags() {
+return flags;
+}
+
/**
* Sets a feature flag.
* @param feature the feature ordinal
