| 1 |
commit: 614473283ed6eb78a876ca894b91ebde05329cb4 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 1 14:11:03 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 1 14:15:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61447328 |
| 7 |
|
| 8 |
dev-java/commons-validator: finished 1.7 from pr |
| 9 |
|
| 10 |
1) removed unused dep |
| 11 |
2) packaged and added missing deps |
| 12 |
3) made tests work |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 15 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-java/commons-csv/commons-csv-1.8.ebuild | 2 +- |
| 18 |
.../commons-validator/commons-validator-1.7.ebuild | 33 +++++++++------------- |
| 19 |
2 files changed, 14 insertions(+), 21 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-java/commons-csv/commons-csv-1.8.ebuild b/dev-java/commons-csv/commons-csv-1.8.ebuild |
| 22 |
index d307ff30ad1..a8d528c2213 100644 |
| 23 |
--- a/dev-java/commons-csv/commons-csv-1.8.ebuild |
| 24 |
+++ b/dev-java/commons-csv/commons-csv-1.8.ebuild |
| 25 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-csv/" |
| 26 |
SRC_URI="https://mirror.dkm.cz/apache//commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" |
| 27 |
LICENSE="Apache-2.0" |
| 28 |
SLOT="0" |
| 29 |
-KEYWORDS="~amd64 ~x86" |
| 30 |
+KEYWORDS="~amd64 ~ppc64 ~x86" |
| 31 |
|
| 32 |
# missing test deps |
| 33 |
RESTRICT="test" |
| 34 |
|
| 35 |
diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild |
| 36 |
index d74d2025287..24d02b4d81f 100644 |
| 37 |
--- a/dev-java/commons-validator/commons-validator-1.7.ebuild |
| 38 |
+++ b/dev-java/commons-validator/commons-validator-1.7.ebuild |
| 39 |
@@ -20,11 +20,6 @@ LICENSE="Apache-2.0" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
| 42 |
|
| 43 |
-# package CSVFormat does not exist |
| 44 |
-# package org.apache.commons.csv does not exist |
| 45 |
-# package org.bitstrings.test.junit.runner does not exist |
| 46 |
-RSTRICT="test" |
| 47 |
- |
| 48 |
# Common dependencies |
| 49 |
# POM: pom.xml |
| 50 |
# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7 |
| 51 |
@@ -34,7 +29,6 @@ RSTRICT="test" |
| 52 |
|
| 53 |
CDEPEND=" |
| 54 |
dev-java/commons-beanutils:1.7 |
| 55 |
- dev-java/commons-collections:0 |
| 56 |
dev-java/commons-digester:2.1 |
| 57 |
dev-java/commons-logging:0 |
| 58 |
" |
| 59 |
@@ -42,29 +36,28 @@ CDEPEND=" |
| 60 |
# Compile dependencies |
| 61 |
# POM: pom.xml |
| 62 |
# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4 |
| 63 |
-# test? org.apache.commons:commons-csv:1.6 -> !!!artifactId-not-found!!! |
| 64 |
-# test? org.bitstrings.test:junit-clptr:1.2.2 -> !!!groupId-not-found!!! |
| 65 |
- |
| 66 |
-# DEPEND=" |
| 67 |
-# >=virtual/jdk-1.8:* |
| 68 |
-# ${CDEPEND} |
| 69 |
-# test? ( |
| 70 |
-# !!!artifactId-not-found!!! |
| 71 |
-# !!!groupId-not-found!!! |
| 72 |
-# ) |
| 73 |
-# " |
| 74 |
+# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0 |
| 75 |
+# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0 |
| 76 |
+# |
| 77 |
+# restricting for compilation to jdk 1.8 just because of tests which |
| 78 |
+# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11 |
| 79 |
|
| 80 |
DEPEND="${CDEPEND} |
| 81 |
- >=virtual/jdk-1.8:*" |
| 82 |
+ virtual/jdk:1.8 |
| 83 |
+ test? ( |
| 84 |
+ dev-java/commons-csv:0 |
| 85 |
+ dev-java/junit-clptr:0 |
| 86 |
+ ) |
| 87 |
+" |
| 88 |
RDEPEND="${CDEPEND} |
| 89 |
>=virtual/jre-1.8:*" |
| 90 |
|
| 91 |
S="${WORKDIR}/${P}-src" |
| 92 |
|
| 93 |
-JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-digester-2.1,commons-logging" |
| 94 |
+JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging" |
| 95 |
JAVA_SRC_DIR="src/main/java" |
| 96 |
JAVA_RESOURCE_DIRS="src/main/resources" |
| 97 |
|
| 98 |
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!artifactId-not-found!!!,!!!groupId-not-found!!!" |
| 99 |
+JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr" |
| 100 |
JAVA_TEST_SRC_DIR="src/test/java" |
| 101 |
JAVA_TEST_RESOURCE_DIRS="src/test/resources" |
Archives