commit: f51fb4fa0861c948556bddb1ebf6cfaf9b4579be Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Mar 20 11:20:07 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Mar 21 06:08:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51fb4fa
dev-java/commons-logging: add 1.3.0_pre20230319, drop 1.3.0_pre20230317 - enables tests except log4j tests - also installs commons-logging-api.jar and commons-logging-adapters.jar Closes: https://bugs.gentoo.org/902121 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30255 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-logging/Manifest | 2 +- ...ld => commons-logging-1.3.0_pre20230319.ebuild} | 60 ++++++++++++++-------- dev-java/commons-logging/metadata.xml | 1 + 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index caa33d505a88..3ae886c05c09 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,2 +1,2 @@ DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 -DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462 +DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild similarity index 57% rename from dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild rename to dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild index 3fb433092d18..548d30669d48 100644 --- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild +++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild @@ -5,14 +5,13 @@ EAPI=8 JAVA_PKG_IUSE="doc source test" MAVEN_ID="commons-logging:commons-logging:1.3.0" -# Not yet supported, see https://bugs.gentoo.org/839681 -# JAVA_TESTING_FRAMEWORKS="junit-vintage" +JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" HOMEPAGE="https://commons.apache.org/proper/commons-logging/"; -MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5" +MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1" SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MY_COMMIT}" @@ -52,7 +51,6 @@ src_prepare() { if use !log4j; then rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die - rm -r src/test/java/org/apache/commons/logging/log4j || die fi } @@ -84,19 +82,41 @@ src_compile() { popd > /dev/null || die } -# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407 -# src_test() { -# JAVA_TEST_EXTRA_ARGS=( -# -Dtestclasses="commons-logging-tests.jar" -# -Dcommons-logging="commons-logging.jar" -# -Dcommons-logging-api="commons-logging-api.jar" -# -Dcommons-logging-adapters="commons-logging-adapters.jar" -# ) -# JAVA_TEST_RESOURCE_DIRS="src/test/resources" -# JAVA_TEST_SRC_DIR="src/test/java" -# if use log4j; then -# JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" -# fi -# JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)" -# java-pkg-simple_src_test -# } +https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407 +src_test() { + # Do not run Log4j tests because these tests use an Appender to verify + # logging correctness. The log4j-12-api bridge no longer supports using an + # Appender for verifications since the methods for adding an Appender in + # the bridge "are largely no-ops". This means an Appender's state would + # never be changed by log4j-12-api after new messages are logged. The test + # cases, however, expect changes to the Appender's state in such an event, + # so they would fail with log4j-12-api. + # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html + rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger + rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger + rm -r src/test/java/org/apache/commons/logging/log4j || die + + JAVA_TEST_EXCLUDES=( + org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing + org.apache.commons.logging.jdk14.TestHandler # No runnable methods + ) + JAVA_TEST_EXTRA_ARGS=( + -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)" + -Dcommons-logging="commons-logging.jar" + -Dcommons-logging-api="commons-logging-api.jar" + -Dcommons-logging-adapters="commons-logging-adapters.jar" + -Dtestclasses="target/test-classes" + ) + if use log4j; then + JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" + fi + JAVA_TEST_GENTOO_CLASSPATH="junit-4" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar +} diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml index c3b68538712d..6d5d06dd2376 100644 --- a/dev-java/commons-logging/metadata.xml +++ b/dev-java/commons-logging/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to> + <doc>https://commons.apache.org/proper/commons-logging/guide.html</doc> <remote-id type="github">apache/commons-logging</remote-id> </upstream> <use>
