From 74c0cf95a320c4b97d61a4a044f1411f344cb6ff Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 29 Jul 2026 07:51:36 +0200 Subject: [PATCH] dev-java/log4j-12-api: drop 2.19.0, 2.25.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Part-of: https://codeberg.org/gentoo/gentoo/pulls/1445 Signed-off-by: Miroslav Šulc --- dev-java/log4j-12-api/Manifest | 3 - .../log4j-12-api/log4j-12-api-2.19.0.ebuild | 88 -------------- .../log4j-12-api/log4j-12-api-2.25.2.ebuild | 114 ------------------ 3 files changed, 205 deletions(-) delete mode 100644 dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild delete mode 100644 dev-java/log4j-12-api/log4j-12-api-2.25.2.ebuild diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest index 4fd2137133ffa..a52169f77b36d 100644 --- a/dev-java/log4j-12-api/Manifest +++ b/dev-java/log4j-12-api/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-12-api/log4j-12-api-2.19.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild deleted file mode 100644 index 4272ee3304330..0000000000000 --- a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/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-12-api-2.19.0.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.19.0" -JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The Apache Log4j 1.x Compatibility API" -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: log4j-1.2-api/pom.xml -# org.apache.logging.log4j:log4j-api:2.19.0 -> >=dev-java/log4j-api-2.19.0:2 -# org.apache.logging.log4j:log4j-core:2.19.0 -> >=dev-java/log4j-core-2.19.0:2 - -CP_DEPEND=" - ~dev-java/log4j-api-${PV}:2 - ~dev-java/log4j-core-${PV}:2 -" - -# Compile dependencies -# POM: log4j-1.2-api/pom.xml -# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!! -# POM: log4j-1.2-api/pom.xml -# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4 -> >=dev-java/jackson-dataformat-xml-2.13.4:0 -# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# 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.logging.log4j:log4j-core:2.19.0 -> >=dev-java/log4j-core-2.19.0:2 -# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!! -# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!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.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? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0 - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - dev-java/javax-jms-api:0" -# test? ( -# !!!artifactId-not-found!!! -# !!!groupId-not-found!!! -# >=dev-java/commons-io-2.11.0:1 -# >=dev-java/commons-lang-3.12.0:3.6 -# >=dev-java/felix-framework-7.0.5:0 -# >=dev-java/jackson-dataformat-xml-2.13.4:0 -# >=dev-java/jakarta-oro-2.0.8:2.0 -# >=dev-java/log4j-api-2.19.0:2 -# >=dev-java/log4j-core-2.19.0:2 -# >=dev-java/mockito-4.6.1:4 -# ) -#" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md ) - -S="${WORKDIR}/apache-log4j-${PV}-src" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.log4j" -JAVA_CLASSPATH_EXTRA="javax-jms-api" -JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources" -JAVA_SRC_DIR="log4j-1.2-api/src/main/java" - -#JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0" -#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java" -#JAVA_TEST_RESOURCE_DIRS=( -# "log4j-1.2-api/src/test/resources" -#) diff --git a/dev-java/log4j-12-api/log4j-12-api-2.25.2.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.25.2.ebuild deleted file mode 100644 index e89b172b092e2..0000000000000 --- a/dev-java/log4j-12-api/log4j-12-api-2.25.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2026 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" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="The Apache Log4j 1.x Compatibility API" -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" -RESTRICT="test" # Too many test-dependencies not packaged. - -BDEPEND=" - app-arch/unzip - verify-sig? ( >=sec-keys/openpgp-keys-apache-logging-20251104 ) -" - -CP_DEPEND=" - dev-java/javax-jms-api:0 - ~dev-java/log4j-api-${PV}:0 - ~dev-java/log4j-core-${PV}: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-compress-1.28.0:0 - >=dev-java/commons-csv-1.14.1-r1:0 - >=dev-java/commons-io-2.20.0:0 - >=dev-java/commons-lang-3.19.0:0 - >=dev-java/conversant-disruptor-1.2.20: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/jakarta-activation-2.0.1-r1:2 - >=dev-java/jakarta-mail-2.0.1:0 - >=dev-java/jctools-core-4.0.5-r1:0 - >=dev-java/jeromq-0.6.0-r1:0 - >=dev-java/jnacl-1.0-r1: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/osgi-core-8.0.0:0 - >=dev-java/snakeyaml-2.5:0 - >=dev-java/stax2-api-4.2.2:0 - >=dev-java/xz-java-1.10:0 - >=dev-java/zstd-jni-1.5.7.4:0 - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - >=dev-java/bnd-annotation-7.1.0:0 - >=dev-java/osgi-annotation-8.1.0:0 - >=virtual/jre-1.8:* -" - -JAVA_CLASSPATH_EXTRA=" - asm - brotli-dec - commons-codec - commons-compress - commons-csv - commons-io - commons-lang - conversant-disruptor - jackson-annotations - jackson-core - jackson-databind - jackson-dataformat-xml - jackson-dataformat-yaml - jakarta-activation-2 - jakarta-mail - jctools-core - jeromq - jnacl - jspecify - kafka-clients - lmax-disruptor - osgi-core - snakeyaml - stax2-api - xz-java - zstd-jni -" -JAVA_INTERMEDIATE_JAR_NAME="org.apache.log4j" -JAVA_MODULE_INFO_OUT="log4j-1.2-api-java9/src/main/java" -JAVA_RELEASE_SRC_DIRS=( ["9"]="log4j-1.2-api-java9/src/main/java" ) -JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources" -JAVA_SRC_DIR="log4j-1.2-api/src/main/java" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/logging.apache.org.asc" - -src_install() { - # Upstream puts module-info.class at the root of the jar. - rm log4j-12-api.jar || die - mv target/classes/{META-INF/versions/9/,}module-info.class || die - echo 'Multi-Release: false' >> target/classes/META-INF/MANIFEST.MF || die "add false" - jar cfm log4j-12-api.jar target/classes/META-INF/MANIFEST.MF -C target/classes . || die - - java-pkg-simple_src_install - java-pkg_register-dependency bnd-annotation,osgi-annotation -}