commit: a94596311b980d38f010a3ad730728a706a918ec Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Jul 29 06:20:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 05:08:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9459631
dev-java/commons-beanutils: add 1.11.0 Bug: https://bugs.gentoo.org/960929 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42983 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/commons-beanutils/Manifest | 2 + .../commons-beanutils-1.11.0.ebuild | 97 ++++++++++++++++++++++ .../commons-beanutils-1.11.0-skipFailingTest.patch | 31 +++++++ 3 files changed, 130 insertions(+) diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest index dacbe47ef92f..b252a76331f2 100644 --- a/dev-java/commons-beanutils/Manifest +++ b/dev-java/commons-beanutils/Manifest @@ -1,5 +1,7 @@ DIST commons-beanutils-1.10.1-src.tar.gz 401852 BLAKE2B 380282dd125d7ea5d11b9ad109d6db0f3fad433b241f3abd3c39a5830cdbfb505b82c28e615e0d8a6807f811c43c65f41c968078841de756a01dd5815c896152 SHA512 063d4c0c9b8c77e9358e15c0ac8b1ad7abbb31e4760a5b3898bac2aee72d0a7eb4f7890769fa31bd096eb038759f97f10f4e7418a6fc4059c1a2050a20756581 DIST commons-beanutils-1.10.1-src.tar.gz.asc 488 BLAKE2B f2d8bdc0de05fcbd2ae7e02b60ef461d3206100eed9134ea308b4129dcc820da954e49ce2aa6af6608555b5fa1be18cb7fa1eef2a1b1462070c4e4131dbbc7f9 SHA512 c63782276dead71add56022515d1f8336d618ddf5166cbafa18a062031f2962791a31a74d225d3bef1b557213c15f37c6b7ce98c83046e3f537cc47ca6cfee7a +DIST commons-beanutils-1.11.0-src.tar.gz 403183 BLAKE2B 3823f9ff060d182485cd7cae54999ae5d076d3cff0eec5f5ae87d66cfc960f9224cf17940023991b7e599a826796d572dd476681ced2a46accbeb209ff723f13 SHA512 edd930e7f8118d0cceb8647666fe1d5f873f939f858f433cd19985a75c4575455f2a2d339e4bcbf08b3f586c785a60429d4bb33ff6239da8f2c6183c8c318f18 +DIST commons-beanutils-1.11.0-src.tar.gz.asc 488 BLAKE2B 57401bf829ff9badc9ace98c8b3e36e65d2a649b4eb07a314426bd7b5b566965c9b5122a976be78e665f203af67d732fa401b1f417a4b0a349a0071f5cdc26e1 SHA512 f40927ad294f0280460aef5c53fd4a29357e59238a7f407013b9f67c333aa0752bde709f2fedc802f8140175bc3eedc446d8ad68d184643e6bf643aeff42f319 DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 DIST commons-beanutils-1.9.4-src.tar.gz.asc 833 BLAKE2B c971231cfb034bd9bbbd6e7801a4fcb54853c0d18872cfae81ce761fc8f71ebb70955456827ad33b4abd4df8c9820031fd49f28c50eddef5251b2a0d1b01cff9 SHA512 2a966959b2c94bf013df71885c2906a092b43a0ac6d63963f1462e7c09376964bb948c0681278a58fffae6716d042dc846b1649e1f4b0816e2adb3733bf14451 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230 diff --git a/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild new file mode 100644 index 000000000000..71bd50a49059 --- /dev/null +++ b/dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-beanutils:commons-beanutils:1.11.0" +JAVA_TESTING_FRAMEWORKS="junit-vintage" + +inherit java-pkg-2 java-pkg-simple junit5 verify-sig + +DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs" +HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"; +# We need some test classes of commons-collections which are not part of the jar file. +ACC="commons-collections-3.2.2" +SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz + test? ( https://archive.apache.org/dist/commons/collections/source/${ACC}-src.tar.gz ) + verify-sig? ( https://downloads.apache.org/commons/beanutils/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="log4j" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )" + +COMMON_DEPEND=" + dev-java/commons-collections:0 + >=dev-java/commons-logging-1.3.5:0[log4j=] + log4j? ( + dev-java/log4j-12-api:2 + dev-java/log4j-api:2 + ) +" + +DEPEND=" + ${COMMON_DEPEND} + dev-java/jakarta-servlet-api:4 + dev-java/slf4j-api:0 + >=virtual/jdk-11:* + test? ( + dev-java/junit:4 + dev-java/junit:5[vintage] + dev-java/opentest4j:0 + ) +" +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt ) +PATCHES=( "${FILESDIR}/commons-beanutils-1.11.0-skipFailingTest.patch" ) + +JAVA_CLASSPATH_EXTRA="jakarta-servlet-api-4 slf4j-api" +JAVA_GENTOO_CLASSPATH="commons-collections commons-logging" +JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}" +JAVA_MODULE_INFO_OUT="src/main" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4 junit-5 opentest4j" +JAVA_TEST_RESOURCE_DIRS="data" +JAVA_TEST_SRC_DIR=( src/test/java ../"${ACC}"-src/src/test ) +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ggregory.asc" + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} + fi + default +} + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + + if use log4j; then + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi + + if use test; then + # Apply patch to unpacked commons-collections + pushd "../${ACC}-src" >> /dev/null || die + eapply "${FILESDIR}/${ACC}-fixes.patch" + popd + + cp -r ../"${ACC}"-src/data . || die "copy test data" + fi + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 17; then + JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.{io,lang,util,time,time.chrono}=ALL-UNNAMED ) + fi +} diff --git a/dev-java/commons-beanutils/files/commons-beanutils-1.11.0-skipFailingTest.patch b/dev-java/commons-beanutils/files/commons-beanutils-1.11.0-skipFailingTest.patch new file mode 100644 index 000000000000..0f5508161710 --- /dev/null +++ b/dev-java/commons-beanutils/files/commons-beanutils-1.11.0-skipFailingTest.patch @@ -0,0 +1,31 @@ + testComponentRegistersCustomConverter + tags: [] + uniqueId: [engine:junit-vintage]/[runner:org.apache.commons.beanutils.converters.MemoryTestCase]/[test:testComponentRegistersCustomConverter(org.apache.commons.beanutils.converters.MemoryTestCase)] + parent: [engine:junit-vintage]/[runner:org.apache.commons.beanutils.converters.MemoryTestCase] + source: MethodSource [className = 'org.apache.commons.beanutils.converters.MemoryTestCase', methodName = 'testComponentRegistersCustomConverter', methodParameterTypes = ''] + caught: java.lang.NegativeArraySizeException: -2147483648 + at org.apache.commons.beanutils.converters.MemoryTestCase.forceGarbageCollection(MemoryTestCase.java:68) + at org.apache.commons.beanutils.converters.MemoryTestCase.testComponentRegistersCustomConverter(MemoryTestCase.java:162) + at java.base/java.lang.reflect.Method.invoke(Method.java:565) + duration: 1227 ms + status: ✘ FAILED + +--- a/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java ++++ b/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java +@@ -26,6 +26,7 @@ import java.lang.ref.WeakReference; + + import org.apache.commons.beanutils.ConvertUtils; + import org.apache.commons.beanutils.Converter; ++import org.junit.Ignore; + import org.junit.Test; + + /** +@@ -95,7 +96,7 @@ public class MemoryTestCase { + * </ul> + * + */ +- @Test ++ @Test @Ignore + public void testComponentRegistersCustomConverter() throws Exception { + + final ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader();
