diff options
| author |   Israel Hernandez <israel.a.hernandez@gmail.com> | 2023-12-28 14:07:31 -0800 |
|---|---|---|
| committer |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-12-29 11:01:01 +0100 |
| commit | 71b487ee9580bfcc2069e0762dd2d55db7e703f9 (patch) | |
| tree | c6015f64573bf521f9654c0581c8b178194a8d7d /dev-java | |
| parent | dev-java/scijava-common: add 2.97.1, drop 2.94.2 (diff) | |
| download | sci-71b487ee9580bfcc2069e0762dd2d55db7e703f9.tar.gz sci-71b487ee9580bfcc2069e0762dd2d55db7e703f9.tar.bz2 sci-71b487ee9580bfcc2069e0762dd2d55db7e703f9.zip | |
dev-java/scijava-common: Update depends
Signed-off-by: IAHMCOL <IAHMCOL@thejabberwocky.net>
Closes: https://github.com/gentoo/sci/pull/1229
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/scijava-common/scijava-common-2.97.1.ebuild | 17 | ||||
| -rw-r--r-- | dev-java/scijava-common/scijava-common-9999.ebuild | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/dev-java/scijava-common/scijava-common-2.97.1.ebuild b/dev-java/scijava-common/scijava-common-2.97.1.ebuild index f384bf8bd..37a9bca8d 100644 --- a/dev-java/scijava-common/scijava-common-2.97.1.ebuild +++ b/dev-java/scijava-common/scijava-common-2.97.1.ebuild @@ -25,7 +25,7 @@ else https://github.com/scijava/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz " S="${WORKDIR}/${PN}-${P}" - MAVEN_ID="org.scijava:scijava-common:2.94.2" + MAVEN_ID="org.scijava:scijava-common:2.97.1" KEYWORDS="~amd64" fi @@ -38,20 +38,19 @@ CDEPEND=" dev-java/jaxb-api:2 " -BDEPEND=" +BDEPEND="${CDEPEND} >=virtual/jdk-1.8:* - ${CDEPEND} +" + +DEPEND="${CDEPEND} test? ( >=dev-java/junit-4.13.2 - >=dev-java/mockito-2.19.0:2 + >=dev-java/mockito-4.11.0:4 ) " -DEPEND="${CDEPEND}" - -RDEPEND=" +RDEPEND="${CDEPEND} >=virtual/jre-1.8:* - ${CDEPEND} " JAVA_GENTOO_CLASSPATH="parsington,jaxws-api,jaxb-api-2" @@ -61,7 +60,7 @@ JAVA_RESOURCE_DIRS=( "src/main/resources" ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" diff --git a/dev-java/scijava-common/scijava-common-9999.ebuild b/dev-java/scijava-common/scijava-common-9999.ebuild index f384bf8bd..37a9bca8d 100644 --- a/dev-java/scijava-common/scijava-common-9999.ebuild +++ b/dev-java/scijava-common/scijava-common-9999.ebuild @@ -25,7 +25,7 @@ else https://github.com/scijava/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz " S="${WORKDIR}/${PN}-${P}" - MAVEN_ID="org.scijava:scijava-common:2.94.2" + MAVEN_ID="org.scijava:scijava-common:2.97.1" KEYWORDS="~amd64" fi @@ -38,20 +38,19 @@ CDEPEND=" dev-java/jaxb-api:2 " -BDEPEND=" +BDEPEND="${CDEPEND} >=virtual/jdk-1.8:* - ${CDEPEND} +" + +DEPEND="${CDEPEND} test? ( >=dev-java/junit-4.13.2 - >=dev-java/mockito-2.19.0:2 + >=dev-java/mockito-4.11.0:4 ) " -DEPEND="${CDEPEND}" - -RDEPEND=" +RDEPEND="${CDEPEND} >=virtual/jre-1.8:* - ${CDEPEND} " JAVA_GENTOO_CLASSPATH="parsington,jaxws-api,jaxb-api-2" @@ -61,7 +60,7 @@ JAVA_RESOURCE_DIRS=( "src/main/resources" ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2" +JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" |