commit: 69baa9afb973f96b16e918d72944e1dab5096a4b Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Jul 13 08:00:22 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 05:08:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69baa9af
dev-java/commons-lang: add 3.19.0 Switches to SLOT="0", consumers should switch on updates. For generating module-info.java this version uses eclass fuctionality instead of doing it all in the ebuild. Bug: https://bugs.gentoo.org/960838 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-lang/Manifest | 2 + dev-java/commons-lang/commons-lang-3.19.0.ebuild | 65 ++++++++++++++++++++++ ...s-lang-3.19.0-skip-testGetJavaAwtHeadless.patch | 37 ++++++++++++ 3 files changed, 104 insertions(+) diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest index b32732aa2fad..61ebeb9697a3 100644 --- a/dev-java/commons-lang/Manifest +++ b/dev-java/commons-lang/Manifest @@ -1,2 +1,4 @@ DIST commons-lang-3.17.0-src.tar.gz 1195408 BLAKE2B 1f612b8e5ef3ecc820ae040090633fd1a145298f0abdcc404e344adf9fb8c3632d144d1ee1cea4009ec32932b5b49a767abf77c45ff110129b98bdb0a7ba4557 SHA512 e633b0caeb9556c68384c2bf20e374fbac910b9979b25774c632e50c1bec41e97c14362978dc092c8b5859291e54fe51e76ad7a61c9b2efbe1e4538f46c1e3ee DIST commons-lang-3.17.0-src.tar.gz.asc 488 BLAKE2B ad6bbd5658a4fcdd56f830d55abef4a387fc8f42f4e3cc19d4700033acef8b02e30df4d6774014ae2b0a4f6811bdcc97a5c1a0c154705aa37724325850218beb SHA512 34f48ab6080c5730821bbf32f3715672c9f916d69985940f1dd17f9ab2c2ec04d1907426ee1dac1bd3654f7f50c65730042ebbffde1c12aa758f9a1e5634fcd0 +DIST commons-lang-3.19.0-src.tar.gz 1325280 BLAKE2B f7f27404a35284e156950832b5d1d6a95782ab734c5292110c4953de201899bd0cec629f0830ada5d8ffcd301f702371076bb041ca6f4950cc87b290032032a2 SHA512 75f7626925af2605a936e696c9947bae90b5b0d05830cbb7c97db2051d3e4e71f8e2563a0ff29c1780863fce188334398faf5413052c1df0fd8dae07fb09233a +DIST commons-lang-3.19.0-src.tar.gz.asc 488 BLAKE2B aade88ca133cecedbab0cfaa5de226dac2fa6bf39f2fff80ce806dd527b839b38d3fe3eeddfe0c1561dc7cfcab3fb83fe0c1a553c34ef70ae73fe1dd944126d2 SHA512 4e71fa045e104116dd64aedbb0b3e1e9720ddfb1d6b49e850119a76895de7b92a1f12c23d16be01c9beeee3152448628770f405f0e2f62d0f9adda668ccfb209 diff --git a/dev-java/commons-lang/commons-lang-3.19.0.ebuild b/dev-java/commons-lang/commons-lang-3.19.0.ebuild new file mode 100644 index 000000000000..94e6733bf60a --- /dev/null +++ b/dev-java/commons-lang/commons-lang-3.19.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-jupiter" +MAVEN_ID="org.apache.commons:commons-lang3:${PV}" + +inherit java-pkg-2 java-pkg-simple junit5 verify-sig + +DESCRIPTION="Commons components to manipulate core java classes" +HOMEPAGE="https://commons.apache.org/proper/commons-lang/"; +SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-src.tar.gz.asc )" +S="${WORKDIR}/${PN}3-${PV}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ggregory )" + +# [-vintage] because, if junit:5 compiled with 'USE=vintage': +# Error: Module junit not found, required by org.junit.vintage.engine +DEPEND=" + >=virtual/jdk-11:* + test? ( + >=dev-java/asm-9.8-r1:0 + >=dev-java/commons-text-1.14.0:0 + >=dev-java/easymock-5.6.0:0 + dev-java/jmh-core:0 + dev-java/junit:5[-vintage] + dev-java/junit-pioneer:0 + dev-java/jsr305:0 + dev-java/opentest4j:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3" +JAVA_GENTOO_CLASSPATH_EXTRA="org.apache.commons.lang3.jar" +JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}3" +JAVA_MODULE_INFO_OUT="src/main" +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="asm commons-text easymock jmh-core junit-pioneer junit-5 jsr305 opentest4j" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ggregory.asc" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + 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.{lang,util,time,time.chrono}=ALL-UNNAMED ) + fi + LC_ALL="en_US.UTF-8" junit5_src_test +} diff --git a/dev-java/commons-lang/files/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch b/dev-java/commons-lang/files/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch new file mode 100644 index 000000000000..0f5a711e88e8 --- /dev/null +++ b/dev-java/commons-lang/files/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch @@ -0,0 +1,37 @@ +testGetJavaAwtHeadless() + tags: [] + uniqueId: [engine:junit-jupiter]/[class:org.apache.commons.lang3.SystemPropertiesTest]/[method:testGetJavaAwtHeadless()] + parent: [engine:junit-jupiter]/[class:org.apache.commons.lang3.SystemPropertiesTest] + source: MethodSource [className = 'org.apache.commons.lang3.SystemPropertiesTest', methodName = 'testGetJavaAwtHeadless', methodParameterTypes = ''] + caught: org.opentest4j.AssertionFailedError: expected: <null> but was: <true> + at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151) + at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132) + at org.junit.jupiter.api.AssertNull.failNotNull(AssertNull.java:50) + at org.junit.jupiter.api.AssertNull.assertNull(AssertNull.java:35) + at org.junit.jupiter.api.AssertNull.assertNull(AssertNull.java:30) + at org.junit.jupiter.api.Assertions.assertNull(Assertions.java:279) + at org.apache.commons.lang3.SystemPropertiesTest.testGetJavaAwtHeadless(SystemPropertiesTest.java:512) + at java.base/java.lang.reflect.Method.invoke(Method.java:580) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + at java.base/java.util.ArrayList.forEach(ArrayList.java:1596) + duration: 1 ms + status: ✘ FAILED + +--- a/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java ++++ b/src/test/java/org/apache/commons/lang3/SystemPropertiesTest.java +@@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; + + import java.util.function.Supplier; + ++import org.junit.jupiter.api.Disabled; + import org.junit.jupiter.api.Test; + import org.junit.jupiter.api.function.ThrowingSupplier; + import org.junit.jupiter.params.ParameterizedTest; +@@ -507,6 +508,7 @@ class SystemPropertiesTest { + assertDoesNotThrow(SystemProperties::getJavaAwtGraphicsenv); + } + ++ @Disabled + @Test + void testGetJavaAwtHeadless() { + assertNull(SystemProperties.getJavaAwtHeadless());
