commit: 59b5c4778ed98fbc86cf08bb4ef72371d713575e Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu May 22 06:56:05 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu May 22 07:01:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b5c477
dev-java/commons-logging: drop 1.3.4-r1 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42183 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-logging/Manifest | 2 - .../commons-logging-1.3.4-r1.ebuild | 193 --------------------- 2 files changed, 195 deletions(-) diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index e639a710f3c9..8b36c70b78a2 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,4 +1,2 @@ -DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44 -DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143 DIST commons-logging-1.3.5-src.tar.gz 196373 BLAKE2B 874afc40d0776c9b467be444b2a597e378bb0643119b729eccb5fdec92bad8b9c8efe50f4726a8edbea24b36aef1e44b324ef54379d3d84880824c3765d2aec8 SHA512 07463385a3d997413fd7cb996d7266d0325e0829d88ee1d844ee13cdee702da5ec5817ccdd2b4bbccc3c9f6defd0f08f0397e6218bbd658b3e8336e9f146c0c3 DIST commons-logging-1.3.5-src.tar.gz.asc 488 BLAKE2B 8608ed88b260c00e1bd2f8c2ef57c842473ccc0a095b40d479a8e5abb83f6bfabb1be814b99cfc399bae1711ca07852a14a2c5ef4a976a7493432590463de690 SHA512 3ce7cc776e4aef7c329432b02fd50259e62d55551f1868c9f49222f079ab092bfd35257c91dd62e4760cf4abb0e5144c560ef30cd74e5e0725d34f1d19ac90bd diff --git a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild deleted file mode 100644 index b8e7eed45094..000000000000 --- a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-logging:commons-logging:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" -HOMEPAGE="https://commons.apache.org/proper/commons-logging/"; -SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )" -S="${WORKDIR}/${P}-src" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="log4j" - -# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26: -# error: cannot find symbol -# import org.apache.commons.logging.impl.Log4jApiLogFactory; -# ^ -# symbol: class Log4jApiLogFactory -# location: package org.apache.commons.logging.impl -REQUIRED_USE="test? ( log4j )" - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" - -COMMON_DEPEND=" - dev-java/jakarta-servlet-api:4 - dev-java/slf4j-api:0 - log4j? ( - dev-java/log4j-12-api:2 - dev-java/log4j-api:2 - ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=virtual/jdk-11:* - test? ( - dev-java/commons-io:1 - dev-java/junit:5 - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( NOTICE.txt src/changes/changes.xml ) -HTML_DOCS=( PROPOSAL.html ) - -JAVA_GENTOO_CLASSPATH=" - jakarta-servlet-api-4 - slf4j-api -" - -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - java-pkg-2_src_prepare - - # https://avalon.apache.org/closed.html Apache Avalon has closed. - rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die - rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die - - if use !log4j; then - rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die - rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die - else - JAVA_GENTOO_CLASSPATH+=" - log4j-12-api-2 - log4j-api-2 - " - fi -} - -src_compile() { - # getting dependencies into the modulepath - DEPENDENCIES=( - jakarta-servlet-api-4 - slf4j-api - $(use log4j && echo log4j-12-api-2) - $(use log4j && echo log4j-api-2) - ) - local modulepath - for dependency in ${DEPENDENCIES[@]}; do - modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" - done - - local JAVA_MODULE_NAME="org.apache.${PN/-/.}" - JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar" - java-pkg-simple_src_compile # creates a legacy jar file without module-info - - # generate module-info.java - jdeps \ - --module-path "${modulepath}" \ - --add-modules=ALL-MODULE-PATH \ - --generate-module-info src/main \ - --multi-release 9 \ - "${JAVA_MODULE_NAME}.jar" || die - - # compile module-info.java - ejavac \ - -source 9 -target 9 \ - --module-path "${modulepath}" \ - --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \ - -d target/versions/9 \ - src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java - - # package - JAVA_JAR_FILENAME="${PN}.jar" - jar cvf "${JAVA_JAR_FILENAME}" \ - -C target/classes . \ - --release 9 -C target/versions/9 . || die - - pushd target/classes > /dev/null || die - - # pom.xml, lines 81-103 - jar -cvf ../../commons-logging-api.jar \ - $(find . -type f -name '*.class' \ - ! -name 'Jdk13LumberjackLogger.class' \ - ! -name 'ServletContextCleaner.class' \ - ) || die - - # pom.xml, lines 205-124 - jar -cvf ../../commons-logging-adapters.jar \ - $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ - ! -name 'WeakHashtable*.class' \ - ! -name 'LogFactoryImpl*.class' \ - ) || die - - popd > /dev/null || die -} - -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 - rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die - # error: package ch.qos.logback.classic does not exist - rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die - - JAVA_TEST_EXCLUDES=( - org.apache.commons.logging.jdk14.TestHandler # No runnable methods - # junit.framework.AssertionFailedError: Wrong factory retrieved through - # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory - org.apache.commons.logging.serviceloader.ServiceLoaderTestCase - # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log> - # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log> - org.apache.commons.logging.noop.NoOpLogTestCase - # org.junit.runners.model.InvalidTestClassyyError: Invalid test class - org.apache.commons.logging.LogSourceTest # No runnable methods - # junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null! - org.apache.commons.logging.LoadTestCase - # junit.framework.AssertionFailedError: - # expected:<org.apache.commons.logging.PathableClassLoader@1edf1c96> - # but was:<org.apache.commons.logging.PathableClassLoader@15615099> - org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase - ) - JAVA_TEST_EXTRA_ARGS=( - -Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)" - -Dlog4j-api="commons-logging-api.jar" - -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)" - -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="commons-io-1 commons-lang-3.6 junit-4 junit-5" - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - java-pkg-simple_src_test -}
