From 2b67ed5b8e5494c6a4c3852b1299f9f07efbefd0 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 30 Jul 2026 05:23:47 +0200 Subject: [PATCH] dev-java/log4j-core: drop 2.19.0-r2, 2.25.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/971360 Bug: https://bugs.gentoo.org/977952 Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1445 Signed-off-by: Miroslav Šulc --- dev-java/log4j-core/Manifest | 3 - .../log4j-core/log4j-core-2.19.0-r2.ebuild | 179 ------------------ dev-java/log4j-core/log4j-core-2.25.2.ebuild | 115 ----------- 3 files changed, 297 deletions(-) delete mode 100644 dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild delete mode 100644 dev-java/log4j-core/log4j-core-2.25.2.ebuild diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest index 4fd2137133ffa..a52169f77b36d 100644 --- a/dev-java/log4j-core/Manifest +++ b/dev-java/log4j-core/Manifest @@ -1,5 +1,2 @@ -DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271 -DIST apache-log4j-2.25.2-src.zip 7395022 BLAKE2B 5865672255ab640facdd24f8fd883b67853ddd01dff4d3e35f7318244d13db8995ccb97d687d94fd3dcce88d407b16058b89760723c4cefe29f1941b5bd945e7 SHA512 6d9f36d4aa829fad6eb1fdf92caa343dbf0add04574de3052be17cc75b6551bf2d62836c1be350acecddb5655fba748eeb8a7c73f00cc58e514bd727c391553d -DIST apache-log4j-2.25.2-src.zip.asc 833 BLAKE2B fe4eeabf107b1d89384b2f3ee8d0cdb0bead5208494be972ddab6a15c2dfe77e881d496d9750a816f3b9bc293f063164dc2a7f7b5796ae3f03f6e93182cc7347 SHA512 bb0847c3bec4ff0496baa8aab5236e4076676f1d99cae305eeac061fa3b6e5e1b8788509b92659e2b45904241b46a156e6ceff65458e8c88d5539a4ac4270cc0 DIST apache-log4j-2.26.0-src.zip 7460219 BLAKE2B bb30a3ddea745ad3cb101ba288d11b2b966cc6de11f386deb202b586a418d6326114555834f64e8cb4ea0339d5d54fad1590be419cf8efe3d9793121bda46c70 SHA512 b9f82de518c4040606aed926a1ce7be802c7535a3b91a872740560718174317ba4cf16b9f03561990dd049ca75dd375c73676191c15f8faae898d66c9acde2e2 DIST apache-log4j-2.26.0-src.zip.asc 833 BLAKE2B 7a0adcd31cfce9e2ea446ac49d8a1c0f9e1793c00f55c1fe7e8d4dd616b3296bf9182c1657fa57fb2f53c6d3cc834cbe682d994e6657718f582a38a516412068 SHA512 035863a0aecda3609b74d82216d93e42b77b6762c5e1f7a8f41ddb0b429c63db45dd8548ce4d2d4823529f9f6e3377f6de98dc226c25abba36a4440f3f446043 diff --git a/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild deleted file mode 100644 index e6e5076d8a37e..0000000000000 --- a/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.19.0.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.logging.log4j:log4j-core:2.19.0" -# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The Apache Log4j Implementation" -HOMEPAGE="https://logging.apache.org/log4j/2.x/" -SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 arm64 ppc64" - -# We don't have junit-vintage and junit-jupiter -RESTRICT="test" - -# Common dependencies -# POM: ${PN}/pom.xml -# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.20:0 -# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0 -# com.fasterxml.jackson.core:jackson-databind:2.13.4 -> >=dev-java/jackson-databind-2.13.4:0 -# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4 -> >=dev-java/jackson-dataformat-xml-2.13.4:0 -# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4 -> >=dev-java/jackson-dataformat-yaml-2.13.4:0 -# com.fasterxml.woodstox:woodstox-core:6.3.1 -> >=dev-java/woodstox-core-6.3.1:0 -# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0 -# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0 -# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0 -# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0 -# org.apache.logging.log4j:log4j-api:2.19.0 -> >=dev-java/log4j-api-2.19.0:2 -# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2 -# org.jctools:jctools-core:3.3.0 -> >=dev-java/jctools-core-3.3.0:3 -# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0 -# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0 - -CP_DEPEND=" - dev-java/commons-compress:0 - dev-java/commons-csv:0 - dev-java/conversant-disruptor:0 - dev-java/jackson-core:1 - dev-java/jackson-databind:1 - dev-java/jackson-dataformat-xml:1 - dev-java/jackson-dataformat-yaml:1 - dev-java/jansi:2 - dev-java/javax-mail:0 - >=dev-java/jctools-core-4.0.3-r1:0 - dev-java/jeromq:0 - dev-java/kafka-clients:0 - dev-java/lmax-disruptor:0 - ~dev-java/log4j-api-${PV}:2 - dev-java/slf4j-api:0 - dev-java/woodstox-core:0 -" - -# Compile dependencies -# POM: ${PN}/pom.xml -# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!! -# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!! -# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!! -# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0 -# POM: ${PN}/pom.xml -# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0 -# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0 -# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!! -# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!! -# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!! -# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0 -# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0 -# test? net.javacrumbs.json-unit:json-unit:2.35.0 -> !!!groupId-not-found!!! -# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0 -# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!! -# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 -# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> >=dev-java/felix-framework-7.0.5:0 -# test? org.apache.logging.log4j:log4j-api:2.19.0 -> >=dev-java/log4j-api-2.19.0:2 -# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!! -# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!! -# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!! -# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!! -# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!! -# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!artifactId-not-found!!! -# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! -# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0 -# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!! -# test? org.jmdns:jmdns:3.5.8 -> !!!groupId-not-found!!! -# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-engine:5.9.0 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-params:5.9.0 -> !!!groupId-not-found!!! -# test? org.junit.platform:junit-platform-commons:1.9.0 -> !!!groupId-not-found!!! -# test? org.junit.vintage:junit-vintage-engine:5.9.0 -> !!!groupId-not-found!!! -# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.6.1:4 -# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!! -# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0 -# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!! -# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0 -# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!! -# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!! -# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!! - -DEPEND="${CP_DEPEND} - dev-java/jakarta-activation-api:1 - dev-java/jakarta-mail-api:0 - dev-java/javax-jms-api:0 - dev-java/osgi-core:0 - >=virtual/jdk-1.8:*" -# test? ( -# !!!artifactId-not-found!!! -# !!!groupId-not-found!!! -# !!!suitable-mavenVersion-not-found!!! -# >=dev-java/bsh-2.0_beta6:0 -# >=dev-java/commons-codec-1.15:0 -# >=dev-java/commons-io-2.11.0:1 -# >=dev-java/commons-lang-3.12.0:3.6 -# >=dev-java/commons-logging-1.2:0 -# >=dev-java/felix-framework-7.0.5:0 -# >=dev-java/hamcrest-2.2:0 -# >=dev-java/log4j-api-2.19.0:2 -# >=dev-java/logback-classic-1.2.11:0 -# >=dev-java/logback-core-1.2.11:0 -# >=dev-java/mockito-4.6.1:4 -# >=dev-java/slf4j-ext-1.7.36:0 -# >=dev-java/xz-java-1.9:0 -# ) -#" - -# Runtime dependencies -# POM: ${PN}/pom.xml -# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!! - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) - -S="${WORKDIR}/apache-log4j-${PV}-src" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.logging.log4j.core" -JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core" -JAVA_RESOURCE_DIRS="${PN}/src/main/resources" -JAVA_SRC_DIR="${PN}/src/main/java" - -#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" -#JAVA_TEST_SRC_DIR="${PN}/src/test/java" -#JAVA_TEST_RESOURCE_DIRS=( -# "${PN}/src/test/resources" -#) - -src_compile() { - java-pkg-simple_src_compile - - # Process the @Plugin annotation used on Log4j 2 built-in plugins - # to generate a serialized plugin listing file - # https://logging.apache.org/log4j/2.x/manual/plugins.html - local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor" - local classes="target/classes" - local classpath="${JAVA_JAR_FILENAME}:$(\ - java-pkg_getjars --build-only --with-dependencies \ - "${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")" - # Just in case java-pkg-simple.eclass changes the path in the future - mkdir -p "${classes}" || die "Failed to create directory for classes" - local sources_list_file="${T}/sources.lst" - find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die - ejavac -d "${classes}" -cp "${classpath}" \ - -proc:only -processor "${processor}" \ - @"${sources_list_file}" - # Update the JAR to include the serialized plugin listing file - local jar="$(java-config -j)" - "${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . || - die "Failed to update JAR" -} diff --git a/dev-java/log4j-core/log4j-core-2.25.2.ebuild b/dev-java/log4j-core/log4j-core-2.25.2.ebuild deleted file mode 100644 index bad3b567780ef..0000000000000 --- a/dev-java/log4j-core/log4j-core-2.25.2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No tests, too many test-dependencies are not packaged. -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple junit5 verify-sig - -DESCRIPTION="The Apache Log4j Implementation" -HOMEPAGE="https://logging.apache.org/log4j/2.x/" -SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.zip - verify-sig? ( https://downloads.apache.org/logging/log4j/${PV}/apache-log4j-${PV}-src.zip.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -BDEPEND=" - app-arch/unzip - verify-sig? ( >=sec-keys/openpgp-keys-apache-logging-20251104 ) -" -CP_DEPEND=" - >=dev-java/bnd-annotation-7.1.0:0 - >=dev-java/commons-compress-1.28.0:0 - >=dev-java/commons-csv-1.14.1-r1:0 - >=dev-java/conversant-disruptor-1.2.20:0 - >=dev-java/findbugs-annotations-3.0.1:0 - >=dev-java/jackson-annotations-2.20:0 - >=dev-java/jackson-core-2.20.0:0 - >=dev-java/jackson-databind-2.20.0:0 - >=dev-java/jackson-dataformat-xml-2.20.0:0 - >=dev-java/jackson-dataformat-yaml-2.20.0:0 - >=dev-java/javax-mail-1.6.7-r2:0 - >=dev-java/jctools-core-4.0.5-r1:0 - >=dev-java/jeromq-0.6.0-r1:0 - >=dev-java/javax-jms-api-2.0.3:0 - >=dev-java/jspecify-1.0.0:0 - >=dev-java/kafka-clients-1.1.1-r2:0 - >=dev-java/lmax-disruptor-3.4.4:0 - ~dev-java/log4j-api-${PV}:0 - >=dev-java/osgi-annotation-8.1.0:0 - >=dev-java/osgi-core-8.0.0:0 - >=dev-java/stax2-api-4.2.2:0 -" - -DEPEND=" - ${CP_DEPEND} - >=dev-java/asm-9.9:0 - >=dev-java/brotli-dec-0.1.2-r1:0 - >=dev-java/commons-codec-1.19.0:0 - >=dev-java/commons-io-2.20.0:0 - >=dev-java/commons-lang-3.19.0:0 - >=dev-java/jakarta-activation-api-1.2.2-r1:1 - >=dev-java/jnacl-1.0-r1:0 - >=dev-java/snakeyaml-2.5:0 - >=dev-java/xz-java-1.10:0 - >=dev-java/zstd-jni-1.5.7.4:0 - >=virtual/jdk-9:* -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -JAVA_CLASSPATH_EXTRA="asm brotli-dec commons-codec commons-io - commons-lang jakarta-activation-api-1 jnacl snakeyaml xz-java zstd-jni" -JAVA_INTERMEDIATE_JAR_NAME="org.apache.logging.log4j.core" -JAVA_MODULE_INFO_OUT="log4j-core-java9/src/main/java" -JAVA_RELEASE_SRC_DIRS=( ["9"]="log4j-core-java9/src/main/java" ) -JAVA_RESOURCE_DIRS="${PN}/src/main/resources" -JAVA_SRC_DIR="${PN}/src/main/java" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/logging.apache.org.asc" - -src_prepare() { - java-pkg-2_src_prepare - # according to what we get from grep -nr '@ServiceProvider' log4j-core/* - - mkdir -p log4j-core/src/main/resources/META-INF/services || die "mkdir" - pushd $_ >/dev/null || die "pushd" - echo "org.apache.logging.log4j.core.config.plugins.processor.GraalVmProcessor" \ - > javax.annotation.processing.Processor || die - echo "org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor" \ - >> javax.annotation.processing.Processor || die - echo "org.apache.logging.log4j.core.impl.ThreadContextDataProvider" \ - > org.apache.logging.log4j.core.util.ContextDataProvider || die - echo "org.apache.logging.log4j.core.message.ExtendedThreadInfoFactory" \ - > 'org.apache.logging.log4j.message.ThreadDumpMessage$ThreadInfoFactory' || die - echo "org.apache.logging.log4j.core.impl.Log4jProvider" \ - > org.apache.logging.log4j.spi.Provider || die - popd >/dev/null || die popd -} - -src_compile() { - # we run this twice, first time to get PluginProcessor into processorpath. - java-pkg-simple_src_compile - - # using PluginProcessor.class - JAVAC_ARGS=" -processorpath target/classes:$(java-pkg_getjars log4j-api) \ - -processor org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor" - java-pkg-simple_src_compile - - # For versions/9, upstream packages only what's listed in log4j-core-java9/src/assembly/java9.xml - # We remove the jar, remove from target/classes what's not needed and re-create the jar. - rm log4j-core.jar || die - rm -r target/classes/META-INF/versions/9/org/apache/logging/log4j/core/pattern || die - rm target/classes/META-INF/versions/9/org/apache/logging/log4j/core/util/Integers.class || die - rm target/classes/META-INF/versions/9/org/apache/logging/log4j/core/impl/ExtendedClassInfo.class || die - rm target/classes/META-INF/versions/9/org/apache/logging/log4j/core/jackson/StackTraceElementConstants.class || die - mv target/classes/{META-INF/versions/9/,}module-info.class || die - echo 'Multi-Release: true' >> target/classes/META-INF/MANIFEST.MF || die "add true" - jar cfm log4j-core.jar target/classes/META-INF/MANIFEST.MF -C target/classes . || die -}