gentoo resync : 03.07.2021

6 files changed, 74 insertions, 190 deletions

diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 25e8110e71d6..b0df1670d9b8 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,3 @@
-AUX validator-1.4.build.xml.patch 676 BLAKE2B 43e8729df9775683413d746756d820bc50f593e8b97dfec0e19bfb543e15b2ed790571d2508247f5f46922be26f2e0e57d7877e390189a6b4ac1380c791d074b SHA512 3b426b65d32799398de59d063f67c840d261593278a48afd81024479171e68483add4c69aeed1e65127812850500ba6ffe24cf31ecda6ad16d3a2df64fb2c218
-DIST commons-validator-1.4.0-src.tar.gz 222421 BLAKE2B 1a83d39be6b2cd8c20cc027cd49b813cd23f65772f17e2c8f1dc7357edd0abf80ce2f76c2c8fb5a5b4acc66eff740925b970cc21ba6a582ecab71f74be84f7bf SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98
-DIST commons-validator-1.4.1-src.tar.gz 244155 BLAKE2B 4d7d63f30bdc9196f73812fa584226f28d9514918c13f0279be74e868f2410e08b2bc2a71a4a54d2b2ba91d580438f3de6fa71afe8dd38838d234723921b6c27 SHA512 e64d16de2481c388c81a488dbe894c4d16a1abad12f841f6f77e2606013edbce75ec7a1371976b7e642adfc7cbc5038ff7271cb4d184fbeb32a635acf6bccb38
-EBUILD commons-validator-1.4.0.ebuild 2655 BLAKE2B 46acd60320b348d2b9e6b1747f781d402482a0ffd83ed04000919b1f5879728f18404fa4a7d943c512dd824cca2d428b3beb7f1fb3e9ccd34d7d2d08ec153bf7 SHA512 3180153f474f63d2d5a137d7a4ba93342bd281172f25ce813ad7d1f7cdcefa502f3f0cc05cea5a2a03f7fbd9cf2acf70ed3e18fd1852c60531634c717956faa2
-EBUILD commons-validator-1.4.1.ebuild 2661 BLAKE2B f49b3f0e370034d7f15f7ad23774356720d72ac54f361b0da8c7f2c16986db949df477e49dff9929bf0425665c23d8b741d01f304d384cdfa33626c467ac13e9 SHA512 c049a29d136eb6ff081959dbf7c97b2fb47a05c7f9913d8c0988fdb7c7b2d3ca4d7330afd68bc5fb7bbab9e6662255c22872ca669b6daff808c1e498bff38a3e
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
+DIST commons-validator-1.7-src.tar.gz 289870 BLAKE2B 576c6ac00187b67618eee251a69e7166cd817bb6184f4cf138a226539fc100a1a4e32ebc4ef6cea567aff581d11c63a817a9dad4836142de4d9a3b313d59a31b SHA512 4007872fda856e9e154f325270748081920d21a716143389713706ca0e5a8ec3c88b9b978d75801a5926723764a81f1dbfd77a8fd4b361b16cd65e84cf47a868
+EBUILD commons-validator-1.7.ebuild 2118 BLAKE2B 2e202adb19e516314b96709e190e69bd0367905c4b9a9ef320010f37e8439bf01fa697e0bd52d5dbfd7e459ce2518c3a8fbb5f45f9be4f48fa7cf65784bd376d SHA512 6127dcee106e86a2e728090c6b0ffca675461836e4945fecfc2f25c983aff1868ea95cc7d0d90c75f0e6d4d720816137a30f491554c33f127531791914dcf137
+MISC metadata.xml 436 BLAKE2B c228665acb7f7d2f5662f0993a55abf29a0c42d580de51d7ac1ad8c100959762292d575281675dd0d58dc39607c3f0639715eb6c66f30c618d80b98745264930 SHA512 8e168e85f4a50c0aeb9eb7c1dbad276a1f4ec2a980a508c0ed39b37d16d42b4b5a74a3b3d914b9b875c2be7a9a98ffd7cad6811bcb958097bab46406a74b5d5e
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
deleted file mode 100644
index 00a7eebf1026..000000000000
--- a/dev-java/commons-validator/commons-validator-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="examples source test" # doc
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P}-src
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="http://commons.apache.org/validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-digester-1.6:0
-	>=dev-java/commons-collections-3.1:0
-	>=dev-java/commons-logging-1.0.4:0
-	dev-java/commons-beanutils:1.7"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
-
-	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-
-	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
-}
-
-EANT_JAVA_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Dskip.download=true"
-
-src_compile() {
-	java-pkg-2_src_compile
-	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
-
-	if use test ; then
-		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
-		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
-	fi
-}
-
-# Missing test suite org.apache.commons.validator.ValidatorTestSuite; therefore, tests can't be ran.
-# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
-RESTRICT="test"
-
-src_test() {
-	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
-	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	# Docs are no longer generated, as they have commented them out;
-	# probably on purpose, since this is the start of a new branch.
-	# use doc && java-pkg_dojavadoc dist/docs/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
deleted file mode 100644
index a7f4bcc21ed6..000000000000
--- a/dev-java/commons-validator/commons-validator-1.4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="examples source test" # doc
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P}-src
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="http://commons.apache.org/validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6
-	>=dev-java/commons-digester-1.6:0
-	>=dev-java/commons-collections-3.1:0
-	>=dev-java/commons-logging-1.0.4:0
-	dev-java/commons-beanutils:1.7"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
-
-	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-
-	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
-}
-
-EANT_JAVA_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Dskip.download=true"
-
-src_compile() {
-	java-pkg-2_src_compile
-	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
-
-	if use test ; then
-		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
-		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
-	fi
-}
-
-# Missing test suite org.apache.commons.validator.ValidatorTestSuite;
-# therefore, tests can't be run.
-
-# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
-RESTRICT="test"
-
-src_test() {
-	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
-	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	# Docs are no longer generated, as they have commented them out;
-	# probably on purpose, since this is the start of a new branch.
-	# use doc && java-pkg_dojavadoc dist/docs/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild
new file mode 100644
index 000000000000..b71d4a85a4b9
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://artfiles.org/apache.org//commons/validator/source/commons-validator-1.7-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-validator-1.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-validator:commons-validator:1.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
+# commons-digester:commons-digester:2.1 -> >=dev-java/commons-digester-2.1:2.1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CDEPEND="
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-digester:2.1
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0
+# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0
+#
+# restricting for compilation to jdk 1.8 just because of tests which
+# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11
+
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/commons-csv:0
+		dev-java/junit-clptr:0
+	)
+"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/commons-validator/files/validator-1.4.build.xml.patch b/dev-java/commons-validator/files/validator-1.4.build.xml.patch
deleted file mode 100644
index 579832bb4a09..000000000000
--- a/dev-java/commons-validator/files/validator-1.4.build.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml.o	2006-10-21 18:12:49.000000000 +0200

-+++ build.xml	2006-10-21 18:29:18.000000000 +0200

-@@ -204,7 +205,7 @@

-   </target>

- 

- 

--  <target name="compile" depends="static"

-+  <target name="compile" depends="prepare"

-    description="Compile shareable components">

-     <javac  srcdir="${source.home}"

-            destdir="${build.home}/classes"

-@@ -278,7 +279,7 @@

-     </exec>

-   </target>

- 

--  <target name="javadoc" depends="compile, javadoc.js"

-+  <target name="javadoc" depends="compile"

-    description="Create component Javadoc documentation">

-     <javadoc sourcepath="${source.home}"

-                 destdir="${dist.home}/docs/apidocs"

diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml
index 2444066aa02b..0bb1954fb41e 100644
--- a/dev-java/commons-validator/metadata.xml
+++ b/dev-java/commons-validator/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/VALIDATOR/issues/</bugs-to>
+		<changelog>http://commons.apache.org/proper/commons-validator/changes-report.html</changelog>
+	</upstream>
 </pkgmetadata>