commit: 8403dfc9df1e3fa9a90a87b9d9c0923d7ba6a90b Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Sep 30 08:22:48 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Apr 20 18:28:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8403dfc9
dev-java/commons-validator: add 1.9.0 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/282d2c957ee30847148291d441c74faa1981dfc2 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-validator/Manifest | 2 + .../commons-validator-1.9.0.ebuild | 74 ++++++++++++++++++++++ dev-java/commons-validator/metadata.xml | 3 + 3 files changed, 79 insertions(+) diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest index c8d595696045..7d5d5ba947c2 100644 --- a/dev-java/commons-validator/Manifest +++ b/dev-java/commons-validator/Manifest @@ -1,2 +1,4 @@ DIST commons-validator-1.8.0-src.tar.gz 291779 BLAKE2B 0a0a0f9019b39ff1899be2f65e5e6750e12ed7b6833cc7e03279b5bedd3b3c3e02561891ba8885b50c356d103dabe207bf18adf04d8e6ba627397c5b81656603 SHA512 f0c2662e5db0bbc6ee9d05d5508caa02bf45b7c7ada92f4a97a867848f3d704b35552d47859a46567705194248e7b88cd8df8f082939012ab60b6aed446e36b2 DIST commons-validator-1.8.0-src.tar.gz.asc 488 BLAKE2B 9e9b7f54f430c5a42de8af6d8c55a0f4029e3a41f0bc41efb08863a9470f0935ad23d6ba6757cf4d5e28c11626e15ae392807ae9c33529a3feb15b90a2316ca5 SHA512 f04709f64026560bfd2f5cc51ebf373d44359452f41af73b53d105059a6760786f49d89837c624cd133875de0a37358af1cf587a6db567e7cc76ce823efa9efd +DIST commons-validator-1.9.0-src.tar.gz 296710 BLAKE2B e5f119cd7e6e1fe148038cb62a3bdc01e5d1b8dee37930e9369e331a398dbc86e3b1fdc1a618b69fce0f96c621d23a44f88dccd4a51cd6a4c6df81a3a4c8c3af SHA512 4e36f0ec5b1b8ae9724f020c51396332444d7359988fbcceaab004cde30e223b8130315e85d9b3d568fdc30399e9e503783bb81f217fe5f846f9e14c484a1fe0 +DIST commons-validator-1.9.0-src.tar.gz.asc 488 BLAKE2B 0d7d76a24043c20eda4080273f1535a84256ca1c3b8d52a55b004c62f70f9f6ae481cb6d5667d5b0f0d7468d09041520627127597e1e8d81fc132348e2d8994d SHA512 fa68ae531f7678cb172be1ecd0181999619ef4e711930b880b07156a40f14adbf92fa09c971ab36055936cf6221fda800abc54800eba0aeb90fd95c38175d628 diff --git a/dev-java/commons-validator/commons-validator-1.9.0.ebuild b/dev-java/commons-validator/commons-validator-1.9.0.ebuild new file mode 100644 index 000000000000..6641dbdedc9a --- /dev/null +++ b/dev-java/commons-validator/commons-validator-1.9.0.ebuild @@ -0,0 +1,74 @@ +# 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-validator:commons-validator:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Commons component to validate user input, or data input" +HOMEPAGE="https://commons.apache.org/proper/commons-validator/" +SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/validator/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="log4j" +RESTRICT="test" #839681 + +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-digester-2.1-r3:2.1[log4j=] + >=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:* +" + +JAVA_GENTOO_CLASSPATH=" + commons-beanutils + commons-collections + commons-digester-2.1 + 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" + +src_prepare() { + java-pkg-2_src_prepare + + if use log4j; then + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi +} diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml index b356ec45e875..021032c5583d 100644 --- a/dev-java/commons-validator/metadata.xml +++ b/dev-java/commons-validator/metadata.xml @@ -12,4 +12,7 @@ </changelog> <remote-id type="github">apache/commons-validator</remote-id> </upstream> + <use> + <flag name="log4j">Add optional support for log4j</flag> + </use> </pkgmetadata>