commit: 614473283ed6eb78a876ca894b91ebde05329cb4 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Jul 1 14:11:03 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Jul 1 14:15:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61447328
dev-java/commons-validator: finished 1.7 from pr 1) removed unused dep 2) packaged and added missing deps 3) made tests work Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/commons-csv/commons-csv-1.8.ebuild | 2 +- .../commons-validator/commons-validator-1.7.ebuild | 33 +++++++++------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dev-java/commons-csv/commons-csv-1.8.ebuild b/dev-java/commons-csv/commons-csv-1.8.ebuild index d307ff30ad1..a8d528c2213 100644 --- a/dev-java/commons-csv/commons-csv-1.8.ebuild +++ b/dev-java/commons-csv/commons-csv-1.8.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/"; SRC_URI="https://mirror.dkm.cz/apache//commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" # missing test deps RESTRICT="test" diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild index d74d2025287..24d02b4d81f 100644 --- a/dev-java/commons-validator/commons-validator-1.7.ebuild +++ b/dev-java/commons-validator/commons-validator-1.7.ebuild @@ -20,11 +20,6 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -# package CSVFormat does not exist -# package org.apache.commons.csv does not exist -# package org.bitstrings.test.junit.runner does not exist -RSTRICT="test" - # Common dependencies # POM: pom.xml # commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7 @@ -34,7 +29,6 @@ RSTRICT="test" CDEPEND=" dev-java/commons-beanutils:1.7 - dev-java/commons-collections:0 dev-java/commons-digester:2.1 dev-java/commons-logging:0 " @@ -42,29 +36,28 @@ CDEPEND=" # 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 -> !!!artifactId-not-found!!! -# test? org.bitstrings.test:junit-clptr:1.2.2 -> !!!groupId-not-found!!! - -# DEPEND=" -# >=virtual/jdk-1.8:* -# ${CDEPEND} -# test? ( -# !!!artifactId-not-found!!! -# !!!groupId-not-found!!! -# ) -# " +# 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:*" + 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-collections,commons-digester-2.1,commons-logging" +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="junit-4,!!!artifactId-not-found!!!,!!!groupId-not-found!!!" +JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources"
