commit: f42d33522cabe1638e27df10a14866d236131213 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Oct 31 23:23:11 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Apr 20 18:25:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42d3352
dev-java/commons-digester: 2.1-r3 add module-info Setting JAVA_MODULE_INFO_OUT and JAVA_INTERMEDIATE_JAR_NAME in the ebuild lets the java-pkg-simple.eclass generate module-info.java and compile and package it as 'META-INF/versions/9/module-info.class'. Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/41428/commits/6b64022a664cc4c1f616a174179212c3b0862fe5 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-digester/Manifest | 1 + .../commons-digester-2.1-r3.ebuild | 90 ++++++++++++++++++++++ dev-java/commons-digester/metadata.xml | 3 + 3 files changed, 94 insertions(+) diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest index 45f9fac5a2c9..dee74108f4a0 100644 --- a/dev-java/commons-digester/Manifest +++ b/dev-java/commons-digester/Manifest @@ -1,2 +1,3 @@ DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88 +DIST commons-digester-2.1-src.tar.gz.asc 194 BLAKE2B d9f958c0aee8342b92e860fbb7a9f865b22d3ec0b368e4c7df311409d26295bf50e9ee0f595b47f72203df039681fa4c0822264444458bbc8fe1ae72dbac2968 SHA512 99907110f741feb4f36298e9cdc0c0224b98a211de47a2773de03dba6b11e1f80af779cca9e5307384af6078fc70a01e3b207487f97b57e10ffebf6d7da60033 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad diff --git a/dev-java/commons-digester/commons-digester-2.1-r3.ebuild b/dev-java/commons-digester/commons-digester-2.1-r3.ebuild new file mode 100644 index 000000000000..90477a846833 --- /dev/null +++ b/dev-java/commons-digester/commons-digester-2.1-r3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-digester:commons-digester:2.1" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects" +HOMEPAGE="https://commons.apache.org/digester/" +SRC_URI="mirror://apache/commons/digester/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/digester/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/commons-digester-${PV}-src" + +LICENSE="Apache-2.0" +SLOT="2.1" +KEYWORDS="~amd64 ~ppc64" +IUSE="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/commons-beanutils-1.10.1:0[log4j=] + dev-java/commons-collections:0 + >=dev-java/commons-logging-1.3.5:0[log4j=] + 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:* +" + +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt ) + +# JAVA_ENCODING="iso-8859-1" +JAVA_GENTOO_CLASSPATH=" + commons-beanutils + commons-collections + commons-logging + jakarta-servlet-api-4 + slf4j-api +" + +JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}" +JAVA_MODULE_INFO_OUT="src/main" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + java-pkg-2_src_prepare + + if use log4j; then + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi +} + +src_test() { + pushd src/test/java || die + # Exclusions according to 212,215 pom.xml + local JAVA_TEST_RUN_ONLY=$(find * \ + ! -name "Abstract*.java" ! -name "TestBean.java" \ + ! -name "TestRule.java" ! -name "TestRuleSet.java" \ + -name "*TestCase.java" -o -name "*Test.java") + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + popd + java-pkg-simple_src_test +} diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml index 080f8a0f0318..a060b35e293a 100644 --- a/dev-java/commons-digester/metadata.xml +++ b/dev-java/commons-digester/metadata.xml @@ -8,4 +8,7 @@ <longdescription> The Apache Commons Digester package lets you configure an XML to Java object mapping module which triggers certain actions called rules whenever a particular pattern of nested XML elements is recognized. </longdescription> + <use> + <flag name="log4j">Add optional support for log4j</flag> + </use> </pkgmetadata>