From b590c8d7572b727d565cc0b8ff660d43569845de Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 Jun 2026 19:09:37 -0500 Subject: Adding metadata --- dev-java/commons-beanutils/Manifest | 3 + .../commons-beanutils-1.11.0.ebuild | 97 +++++++++++ .../commons-beanutils-1.11.0-skipFailingTest.patch | 31 ++++ .../files/commons-collections-3.2.2-fixes.patch | 187 +++++++++++++++++++++ dev-java/commons-beanutils/metadata.xml | 15 ++ 5 files changed, 333 insertions(+) create mode 100644 dev-java/commons-beanutils/Manifest create mode 100644 dev-java/commons-beanutils/commons-beanutils-1.11.0.ebuild create mode 100644 dev-java/commons-beanutils/files/commons-beanutils-1.11.0-skipFailingTest.patch create mode 100644 dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch create mode 100644 dev-java/commons-beanutils/metadata.xml (limited to 'dev-java/commons-beanutils') diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest new file mode 100644 index 000000000000..1b9b573d75ab --- /dev/null +++ b/dev-java/commons-beanutils/Manifest @@ -0,0 +1,3 @@ +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-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..f50330171213 --- /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 ~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 { + * + * + */ +- @Test ++ @Test @Ignore + public void testComponentRegistersCustomConverter() throws Exception { + + final ClassLoader origContextClassLoader = Thread.currentThread().getContextClassLoader(); diff --git a/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch b/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch new file mode 100644 index 000000000000..2f1380a06ffc --- /dev/null +++ b/dev-java/commons-beanutils/files/commons-collections-3.2.2-fixes.patch @@ -0,0 +1,187 @@ +Patch stolen from: +From e90a6173247f06514731825677f3fc67c62bdc52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= +Date: Wed, 21 Apr 2021 11:31:11 +0200 +--- a/build.xml ++++ b/build.xml +@@ -154,8 +154,7 @@ + + + ++ basedir="${build.classes}"/> + + + +--- a/src/java/org/apache/commons/collections/MultiHashMap.java ++++ b/src/java/org/apache/commons/collections/MultiHashMap.java +@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap { + * @param item the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object item) { ++ public Object removeMapping(Object key, Object item) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/java/org/apache/commons/collections/MultiMap.java ++++ b/src/java/org/apache/commons/collections/MultiMap.java +@@ -66,7 +66,7 @@ public interface MultiMap extends Map { + * @throws ClassCastException if the key or value is of an invalid type + * @throws NullPointerException if the key or value is null and null is invalid + */ +- public Object remove(Object key, Object item); ++ public Object removeMapping(Object key, Object item); + + //----------------------------------------------------------------------- + /** +--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java +@@ -197,7 +197,7 @@ public class MultiKeyMap + * @param key2 the second key + * @return the value mapped to the removed key, null if key not in map + */ +- public Object remove(Object key1, Object key2) { ++ public Object removeMultiKey(Object key1, Object key2) { + int hashCode = hash(key1, key2); + int index = map.hashIndex(hashCode, map.data.length); + AbstractHashedMap.HashEntry entry = map.data[index]; +--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java ++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java +@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap { + * @param value the value to remove + * @return the value removed (which was passed in), null if nothing removed + */ +- public Object remove(Object key, Object value) { ++ public Object removeMapping(Object key, Object value) { + Collection valuesForKey = getCollection(key); + if (valuesForKey == null) { + return null; +--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java ++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java +@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap { + MultiHashMap one = new MultiHashMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiHashMap two = new MultiHashMap(); + assertEquals(two, one); +@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap { + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap { + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap { + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiHashMap(), map); + } + +--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java ++++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java +@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { + verify(); + + try { +- array = collection.toArray(null); ++ array = collection.toArray((Object[]) null); + fail("toArray(null) should raise NPE"); + } catch (NullPointerException e) { + // expected +--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap { + switch (key.size()) { + case 2: + assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1))); +- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + assertEquals(size - 1, multimap.size()); +- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1))); ++ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1))); + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); + break; + case 3: +--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase { + MultiValueMap one = new MultiValueMap(); + Integer value = new Integer(1); + one.put("One", value); +- one.remove("One", value); ++ one.removeMapping("One", value); + + MultiValueMap two = new MultiValueMap(); + assertEquals(two, one); +@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase { + assertEquals(4, map.totalSize()); + map.remove("A"); + assertEquals(3, map.totalSize()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.totalSize()); + } + +@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase { + assertEquals(2, map.size()); + map.remove("A"); + assertEquals(2, map.size()); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(2, map.size()); + } + +@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase { + map.remove("A"); + assertEquals(0, map.size("A")); + assertEquals(3, map.size("B")); +- map.remove("B", "BC"); ++ map.removeMapping("B", "BC"); + assertEquals(0, map.size("A")); + assertEquals(2, map.size("B")); + } +@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase { + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(null, map.removeMapping("C", "CA")); ++ assertEquals(null, map.removeMapping("A", "AD")); ++ assertEquals("AC", map.removeMapping("A", "AC")); ++ assertEquals("AB", map.removeMapping("A", "AB")); ++ assertEquals("AA", map.removeMapping("A", "AA")); + assertEquals(new MultiValueMap(), map); + } + diff --git a/dev-java/commons-beanutils/metadata.xml b/dev-java/commons-beanutils/metadata.xml new file mode 100644 index 000000000000..e2a729b1ff18 --- /dev/null +++ b/dev-java/commons-beanutils/metadata.xml @@ -0,0 +1,15 @@ + + + + + java@gentoo.org + Java + + + Add optional support for log4j + + + cpe:/a:apache:commons_beanutils + + baldeagleos-repo + -- cgit v1.3