* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2015-11-19 22:56 James Le Cuirot
0 siblings, 0 replies; 55+ messages in thread
From: James Le Cuirot @ 2015-11-19 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 76df652f1e71e4de7683738f6dff21841caa08cb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 22:48:13 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 22:56:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76df652f
dev-java/junit: Add ~arm keyword
Package-Manager: portage-2.2.25
dev-java/junit/junit-4.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 52d77aa..18e40b7 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
HOMEPAGE="http://junit.org/"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="dev-java/hamcrest-core:1.3"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2016-02-10 19:41 Mike Frysinger
0 siblings, 0 replies; 55+ messages in thread
From: Mike Frysinger @ 2016-02-10 19:41 UTC (permalink / raw
To: gentoo-commits
commit: f48369b306917f0ee14798628e76e3786b997a75
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 19:34:21 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 19:40:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48369b3
dev-java/junit: drop findutils dep
The forced upgrade has been moved to @system now.
The dep has also been dropped already in newer versions,
so just update the older ones here.
dev-java/junit/junit-4.10.ebuild | 1 -
dev-java/junit/junit-4.11.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
index 9c89b6e..2571b0b 100644
--- a/dev-java/junit/junit-4.10.ebuild
+++ b/dev-java/junit/junit-4.10.ebuild
@@ -21,7 +21,6 @@ CDEPEND="dev-java/hamcrest-core:0"
RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
${CDEPEND}"
S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/junit/junit-4.11.ebuild b/dev-java/junit/junit-4.11.ebuild
index 9146e17..06eda28 100644
--- a/dev-java/junit/junit-4.11.ebuild
+++ b/dev-java/junit/junit-4.11.ebuild
@@ -25,7 +25,6 @@ RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
${CDEPEND}"
S="${WORKDIR}/${PN}${PV}"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2016-04-07 9:59 James Le Cuirot
0 siblings, 0 replies; 55+ messages in thread
From: James Le Cuirot @ 2016-04-07 9:59 UTC (permalink / raw
To: gentoo-commits
commit: be6f9efc29a8ee9fc0483d4c3004822c46ccd258
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 09:50:08 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 09:58:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be6f9efc
dev-java/junit: Fix SRC_URI
It was outdated, lacking a name, and pointing to the zip instead of
the tar.gz. The latter avoids app-arch/unzip, which was missing
anyway.
Package-Manager: portage-2.2.28
dev-java/junit/Manifest | 2 +-
dev-java/junit/junit-4.12-r1.ebuild | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index f1c65cb..204b4dc 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,4 @@
DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
+DIST junit4-r4.12.tar.gz 443804 SHA256 9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32 WHIRLPOOL 14eda410942900d8be21ea29096c387384634ce9f679348d5bf4dbb11d22e23e1be990486ae8a6004b95f3a9383644e4f70988f84312cf16d5e4462c64b26814
DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
-DIST r4.12.zip 672377 SHA256 519971406171c580304fdf7b582b5d1df3ff396bb8855a70cb68592f3d53476b SHA512 773f38476cc89f352fe9518f9de27dac32afbd501b498c3a876b7d79ee45a1c567f1ee2064067bc0721dcc06081b3faffe55fe74fbe49d2ce72884b39a2b76f6 WHIRLPOOL f25480ffe47fe615fc7cd7016bf42e037a307879214e21f2b487b4e3d667bb9209f99d372774e5b8e060e0d2678f31d3e10a9b1ea2292a7734f7f26102e3f0ff
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 0c2cb99..6a9027f 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -4,12 +4,14 @@
EAPI=5
+MY_PN="${PN}${PV%%.*}"
+MY_P="${MY_PN}-r${PV}"
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
+SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
HOMEPAGE="http://junit.org/"
LICENSE="EPL-1.0"
SLOT="4"
@@ -24,7 +26,7 @@ RDEPEND=">=virtual/jre-1.6
DEPEND=">=virtual/jdk-1.6
${CDEPEND}"
-S="${WORKDIR}/${PN}-r${PV}"
+S="${WORKDIR}/${MY_P}"
JAVA_SRC_DIR="src/main/java"
JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2016-04-07 9:59 James Le Cuirot
0 siblings, 0 replies; 55+ messages in thread
From: James Le Cuirot @ 2016-04-07 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 396144587513e850c315ece8cdb055894a9f8a65
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 09:57:23 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 09:58:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39614458
dev-java/junit: 4.12-r1 stable on amd64, ppc64, x86 using ALLARCHES
Package-Manager: portage-2.2.28
dev-java/junit/junit-4.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 6a9027f..0de0214 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
HOMEPAGE="http://junit.org/"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="dev-java/hamcrest-core:1.3"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2017-04-01 23:20 Patrice Clement
0 siblings, 0 replies; 55+ messages in thread
From: Patrice Clement @ 2017-04-01 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 7d2058adfc56d3667675ed8236654e4240a5dcef
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 1 23:19:31 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 23:20:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2058ad
dev-java/junit: EAPI 6 bump.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/junit/junit-3.8.2-r2.ebuild | 42 ++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
new file mode 100644
index 00000000000..7cf51fa048a
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P=${P/-/}
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+DOCS=( README.html cpl-v10.html )
+
+JAVA_SRC_DIR="${PN}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}" || die
+ unzip src.jar || die
+}
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2017-07-13 7:48 Alexis Ballier
0 siblings, 0 replies; 55+ messages in thread
From: Alexis Ballier @ 2017-07-13 7:48 UTC (permalink / raw
To: gentoo-commits
commit: 69fc59e7206f15b44f08d1a158b1d8531dea3fed
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 06:58:23 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 07:47:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fc59e7
dev-java/junit: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/junit/junit-3.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 7cf51fa048a..29a5fb5888e 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
HOMEPAGE="http://www.junit.org/"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2017-07-13 7:48 Alexis Ballier
0 siblings, 0 replies; 55+ messages in thread
From: Alexis Ballier @ 2017-07-13 7:48 UTC (permalink / raw
To: gentoo-commits
commit: ab52587d24ac299429e1d83af8b8dd3bb214ed71
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 06:56:55 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 07:47:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab52587d
dev-java/junit: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/junit/junit-4.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index dc8f7416fc2..c022aac54db 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
HOMEPAGE="http://junit.org/"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="dev-java/hamcrest-core:1.3"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2019-03-16 19:24 Patrice Clement
0 siblings, 0 replies; 55+ messages in thread
From: Patrice Clement @ 2019-03-16 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 2345d60dfdc414428a9260febcb2aec681ead288
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 18:19:07 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:23:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2345d60d
dev-java/junit: stable for amd64+ppc64+x86.
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-java/junit/junit-3.8.2-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 362aa0129f6..95e8f4c93c8 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
HOMEPAGE="http://www.junit.org/"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2019-03-16 19:24 Patrice Clement
0 siblings, 0 replies; 55+ messages in thread
From: Patrice Clement @ 2019-03-16 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 9bd40770a8f4d6d02e43633e60237975a8a2d885
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 18:22:12 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:23:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd40770
dev-java/junit: clean up old.
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-java/junit/junit-3.8.2-r1.ebuild | 44 ------------------------------------
1 file changed, 44 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
deleted file mode 100644
index 309adf1024b..00000000000
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P/-/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.junit.org/"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- unzip src.jar || die
- rm -v *.jar || die
- rm -rf javadoc ${PN}${PV} || die
- cp "${FILESDIR}/${P}-build.xml" build.xml || die
-}
-
-EANT_BUILD_TARGET="dist"
-
-src_install() {
- use source && java-pkg_dosrc ${PN}
- cd ${MY_P}
- java-pkg_dojar ${PN}.jar
- dohtml README.html cpl-v10.html || die
- if use doc; then
- dohtml -r doc || die
- java-pkg_dojavadoc javadoc
- fi
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2019-05-18 1:14 Aaron Bauman
0 siblings, 0 replies; 55+ messages in thread
From: Aaron Bauman @ 2019-05-18 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 8141d188ea886560b376af3afe3dc9c7d203f4a9
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 01:07:32 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 18 01:07:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8141d188
dev-java/junit: arm64 stable
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
dev-java/junit/junit-3.8.2-r2.ebuild | 2 +-
dev-java/junit/junit-4.12-r1.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 95e8f4c93c8..04342893215 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
HOMEPAGE="http://www.junit.org/"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index f3190da6c33..d0a50caac8b 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
HOMEPAGE="http://junit.org/"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="dev-java/hamcrest-core:1.3"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-02-15 8:31 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-02-15 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 590f8ed921163a5532a37f0fe47f6313cafb2899
Author: Kaibo Ma <kaiboma06 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 16:00:24 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 08:31:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590f8ed9
dev-java/junit: version bump to 4.13.1
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Kaibo Ma <kaiboma06 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19465
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 +
dev-java/junit/junit-4.13.1.ebuild | 54 ++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index e65514614da..0d1ea9e61f7 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,2 +1,3 @@
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
+DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
new file mode 100644
index 00000000000..d96833a1236
--- /dev/null
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}${PV%%.*}"
+MY_P="${MY_PN}-r${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="http://junit.org/"
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+CDEPEND="dev-java/hamcrest-core:1.3"
+
+RDEPEND=">=virtual/jre-1.8
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.8
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+java_prepare() {
+ rm -v lib/*.jar || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
+ use examples && java-pkg_doexamples src/test/java/org/junit/samples
+}
+
+src_test() {
+ cd src/test/java || die
+
+ local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
+
+ ejavac -cp "${CP}" -d . $(find * -name "*.java")
+ java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-12 12:18 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-03-12 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 8db90a0b88806824b950b3eec969c8ed0117d862
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 09:40:29 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 12:18:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db90a0b
dev-java/junit: added maven id + some minor updates
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-3.8.2-r2.ebuild | 7 ++++---
dev-java/junit/junit-4.12-r1.ebuild | 1 +
dev-java/junit/junit-4.13.1.ebuild | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 4079e6685fb..712ad30d85d 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:3.8.2"
inherit java-pkg-2 java-pkg-simple
@@ -16,8 +17,8 @@ LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
DOCS=( README.html cpl-v10.html )
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index bdb81d48ce7..3f19ad05eed 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=5
MY_PN="${PN}${PV%%.*}"
MY_P="${MY_PN}-r${PV}"
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:4.12"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index d96833a1236..60c035757c3 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
MY_PN="${PN}${PV%%.*}"
MY_P="${MY_PN}-r${PV}"
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:4.13.1"
inherit java-pkg-2 java-pkg-simple
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-13 8:44 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-03-13 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 1cd5d8d3f1a46a707f43d56b93682ddd9152a47f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Mar 12 20:36:52 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 08:41:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd5d8d3
dev-java/junit: Depend on hamcrest-library
Closes: https://bugs.gentoo.org/770886
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19902
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-4.13.1.ebuild | 25 +++++++++++++++----------
dev-java/junit/metadata.xml | 2 +-
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 60c035757c3..72680398bed 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -11,26 +11,31 @@ MAVEN_ID="junit:junit:4.13.1"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
+
LICENSE="EPL-1.0"
SLOT="4"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.8
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.8
- ${CDEPEND}"
+DEPEND="
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ "
+RDEPEND="${DEPEND}
+ >=virtual/jre-1.8
+ "
+BDEPEND="${DEPEND}
+ >=virtual/jdk-1.8
+ "
S="${WORKDIR}/${MY_P}"
JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-java_prepare() {
+src_prepare() {
+ default
rm -v lib/*.jar || die
}
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index 9c59435e026..618f5e0e4b6 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -6,7 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="github">junit-team/junit</remote-id>
+ <remote-id type="github">junit-team/junit4</remote-id>
<remote-id type="sourceforge">junit</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-14 8:21 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-03-14 8:21 UTC (permalink / raw
To: gentoo-commits
commit: f2c7ec165424f9c2badd51f8fb014d9f05d72b82
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar 13 18:09:08 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:21:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c7ec16
dev-java/junit: {B,}DEPEND back to java std
Partly redo changes from https://github.com/gentoo/gentoo/pull/19902
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19918
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-4.13.1.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 72680398bed..2e2f872db12 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -19,16 +19,16 @@ SLOT="4"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
-DEPEND="
+CDEPEND="
dev-java/hamcrest-core:1.3
dev-java/hamcrest-library:1.3
"
-RDEPEND="${DEPEND}
- >=virtual/jre-1.8
- "
-BDEPEND="${DEPEND}
- >=virtual/jdk-1.8
- "
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}"
S="${WORKDIR}/${MY_P}"
JAVA_SRC_DIR="src/main/java"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-15 16:18 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2021-03-15 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 0d3dbd57d040b4d6b51f020c99fb2c454cf0c912
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 16:17:52 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 16:17:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3dbd57
dev-java/junit: amd64 stable wrt bug #775638
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/junit/junit-4.13.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 2e2f872db12..d1c31fdaf6f 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-26 7:50 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2021-03-26 7:50 UTC (permalink / raw
To: gentoo-commits
commit: a66cbf94fc3fbc42b4c1850def93a9e3e543c7de
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 07:50:07 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 07:50:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66cbf94
dev-java/junit: x86 stable wrt bug #775638
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/junit/junit-4.13.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index d1c31fdaf6f..77b525e5996 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-03-26 20:42 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2021-03-26 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 6a6f226fb80352fffc80f900e4b8af876d5194e6
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 20:42:17 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 20:42:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6f226f
dev-java/junit: ppc64 stable wrt bug #775638
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/junit/junit-4.13.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 77b525e5996..471d0ae7d57 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
CDEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-04-05 11:01 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-04-05 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 217e896ce312ad87b3413675b13c9ee91d14ecdd
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 1 17:43:33 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 10:58:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217e896c
dev-java/junit: version 4.13.2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20220/commits/edae6bf5d3ffc61fcce3dd3e43c00eca7090555f
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 +
dev-java/junit/junit-4.13.2.ebuild | 68 ++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 0d1ea9e61f7..6146d21f38a 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,3 +1,4 @@
+DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
new file mode 100644
index 00000000000..e710a4bf582
--- /dev/null
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="junit:junit:4.13.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: ${PN}4-r${PV}/pom.xml
+# org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3
+
+CDEPEND="
+ dev-java/hamcrest-core:1.3
+"
+
+# Compile dependencies
+# POM: ${PN}4-r${PV}/pom.xml
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/hamcrest-library:1.3
+ )
+ ${CDEPEND}"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+JAVA_SRC_DIR="${PN}4-r${PV}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}4-r${PV}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
+JAVA_TEST_SRC_DIR="${PN}4-r${PV}/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_test() {
+ cd "${JAVA_TEST_SRC_DIR}" || die
+
+ local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
+
+ ejavac -cp "${CP}" -d . $(find * -name "*.java")
+ java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-05-06 6:55 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2021-05-06 6:55 UTC (permalink / raw
To: gentoo-commits
commit: cd642b395311ded9e492c22b668b30bf398b04cf
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 06:54:27 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 6 06:54:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd642b39
dev-java/junit: amd64 stable wrt bug #788145
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index e710a4bf582..5f59c368be7 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# Common dependencies
# POM: ${PN}4-r${PV}/pom.xml
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-05-06 6:57 Agostino Sarubbo
0 siblings, 0 replies; 55+ messages in thread
From: Agostino Sarubbo @ 2021-05-06 6:57 UTC (permalink / raw
To: gentoo-commits
commit: 806feba1afb9b71ef148655a37f2a0e848fcf816
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 06:56:46 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu May 6 06:56:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806feba1
dev-java/junit: x86 stable wrt bug #788145
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index 5f59c368be7..81f39a76e42 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# Common dependencies
# POM: ${PN}4-r${PV}/pom.xml
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-05-06 10:01 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2021-05-06 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 1973e4bf10edc84187e939626fd775af26fabfcd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 10:00:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 10:00:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1973e4bf
dev-java/junit: Stabilize 4.13.2 arm64, #788145
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index 81f39a76e42..39e7bae65f5 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# Common dependencies
# POM: ${PN}4-r${PV}/pom.xml
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-05-06 10:09 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2021-05-06 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 75c1f475f08753caabe598940802b8137d54c2fc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 10:08:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 10:08:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c1f475
dev-java/junit: Stabilize 4.13.2 ppc64, #788145
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index 39e7bae65f5..a11c549f967 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz ->
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# Common dependencies
# POM: ${PN}4-r${PV}/pom.xml
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2021-05-06 16:39 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2021-05-06 16:39 UTC (permalink / raw
To: gentoo-commits
commit: d32dfd4fb6c6dc9e689097b2d2871fc2a1f81787
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu May 6 14:29:10 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 6 16:39:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32dfd4f
dev-java/junit: remove old
Closes: https://bugs.gentoo.org/788145
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20702
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 2 --
dev-java/junit/junit-4.12-r1.ebuild | 55 ----------------------------------
dev-java/junit/junit-4.13.1.ebuild | 60 -------------------------------------
3 files changed, 117 deletions(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 6146d21f38a..14d9453f2da 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,2 @@
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
-DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
deleted file mode 100644
index 3f19ad05eed..00000000000
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.12"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-HOMEPAGE="http://junit.org/"
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="dev-java/hamcrest-core:1.3"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-
-java_prepare() {
- rm -v lib/*.jar || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
- use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
deleted file mode 100644
index 471d0ae7d57..00000000000
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}${PV%%.*}"
-MY_P="${MY_PN}-r${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="junit:junit:4.13.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-CDEPEND="
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- "
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-
-src_prepare() {
- default
- rm -v lib/*.jar || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
- use examples && java-pkg_doexamples src/test/java/org/junit/samples
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-01-07 13:19 Joonas Niilola
0 siblings, 0 replies; 55+ messages in thread
From: Joonas Niilola @ 2023-01-07 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 4636819c87fc66a1e2ee9baf2aa855cfcfe13047
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 13:18:39 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 13:18:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4636819c
dev-java/junit: add unzip to BDEPEND
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index a11c549f9673..507d4c051dd5 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -40,7 +40,7 @@ DEPEND="
RDEPEND="
>=virtual/jre-1.8:*
${CDEPEND}"
-
+BDEPEND="app-arch/unzip"
S="${WORKDIR}"
JAVA_ENCODING="ISO-8859-1"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-09 6:42 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2023-03-09 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 7b39491adffa55f7d398dffa69552b0f0b3157d6
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Mar 6 01:07:39 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 06:42:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b39491a
dev-java/junit: Update HOMEPAGE for 4.13.2
JUnit 4 has a dedicated homepage, so it is better to use that homepage
instead of the JUnit 5 homepage.
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29954
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-4.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2.ebuild
index 507d4c051dd5..d6441a248c00 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="junit:junit:4.13.2"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
+HOMEPAGE="https://junit.org/junit4/"
SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-1.0"
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-10 7:34 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2023-03-10 7:34 UTC (permalink / raw
To: gentoo-commits
commit: ec61fc18314dbead272b043c9e9870615af3cd52
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Mar 6 04:52:23 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 07:34:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec61fc18
dev-java/junit: Add 5.9.2
Closes: https://bugs.gentoo.org/839687
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30026
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 +
dev-java/junit/junit-5.9.2.ebuild | 337 ++++++++++++++++++++++++++++++++++++++
dev-java/junit/metadata.xml | 6 +
3 files changed, 344 insertions(+)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 14d9453f2dae..02e2cf8a230a 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,2 +1,3 @@
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
+DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
new file mode 100644
index 000000000000..e75929f447ce
--- /dev/null
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
+# prevent java-pkg-simple.eclass from handling Javadoc; instead,
+# let this ebuild handle Javadoc generation and installation itself.
+# This ebuild invokes java-pkg-simple.eclass's phase functions
+# multiple times to build multiple modules, but the eclass always
+# installs each module's Javadoc to the same directory, which would
+# trigger an error when the second module's Javadoc is installed.
+JAVA_PKG_IUSE="source"
+IUSE="doc migration-support suite vintage"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/junit5-r${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="5"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+ dev-java/apiguardian-api:0
+ dev-java/opentest4j:0
+ dev-java/open-test-reporting-events:0
+ dev-java/picocli:0
+ dev-java/univocity-parsers:0
+"
+
+# java-utils-2.eclass does not support
+# USE-conditional dependencies in CP_DEPEND
+COND_DEPEND="
+ migration-support? ( dev-java/junit:4 )
+ vintage? ( dev-java/junit:4 )
+"
+
+# Limiting JDK version to >=11 for module-info.java in this package
+# https://bugs.gentoo.org/796875#c3
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+src_configure() {
+ # Please make sure to declare a module's dependencies before the module itself.
+ # Useful upstream documentation regarding modules and dependencies:
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
+ JUNIT5_MODULES=(
+ junit-platform-commons
+ junit-platform-engine
+ junit-platform-launcher
+ junit-platform-reporting
+ junit-platform-console # For launching tests from CLI;
+ # an eclass would need it to support running tests using JUnit 5
+
+ $(use suite && echo \
+ junit-platform-suite-api \
+ junit-platform-suite-commons \
+ junit-platform-suite-engine \
+ )
+
+ junit-jupiter-api
+ junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
+ # "JUnit 5 tests", which cannot run on earlier JUnit versions
+ junit-jupiter-params # For parameterized tests; the junit-jupiter
+ # aggregator module includes it, so building it unconditionally
+ $(usev migration-support junit-jupiter-migrationsupport)
+
+ $(usev vintage junit-vintage-engine)
+
+ # Modules not included:
+ # - junit-bom: Has no sources; solely for helping Maven and Gradle
+ # projects that use JUnit 5 manage dependencies easier
+ # - junit-jupiter: Aggregator; does not have 'src/main/java'
+ # - junit-platform-console-standalone: Has no sources; solely used
+ # by the upstream to build a fat JAR that bundles everything, so
+ # users can use just this single JAR to run JUnit 5
+ # - junit-platform-jfr: For an experimental feature
+ # - junit-platform-runner: Deprecated
+ # - junit-platform-suite: Aggregator; does not have 'src/main/java'
+ # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
+ )
+ local cp_packages=()
+ (use migration-support || use vintage) && cp_packages+=( junit-4 )
+ local save_IFS="${IFS}"
+ IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
+ IFS="${save_IFS}"
+
+ JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
+}
+
+junit5_foreach_module() {
+ local module
+ for module in "${JUNIT5_MODULES[@]}"; do
+ junit5_module_do "${module}" "${@}"
+ done
+}
+
+junit5_module_do() {
+ local module="${1}"
+ # Invocation of the passed function will not be guarded by '|| die'.
+ # Like the case for multibuild_foreach_variant(), it is recommended
+ # that the passed function itself calls 'die'.
+ local func=( "${@:2}" )
+
+ einfo "Running '${func[@]}' for ${module} ..."
+ pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
+
+ # Set up Java eclass variables that are
+ # supposed to be set in the ebuild global scope
+
+ local JAVA_JAR_FILENAME="${module}.jar"
+
+ local JAVA_SRC_DIR=(
+ src/main/java
+ src/module
+ )
+
+ local JAVA_RESOURCE_DIRS=()
+ local default_resource_dir="src/main/resources"
+ [[ -d "${default_resource_dir}" ]] &&
+ JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
+
+ if [[ "${module}" == junit-platform-console ]]; then
+ local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
+ local JAVA_LAUNCHER_FILENAME="${module}"
+ fi
+
+ # Invoke the passed function
+ "${func[@]}"
+ local ret="${?}"
+
+ popd > /dev/null || die "Failed to leave directory '${module}'"
+ return "${ret}"
+}
+
+junit5_gen_cp() {
+ echo "$(java-pkg_getjars --build-only --with-dependencies \
+ "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+}
+
+junit5_module_compile() {
+ if [[ "${module}" == junit-platform-console ]]; then
+ # Unlike other modules that have a src/main/java9 directory, for this
+ # module, the upstream puts the class files built from src/main/java9
+ # in their JAR's top-level directory instead of META-INF/versions/9
+ cp -rv src/main/java9/* src/main/java/ ||
+ die "Failed to merge ${module}'s sources for Java 9+"
+ # Remove for the [[ -d src/main/java9 ]] test
+ # during versioned directory handling
+ rm -rv src/main/java9 ||
+ die "Failed to remove ${module}'s Java 9+ source directory"
+ fi
+
+ java-pkg-simple_src_compile
+ local sources="sources.lst"
+ local classes="target/classes"
+
+ # Collect a list of all compiler input files for building Javadoc
+ local source
+ while read source; do
+ echo "${module}/${source}" >> "${all_sources}"
+ done < "${sources}" ||
+ die "Failed to add ${module}'s sources to Javadoc input list"
+
+ # Handle classes that will go into versioned directories. This will be
+ # no longer needed after https://bugs.gentoo.org/900433 is implemented.
+ local vm_ver
+ for vm_ver in 9 17; do
+ local versioned_src="src/main/java${vm_ver}"
+ if [[ -d "${versioned_src}" ]]; then
+ if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
+ local versioned_classes="target/${vm_ver}/classes"
+ mkdir -p "${versioned_classes}" ||
+ die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
+ ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ $(find "${versioned_src}" -type f -name '*.java')
+ "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
+ --release "${vm_ver}" -C "${versioned_classes}" . ||
+ die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
+ else
+ # Modules that may hit this branch as of 5.9.2:
+ # - junit-platform-console:
+ # src/main/java17/.../ConsoleUtils.java tries to use
+ # java.io.Console.charset() (available since Java 17) to get
+ # the default output charset. It is fine to not use this
+ # file, even if the built artifacts will be used on JRE 17+,
+ # as src/main/java/.../ConsoleUtils.java still gets the
+ # default from java.nio.charset.Charset.defaultCharset().
+ elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
+ fi
+ fi
+ done
+
+ # Add the current module's JAR to classpath
+ # for the module's reverse dependencies in this package
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
+}
+
+src_compile() {
+ local all_sources="${S}/all-sources.lst"
+ junit5_foreach_module junit5_module_compile
+
+ if use doc; then
+ einfo "Generating Javadoc for all modules ..."
+ local apidoc="target/api"
+ mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
+ ejavadoc -d "${apidoc}" \
+ -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
+ -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
+ -windowtitle "JUnit ${PV} API" \
+ "@${all_sources}"
+ fi
+}
+
+src_test() {
+ # Running the JUnit 5 modules' tests (located in each module's
+ # 'src/test/java') has a few obstacles:
+ # - Some test sources use text blocks -- a feature introduced in Java 15.
+ # A JDK at a lower version, e.g. 11, cannot compile them.
+ # - Some test classes depend on JUnit 5 modules that this ebuild does not
+ # include, like junit-platform-runner and junit-platform-testkit.
+ #
+ # Therefore, this ebuild uses a simpler approach to test the artifacts just
+ # built: it uses the artifacts to run tests in examples under the
+ # 'documentation/src' directory. The test coverage will not be impressive,
+ # but at least this approach verifies that the copy of JUnit 5 just built
+ # is capable of running some simple tests launched from CLI.
+
+ local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
+ local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
+ local JUNIT5_TEST_RM=(
+ $(usev !migration-support example/IgnoredTestsDemo.java)
+ $(use !suite && echo \
+ example/DocumentationTestSuite.java \
+ example/SuiteDemo.java \
+ )
+ $(usev !vintage example/JUnit4Tests.java)
+
+ # Need excluded module junit-platform-runner
+ example/JUnitPlatformClassDemo.java
+ example/JUnitPlatformSuiteDemo.java
+
+ # Need excluded module junit-platform-testkit
+ example/testkit/
+
+ # Not necessary for the tests; some files even require extra dependency
+ org/junit/api/tools/
+
+ # Needs dev-java/hamcrest; no need to pull in extra dependency
+ # as the examples already provide ample tests to run
+ example/HamcrestAssertionsDemo.java
+
+ # Makes an HTTP request and expects a certain response
+ example/session/HttpTests.java
+ )
+
+ pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
+ die "Failed to enter test source directory"
+ rm -rv "${JUNIT5_TEST_RM[@]}" ||
+ die "Failed to remove unneeded test sources"
+ # Test sources expect the working directory to be 'documentation'
+ sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
+ example/ParameterizedTestDemo.java ||
+ die "Failed to update file paths in test sources"
+ popd > /dev/null || die "Failed to leave test source directory"
+
+ local test_dir="${T}/junit5_src_test"
+ local example_classes="${test_dir}/classes"
+ local test_classes="${test_dir}/test-classes"
+ mkdir -p "${example_classes}" "${test_classes}" ||
+ die "Failed to create test directories"
+
+ local example_sources="${test_dir}/sources.lst"
+ local test_sources="${test_dir}/test-sources.lst"
+ find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
+ die "Failed to get a list of example sources"
+ find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
+ die "Failed to get a list of test sources"
+
+ ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ "@${example_sources}"
+
+ local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+ ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${test_cp}" ${JAVAC_ARGS} \
+ "@${test_sources}"
+
+ set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
+ org.junit.platform.console.ConsoleLauncher \
+ --disable-ansi-colors --fail-if-no-tests --scan-classpath \
+ --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
+ --exclude-tag="exclude"
+ echo "${@}" >&2
+ "${@}"
+ local status="${?}"
+ [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
+ [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
+}
+
+junit5_module_install() {
+ # It is OK to let java-pkg-simple_src_install call einstalldocs for
+ # each module as long as each documentation file being installed
+ # has a unique filename among _all_ modules; otherwise, some files
+ # would overwrite other ones.
+ if [[ -f README.md ]]; then
+ mv -v README.md "README-${module}.md" ||
+ die "Failed to rename ${module}'s README.md"
+ fi
+ java-pkg-simple_src_install
+}
+
+src_install() {
+ junit5_foreach_module junit5_module_install
+ einstalldocs # For project-global documentation
+
+ if use doc; then
+ einfo "Installing Javadoc for all modules ..."
+ local apidoc="target/api"
+ java-pkg_dojavadoc "${apidoc}"
+ fi
+}
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index c6886950ead4..87435c66c2c7 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -6,7 +6,13 @@
<name>Java</name>
</maintainer>
<upstream>
+ <remote-id type="github">junit-team/junit5</remote-id>
<remote-id type="github">junit-team/junit4</remote-id>
<remote-id type="sourceforge">junit</remote-id>
</upstream>
+ <use>
+ <flag name="migration-support" restrict=">=dev-java/junit-5">Include the junit-jupiter-migrationsupport module, which helps with migration from JUnit 4 to JUnit Jupiter</flag>
+ <flag name="suite" restrict=">=dev-java/junit-5">Include the JUnit Platform Suite Engine, which adds test suite support</flag>
+ <flag name="vintage" restrict=">=dev-java/junit-5">Include JUnit Vintage, which allows JUnit 5 to run JUnit 3 and JUnit 4 tests</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-10 9:43 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2023-03-10 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 7cbe77c3a1239f316d6020fffad23392547abf9e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 09:43:08 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 09:43:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbe77c3
dev-java/junit: Keyword 5.9.2 ppc64, #900661
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index e75929f447ce..348dcf2b64cc 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-10 9:43 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2023-03-10 9:43 UTC (permalink / raw
To: gentoo-commits
commit: b0426210b59d43a8ca59de8d20ebf87958c0e4b8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 09:43:09 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 09:43:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0426210
dev-java/junit: Keyword 5.9.2 arm, #900661
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 348dcf2b64cc..e0fb4130e172 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-11 8:06 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2023-03-11 8:06 UTC (permalink / raw
To: gentoo-commits
commit: e23e1321ac457dbbd58019cf480a5239847074d9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:06:16 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 08:06:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23e1321
dev-java/junit: Keyword 5.9.2 x86, #900661
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index e0fb4130e172..3e3829d25ebd 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-03-15 12:18 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2023-03-15 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 21fe6363e7e108bef8ff8c0abb96dd0f9c451dc7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 12:18:08 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 12:18:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fe6363
dev-java/junit: Keyword 5.9.2 arm64, #900661
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 3e3829d25ebd..84a6b6711dd6 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-04-16 6:00 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-04-16 6:00 UTC (permalink / raw
To: gentoo-commits
commit: c0193447ed5c5273c06bd9c0b09edef0739f9a20
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 05:59:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 05:59:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0193447
dev-java/junit: Stabilize 5.9.2 ppc64, #904390
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 4ad617842701..25c8dd267352 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-04-16 6:00 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-04-16 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 1d0540fbcef90d4ce0862730bfe0a48ca9506c0b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 05:59:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 05:59:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d0540fb
dev-java/junit: Stabilize 5.9.2 x86, #904390
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 84a6b6711dd6..ff2934fc2a48 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-04-16 6:00 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-04-16 6:00 UTC (permalink / raw
To: gentoo-commits
commit: a11d2bc048f577ce9b46d958324e5418edc888f6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 05:59:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 05:59:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11d2bc0
dev-java/junit: Stabilize 5.9.2 amd64, #904390
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index ff2934fc2a48..4ad617842701 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-04-16 6:00 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-04-16 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 8b96a452ee32e3207a78eb33a65a7d1d4c902630
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 05:59:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 05:59:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b96a452
dev-java/junit: Stabilize 5.9.2 arm64, #904390
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 25c8dd267352..6b6d656db44a 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-11-13 7:07 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-11-13 7:07 UTC (permalink / raw
To: gentoo-commits
commit: a16b4525ae38baece80f39070de1e9c028943072
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Nov 1 13:30:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 07:07:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16b4525
dev-java/junit: minor style update
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33613
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2-r1.ebuild | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
index 81a334cec831..af5e4f424217 100644
--- a/dev-java/junit/junit-4.13.2-r1.ebuild
+++ b/dev-java/junit/junit-4.13.2-r1.ebuild
@@ -1,19 +1,17 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="junit:junit:4.13.2"
+MAVEN_ID="junit:junit:${PV}"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
HOMEPAGE="https://junit.org/junit4/"
-SRC_URI="https://github.com/${PN}-team/${PN}4/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}4-r${PV}"
LICENSE="EPL-1.0"
SLOT="4"
@@ -29,19 +27,12 @@ RDEPEND="${CP_DEPEND}
JAVA_AUTOMATIC_MODULE_NAME="junit"
JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-JAVA_SRC_DIR="${PN}4-r${PV}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}4-r${PV}/src/main/resources"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="${PN}4-r${PV}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="${PN}4-r${PV}/src/test/resources"
-
-src_prepare() {
- default
- java-pkg_clean
-}
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
src_test() {
cd "${JAVA_TEST_SRC_DIR}" || die
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2023-11-13 7:07 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2023-11-13 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 9b4ae5778c09b08a8eaaa3762984d5547b764549
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Nov 1 13:18:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 07:07:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4ae577
dev-java/junit: adjust jdk DEPEND, enable more tests, update EAPI 7 -> 8
also adds Automatic-Module-Name
Closes: https://bugs.gentoo.org/916398
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...{junit-4.13.2.ebuild => junit-4.13.2-r1.ebuild} | 37 +++++++---------------
1 file changed, 12 insertions(+), 25 deletions(-)
diff --git a/dev-java/junit/junit-4.13.2.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
similarity index 69%
rename from dev-java/junit/junit-4.13.2.ebuild
rename to dev-java/junit/junit-4.13.2-r1.ebuild
index ead129bf0725..81a334cec831 100644
--- a/dev-java/junit/junit-4.13.2.ebuild
+++ b/dev-java/junit/junit-4.13.2-r1.ebuild
@@ -4,7 +4,7 @@
# Skeleton command:
# java-ebuilder --generate-ebuild --workdir . --pom junit4-r4.13.2/pom.xml --download-uri https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junit-4.13.2.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="junit:junit:4.13.2"
@@ -19,30 +19,15 @@ LICENSE="EPL-1.0"
SLOT="4"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-# Common dependencies
-# POM: ${PN}4-r${PV}/pom.xml
-# org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3
-
-CDEPEND="
- dev-java/hamcrest-core:1.3
-"
-
-# Compile dependencies
-# POM: ${PN}4-r${PV}/pom.xml
-# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/hamcrest-library:1.3
- )
- ${CDEPEND}"
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
+CP_DEPEND="dev-java/hamcrest-core:1.3"
+# not suitable for jdk:21 #916398
+DEPEND="${CP_DEPEND}
+ <=virtual/jdk-17:*
+ test? ( dev-java/hamcrest-library:1.3 )"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+JAVA_AUTOMATIC_MODULE_NAME="junit"
JAVA_ENCODING="ISO-8859-1"
JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
@@ -64,5 +49,7 @@ src_test() {
local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
ejavac -cp "${CP}" -d . $(find * -name "*.java")
- java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+ # pom.xml lines 264-268
+ java -cp "${CP}" -Djava.awt.headless=true \
+ org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed"
}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-11 6:52 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-04-11 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 75623d6a193e5d4e7ddd9f131c3c87d09807c80b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 06:47:11 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 06:47:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75623d6a
dev-java/junit: redigested after dropped commit
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 5d2cf81f4add..68aac7156ad4 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,4 @@
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
-DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-11 6:52 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-04-11 6:52 UTC (permalink / raw
To: gentoo-commits
commit: f8afef90bfbda000a0be3fcc3db25adf128cec42
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 6 18:49:38 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 06:46:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8afef90
dev-java/junit: update EAPI 7 -> 8
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-3.8.2-r2.ebuild | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 2872a332ce63..0fdc555922d9 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
MAVEN_ID="junit:junit:3.8.2"
inherit java-pkg-2 java-pkg-simple
-MY_P=${P/-/}
-
DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.junit.org/"
+SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip"
+HOMEPAGE="https://junit.org/"
+S="${WORKDIR}/junit${PV}"
+
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8"
RDEPEND=">=virtual/jre-1.8"
-DOCS=( README.html cpl-v10.html )
+HTML_DOCS=( README.html cpl-v10.html )
JAVA_SRC_DIR="${PN}"
-S="${WORKDIR}/${MY_P}"
-
src_unpack() {
unpack ${A}
cd "${S}" || die
@@ -33,11 +32,6 @@ src_unpack() {
}
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean
}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-11 6:52 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-04-11 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 027158aa60aa6a1d62894dc2632e579e8d3c9f03
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 06:52:12 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 06:52:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027158aa
dev-java/junit: reordered variables
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-3.8.2-r2.ebuild | 2 +-
dev-java/junit/junit-5.9.2.ebuild | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 0fdc555922d9..da6bba7b5fed 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -9,8 +9,8 @@ MAVEN_ID="junit:junit:3.8.2"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip"
HOMEPAGE="https://junit.org/"
+SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip"
S="${WORKDIR}/junit${PV}"
LICENSE="CPL-1.0"
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 6b6d656db44a..46efd8fcf0d8 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,6 @@ EAPI=8
# installs each module's Javadoc to the same directory, which would
# trigger an error when the second module's Javadoc is installed.
JAVA_PKG_IUSE="source"
-IUSE="doc migration-support suite vintage"
inherit java-pkg-2 java-pkg-simple
@@ -19,10 +18,11 @@ DESCRIPTION="Simple framework to write repeatable tests"
HOMEPAGE="https://junit.org/junit5/"
SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/junit5-r${PV}"
-
LICENSE="EPL-2.0"
+
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+IUSE="doc migration-support suite vintage"
CP_DEPEND="
dev-java/apiguardian-api:0
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-14 7:49 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-04-14 7:49 UTC (permalink / raw
To: gentoo-commits
commit: bca8e639d888d263534446790b20da091112e090
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 6 17:42:01 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 07:49:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca8e639
dev-java/junit: add 5.10.2
Bug: https://bugs.gentoo.org/921398
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35482/commits/e658e37a9d867d0ec23aba3b63ba849842cd9649
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 2 +
dev-java/junit/junit-5.10.2.ebuild | 351 +++++++++++++++++++++++++++++++++++++
2 files changed, 353 insertions(+)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 68aac7156ad4..88d8a813f89d 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,6 @@
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
+DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
+DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
new file mode 100644
index 000000000000..4036eedeb0a5
--- /dev/null
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
+# prevent java-pkg-simple.eclass from handling Javadoc; instead,
+# let this ebuild handle Javadoc generation and installation itself.
+# This ebuild invokes java-pkg-simple.eclass's phase functions
+# multiple times to build multiple modules, but the eclass always
+# installs each module's Javadoc to the same directory, which would
+# trigger an error when the second module's Javadoc is installed.
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+DEB="5.10.1-1"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz
+ https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \
+ -> junit5-java18-compatibility.patch"
+S="${WORKDIR}/junit5-r${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="doc migration-support suite vintage"
+
+CP_DEPEND="
+ dev-java/apiguardian-api:0
+ dev-java/opentest4j:0
+ dev-java/open-test-reporting-events:0
+ dev-java/picocli:0
+ dev-java/univocity-parsers:0
+"
+
+# java-utils-2.eclass does not support
+# USE-conditional dependencies in CP_DEPEND
+COND_DEPEND="
+ migration-support? ( dev-java/junit:4 )
+ vintage? ( dev-java/junit:4 )
+"
+
+# Limiting JDK version to >=11 for module-info.java in this package
+# https://bugs.gentoo.org/796875#c3
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+ test? ( dev-java/jimfs:0 )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+PATCHES=(
+ "${DISTDIR}/junit5-java18-compatibility.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ # Please make sure to declare a module's dependencies before the module itself.
+ # Useful upstream documentation regarding modules and dependencies:
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
+ JUNIT5_MODULES=(
+ junit-platform-commons
+ junit-platform-engine
+ junit-platform-launcher
+ junit-platform-reporting
+ junit-platform-console # For launching tests from CLI;
+ # an eclass would need it to support running tests using JUnit 5
+
+ $(use suite && echo \
+ junit-platform-suite-api \
+ junit-platform-suite-commons \
+ junit-platform-suite-engine \
+ )
+
+ junit-jupiter-api
+ junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
+ # "JUnit 5 tests", which cannot run on earlier JUnit versions
+ junit-jupiter-params # For parameterized tests; the junit-jupiter
+ # aggregator module includes it, so building it unconditionally
+ $(usev migration-support junit-jupiter-migrationsupport)
+
+ $(usev vintage junit-vintage-engine)
+
+ # Modules not included:
+ # - junit-bom: Has no sources; solely for helping Maven and Gradle
+ # projects that use JUnit 5 manage dependencies easier
+ # - junit-jupiter: Aggregator; does not have 'src/main/java'
+ # - junit-platform-console-standalone: Has no sources; solely used
+ # by the upstream to build a fat JAR that bundles everything, so
+ # users can use just this single JAR to run JUnit 5
+ # - junit-platform-jfr: For an experimental feature
+ # - junit-platform-runner: Deprecated
+ # - junit-platform-suite: Aggregator; does not have 'src/main/java'
+ # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
+ )
+ local cp_packages=()
+ (use migration-support || use vintage) && cp_packages+=( junit-4 )
+ local save_IFS="${IFS}"
+ IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
+ IFS="${save_IFS}"
+
+ JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
+}
+
+junit5_foreach_module() {
+ local module
+ for module in "${JUNIT5_MODULES[@]}"; do
+ junit5_module_do "${module}" "${@}"
+ done
+}
+
+junit5_module_do() {
+ local module="${1}"
+ # Invocation of the passed function will not be guarded by '|| die'.
+ # Like the case for multibuild_foreach_variant(), it is recommended
+ # that the passed function itself calls 'die'.
+ local func=( "${@:2}" )
+
+ einfo "Running '${func[@]}' for ${module} ..."
+ pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
+
+ # Set up Java eclass variables that are
+ # supposed to be set in the ebuild global scope
+
+ local JAVA_JAR_FILENAME="${module}.jar"
+
+ local JAVA_SRC_DIR=(
+ src/main/java
+ src/module
+ )
+
+ local JAVA_RESOURCE_DIRS=()
+ local default_resource_dir="src/main/resources"
+ [[ -d "${default_resource_dir}" ]] &&
+ JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
+
+ if [[ "${module}" == junit-platform-console ]]; then
+ local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
+ local JAVA_LAUNCHER_FILENAME="${module}"
+ fi
+
+ # Invoke the passed function
+ "${func[@]}"
+ local ret="${?}"
+
+ popd > /dev/null || die "Failed to leave directory '${module}'"
+ return "${ret}"
+}
+
+junit5_gen_cp() {
+ echo "$(java-pkg_getjars --build-only --with-dependencies \
+ "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+}
+
+junit5_module_compile() {
+ if [[ "${module}" == junit-platform-console ]]; then
+ # Unlike other modules that have a src/main/java9 directory, for this
+ # module, the upstream puts the class files built from src/main/java9
+ # in their JAR's top-level directory instead of META-INF/versions/9
+ cp -rv src/main/java9/* src/main/java/ ||
+ die "Failed to merge ${module}'s sources for Java 9+"
+ # Remove for the [[ -d src/main/java9 ]] test
+ # during versioned directory handling
+ rm -rv src/main/java9 ||
+ die "Failed to remove ${module}'s Java 9+ source directory"
+ fi
+
+ java-pkg-simple_src_compile
+ local sources="sources.lst"
+ local classes="target/classes"
+
+ # Collect a list of all compiler input files for building Javadoc
+ local source
+ while read source; do
+ echo "${module}/${source}" >> "${all_sources}"
+ done < "${sources}" ||
+ die "Failed to add ${module}'s sources to Javadoc input list"
+
+ # Handle classes that will go into versioned directories. This will be
+ # no longer needed after https://bugs.gentoo.org/900433 is implemented.
+ local vm_ver
+ for vm_ver in 9 17; do
+ local versioned_src="src/main/java${vm_ver}"
+ if [[ -d "${versioned_src}" ]]; then
+ if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
+ local versioned_classes="target/${vm_ver}/classes"
+ mkdir -p "${versioned_classes}" ||
+ die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
+ ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ $(find "${versioned_src}" -type f -name '*.java')
+ "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
+ --release "${vm_ver}" -C "${versioned_classes}" . ||
+ die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
+ else
+ # Modules that may hit this branch as of 5.9.2:
+ # - junit-platform-console:
+ # src/main/java17/.../ConsoleUtils.java tries to use
+ # java.io.Console.charset() (available since Java 17) to get
+ # the default output charset. It is fine to not use this
+ # file, even if the built artifacts will be used on JRE 17+,
+ # as src/main/java/.../ConsoleUtils.java still gets the
+ # default from java.nio.charset.Charset.defaultCharset().
+ elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
+ fi
+ fi
+ done
+
+ # Add the current module's JAR to classpath
+ # for the module's reverse dependencies in this package
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
+}
+
+src_compile() {
+ local all_sources="${S}/all-sources.lst"
+ junit5_foreach_module junit5_module_compile
+
+ if use doc; then
+ einfo "Generating Javadoc for all modules ..."
+ local apidoc="target/api"
+ mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
+ ejavadoc -d "${apidoc}" \
+ -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
+ -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
+ -windowtitle "JUnit ${PV} API" \
+ "@${all_sources}"
+ fi
+}
+
+src_test() {
+ # Running the JUnit 5 modules' tests (located in each module's
+ # 'src/test/java') has a few obstacles:
+ # - Some test sources use text blocks -- a feature introduced in Java 15.
+ # A JDK at a lower version, e.g. 11, cannot compile them.
+ # - Some test classes depend on JUnit 5 modules that this ebuild does not
+ # include, like junit-platform-runner and junit-platform-testkit.
+ #
+ # Therefore, this ebuild uses a simpler approach to test the artifacts just
+ # built: it uses the artifacts to run tests in examples under the
+ # 'documentation/src' directory. The test coverage will not be impressive,
+ # but at least this approach verifies that the copy of JUnit 5 just built
+ # is capable of running some simple tests launched from CLI.
+
+ local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
+ local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
+ local JUNIT5_TEST_RM=(
+ $(usev !migration-support example/IgnoredTestsDemo.java)
+ $(use !suite && echo \
+ example/DocumentationTestSuite.java \
+ example/SuiteDemo.java \
+ )
+ $(usev !vintage example/JUnit4Tests.java)
+
+ # Need excluded module junit-platform-runner
+ example/JUnitPlatformClassDemo.java
+ example/JUnitPlatformSuiteDemo.java
+
+ # Need excluded module junit-platform-testkit
+ example/testkit/
+
+ # Not necessary for the tests; some files even require extra dependency
+ org/junit/api/tools/
+
+ # Needs dev-java/hamcrest; no need to pull in extra dependency
+ # as the examples already provide ample tests to run
+ example/HamcrestAssertionsDemo.java
+
+ # Makes an HTTP request and expects a certain response
+ example/session/HttpTests.java
+ )
+
+ pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
+ die "Failed to enter test source directory"
+ rm -rv "${JUNIT5_TEST_RM[@]}" ||
+ die "Failed to remove unneeded test sources"
+ # Test sources expect the working directory to be 'documentation'
+ sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
+ example/ParameterizedTestDemo.java ||
+ die "Failed to update file paths in test sources"
+ popd > /dev/null || die "Failed to leave test source directory"
+
+ local test_dir="${T}/junit5_src_test"
+ local example_classes="${test_dir}/classes"
+ local test_classes="${test_dir}/test-classes"
+ mkdir -p "${example_classes}" "${test_classes}" ||
+ die "Failed to create test directories"
+
+ local example_sources="${test_dir}/sources.lst"
+ local test_sources="${test_dir}/test-sources.lst"
+ find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
+ die "Failed to get a list of example sources"
+ find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
+ die "Failed to get a list of test sources"
+
+ ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ "@${example_sources}"
+
+ local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+ test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
+ ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${test_cp}" ${JAVAC_ARGS} \
+ "@${test_sources}"
+
+ set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
+ org.junit.platform.console.ConsoleLauncher \
+ --disable-ansi-colors --fail-if-no-tests --scan-classpath \
+ --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
+ --exclude-tag="exclude"
+ echo "${@}" >&2
+ "${@}"
+ local status="${?}"
+ [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
+ [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
+}
+
+junit5_module_install() {
+ # It is OK to let java-pkg-simple_src_install call einstalldocs for
+ # each module as long as each documentation file being installed
+ # has a unique filename among _all_ modules; otherwise, some files
+ # would overwrite other ones.
+ if [[ -f README.md ]]; then
+ mv -v README.md "README-${module}.md" ||
+ die "Failed to rename ${module}'s README.md"
+ fi
+ java-pkg-simple_src_install
+}
+
+src_install() {
+ junit5_foreach_module junit5_module_install
+ einstalldocs # For project-global documentation
+
+ if use doc; then
+ einfo "Installing Javadoc for all modules ..."
+ local apidoc="target/api"
+ java-pkg_dojavadoc "${apidoc}"
+ fi
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-14 13:39 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2024-04-14 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 9f4ea0e2b28b2ad934721029332c046f8f008d18
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 13:39:31 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 13:39:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4ea0e2
dev-java/junit: Keyword 5.10.2 arm, #929987
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 4036eedeb0a5..981018f13e51 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-04-14 13:39 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2024-04-14 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 2c297639031a81279c0b9e4227cef028c10b0bd5
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 13:39:33 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 13:39:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c297639
dev-java/junit: Keyword 5.10.2 arm64, #929987
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 981018f13e51..6e794beca258 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-01 23:18 Ionen Wolkens
0 siblings, 0 replies; 55+ messages in thread
From: Ionen Wolkens @ 2024-05-01 23:18 UTC (permalink / raw
To: gentoo-commits
commit: a9b4e9673a4f3b719f3dedbcffb8669ccbf190af
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed May 1 14:50:55 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 1 23:17:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b4e967
dev-java/junit: Keyword 5.10.2 ppc64, #929987
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 6e794beca258..30ed7d8b5486 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-01 23:18 Ionen Wolkens
0 siblings, 0 replies; 55+ messages in thread
From: Ionen Wolkens @ 2024-05-01 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 74c414ec40253634e6a63f06264748fa0ff59b94
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed May 1 17:02:26 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 1 23:17:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c414ec
dev-java/junit: Keyword 5.10.2 x86, #929987
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 30ed7d8b5486..77e7c892d6be 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-10 22:50 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-10 22:50 UTC (permalink / raw
To: gentoo-commits
commit: c4546bfcc1684e8a38b836df562af2ace9281ab7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 22:50:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 22:50:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4546bfc
dev-java/junit: Stabilize 4.13.2_p20240222 amd64, #931693
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2_p20240222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 50ec53ce530f..dbab564b1bf9 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-10 22:50 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-10 22:50 UTC (permalink / raw
To: gentoo-commits
commit: b7bdf5abc8ae4a051af94a04f10cc8ff66123e7a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 22:50:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 22:50:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bdf5ab
dev-java/junit: Stabilize 4.13.2_p20240222 arm64, #931693
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2_p20240222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 118607db1fed..50ec53ce530f 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-10 22:50 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-10 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 188454819d1ac3b6294f7795608bebf6dc11843b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 22:50:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 22:50:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18845481
dev-java/junit: Stabilize 4.13.2_p20240222 ppc64, #931693
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2_p20240222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 3ca8e79546cc..118607db1fed 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-10 22:50 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-10 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 24e1e1a75e3f8e290ee6c1bb38601d074895ab54
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 22:50:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 22:50:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e1e1a7
dev-java/junit: Stabilize 4.13.2_p20240222 x86, #931693
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-4.13.2_p20240222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index dbab564b1bf9..6a2ce43fc405 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-11 8:17 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-05-11 8:17 UTC (permalink / raw
To: gentoo-commits
commit: 5b38d722b68a43e5b83823b42ae34f3918ea7d99
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat May 11 05:25:05 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:17:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b38d722
dev-java/junit: drop 4.13.2-r1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36634
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 -
dev-java/junit/junit-4.13.2-r1.ebuild | 46 -----------------------------------
2 files changed, 47 deletions(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 88d8a813f89d..edb0ff99b55c 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,3 @@
-DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
deleted file mode 100644
index 0fa825c0272c..000000000000
--- a/dev-java/junit/junit-4.13.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="junit:junit:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit4/"
-SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}4-r${PV}"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CP_DEPEND="dev-java/hamcrest-core:1.3"
-# not suitable for jdk:21 #916398
-DEPEND="${CP_DEPEND}
- <=virtual/jdk-17:*
- test? ( dev-java/hamcrest-library:1.3 )"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="junit"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
- cd "${JAVA_TEST_SRC_DIR}" || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- # pom.xml lines 264-268
- java -cp "${CP}" -Djava.awt.headless=true \
- org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed"
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-15 10:31 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-15 10:31 UTC (permalink / raw
To: gentoo-commits
commit: ce49b4d129ca41a02dada3d48b10519ee65fb7ca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 10:30:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 15 10:30:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce49b4d1
dev-java/junit: Stabilize 5.10.2 amd64, #929985
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 77e7c892d6be..492cddc28d1a 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-15 10:31 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-15 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 92fd9c9480523925a2ee6af053e908af48e6f293
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 10:30:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 15 10:30:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92fd9c94
dev-java/junit: Stabilize 5.10.2 ppc64, #929985
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 343e214f4c96..6bbf8b8550c9 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-15 10:31 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-15 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 6c10dc8098a142f1b3bf9eac3899a709af66b932
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 10:30:15 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 15 10:30:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c10dc80
dev-java/junit: Stabilize 5.10.2 arm64, #929985
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 492cddc28d1a..343e214f4c96 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-15 12:49 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2024-05-15 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 7beb271c548eb70e5a1eb2905a6599335bc921e2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 12:48:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 15 12:48:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7beb271c
dev-java/junit: Stabilize 5.10.2 x86, #929985
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/junit/junit-5.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-5.10.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 6bbf8b8550c9..9429d37e25d6 100644
--- a/dev-java/junit/junit-5.10.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/junit5-r${PV}"
LICENSE="EPL-2.0"
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="doc migration-support suite vintage"
CP_DEPEND="
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-05-17 9:28 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-05-17 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 89c09b33121be8b28cacb141575e9e1297bb836a
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed May 15 20:57:05 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 17 09:27:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c09b33
dev-java/junit: drop 5.9.2
Closes: https://bugs.gentoo.org/921398
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/Manifest | 1 -
dev-java/junit/junit-5.9.2.ebuild | 337 --------------------------------------
2 files changed, 338 deletions(-)
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index edb0ff99b55c..7c157778f793 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,4 @@
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
-DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
deleted file mode 100644
index 46efd8fcf0d8..000000000000
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
-# prevent java-pkg-simple.eclass from handling Javadoc; instead,
-# let this ebuild handle Javadoc generation and installation itself.
-# This ebuild invokes java-pkg-simple.eclass's phase functions
-# multiple times to build multiple modules, but the eclass always
-# installs each module's Javadoc to the same directory, which would
-# trigger an error when the second module's Javadoc is installed.
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit5/"
-SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/junit5-r${PV}"
-LICENSE="EPL-2.0"
-
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="doc migration-support suite vintage"
-
-CP_DEPEND="
- dev-java/apiguardian-api:0
- dev-java/opentest4j:0
- dev-java/open-test-reporting-events:0
- dev-java/picocli:0
- dev-java/univocity-parsers:0
-"
-
-# java-utils-2.eclass does not support
-# USE-conditional dependencies in CP_DEPEND
-COND_DEPEND="
- migration-support? ( dev-java/junit:4 )
- vintage? ( dev-java/junit:4 )
-"
-
-# Limiting JDK version to >=11 for module-info.java in this package
-# https://bugs.gentoo.org/796875#c3
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}
- ${COND_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
- ${COND_DEPEND}
-"
-
-src_configure() {
- # Please make sure to declare a module's dependencies before the module itself.
- # Useful upstream documentation regarding modules and dependencies:
- # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
- # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
- JUNIT5_MODULES=(
- junit-platform-commons
- junit-platform-engine
- junit-platform-launcher
- junit-platform-reporting
- junit-platform-console # For launching tests from CLI;
- # an eclass would need it to support running tests using JUnit 5
-
- $(use suite && echo \
- junit-platform-suite-api \
- junit-platform-suite-commons \
- junit-platform-suite-engine \
- )
-
- junit-jupiter-api
- junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
- # "JUnit 5 tests", which cannot run on earlier JUnit versions
- junit-jupiter-params # For parameterized tests; the junit-jupiter
- # aggregator module includes it, so building it unconditionally
- $(usev migration-support junit-jupiter-migrationsupport)
-
- $(usev vintage junit-vintage-engine)
-
- # Modules not included:
- # - junit-bom: Has no sources; solely for helping Maven and Gradle
- # projects that use JUnit 5 manage dependencies easier
- # - junit-jupiter: Aggregator; does not have 'src/main/java'
- # - junit-platform-console-standalone: Has no sources; solely used
- # by the upstream to build a fat JAR that bundles everything, so
- # users can use just this single JAR to run JUnit 5
- # - junit-platform-jfr: For an experimental feature
- # - junit-platform-runner: Deprecated
- # - junit-platform-suite: Aggregator; does not have 'src/main/java'
- # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
- )
- local cp_packages=()
- (use migration-support || use vintage) && cp_packages+=( junit-4 )
- local save_IFS="${IFS}"
- IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
- IFS="${save_IFS}"
-
- JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
-}
-
-junit5_foreach_module() {
- local module
- for module in "${JUNIT5_MODULES[@]}"; do
- junit5_module_do "${module}" "${@}"
- done
-}
-
-junit5_module_do() {
- local module="${1}"
- # Invocation of the passed function will not be guarded by '|| die'.
- # Like the case for multibuild_foreach_variant(), it is recommended
- # that the passed function itself calls 'die'.
- local func=( "${@:2}" )
-
- einfo "Running '${func[@]}' for ${module} ..."
- pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
-
- # Set up Java eclass variables that are
- # supposed to be set in the ebuild global scope
-
- local JAVA_JAR_FILENAME="${module}.jar"
-
- local JAVA_SRC_DIR=(
- src/main/java
- src/module
- )
-
- local JAVA_RESOURCE_DIRS=()
- local default_resource_dir="src/main/resources"
- [[ -d "${default_resource_dir}" ]] &&
- JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
-
- if [[ "${module}" == junit-platform-console ]]; then
- local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
- local JAVA_LAUNCHER_FILENAME="${module}"
- fi
-
- # Invoke the passed function
- "${func[@]}"
- local ret="${?}"
-
- popd > /dev/null || die "Failed to leave directory '${module}'"
- return "${ret}"
-}
-
-junit5_gen_cp() {
- echo "$(java-pkg_getjars --build-only --with-dependencies \
- "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-}
-
-junit5_module_compile() {
- if [[ "${module}" == junit-platform-console ]]; then
- # Unlike other modules that have a src/main/java9 directory, for this
- # module, the upstream puts the class files built from src/main/java9
- # in their JAR's top-level directory instead of META-INF/versions/9
- cp -rv src/main/java9/* src/main/java/ ||
- die "Failed to merge ${module}'s sources for Java 9+"
- # Remove for the [[ -d src/main/java9 ]] test
- # during versioned directory handling
- rm -rv src/main/java9 ||
- die "Failed to remove ${module}'s Java 9+ source directory"
- fi
-
- java-pkg-simple_src_compile
- local sources="sources.lst"
- local classes="target/classes"
-
- # Collect a list of all compiler input files for building Javadoc
- local source
- while read source; do
- echo "${module}/${source}" >> "${all_sources}"
- done < "${sources}" ||
- die "Failed to add ${module}'s sources to Javadoc input list"
-
- # Handle classes that will go into versioned directories. This will be
- # no longer needed after https://bugs.gentoo.org/900433 is implemented.
- local vm_ver
- for vm_ver in 9 17; do
- local versioned_src="src/main/java${vm_ver}"
- if [[ -d "${versioned_src}" ]]; then
- if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
- local versioned_classes="target/${vm_ver}/classes"
- mkdir -p "${versioned_classes}" ||
- die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
- ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
- -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
- $(find "${versioned_src}" -type f -name '*.java')
- "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
- --release "${vm_ver}" -C "${versioned_classes}" . ||
- die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
- else
- # Modules that may hit this branch as of 5.9.2:
- # - junit-platform-console:
- # src/main/java17/.../ConsoleUtils.java tries to use
- # java.io.Console.charset() (available since Java 17) to get
- # the default output charset. It is fine to not use this
- # file, even if the built artifacts will be used on JRE 17+,
- # as src/main/java/.../ConsoleUtils.java still gets the
- # default from java.nio.charset.Charset.defaultCharset().
- elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
- fi
- fi
- done
-
- # Add the current module's JAR to classpath
- # for the module's reverse dependencies in this package
- JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
-}
-
-src_compile() {
- local all_sources="${S}/all-sources.lst"
- junit5_foreach_module junit5_module_compile
-
- if use doc; then
- einfo "Generating Javadoc for all modules ..."
- local apidoc="target/api"
- mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
- ejavadoc -d "${apidoc}" \
- -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
- -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
- -windowtitle "JUnit ${PV} API" \
- "@${all_sources}"
- fi
-}
-
-src_test() {
- # Running the JUnit 5 modules' tests (located in each module's
- # 'src/test/java') has a few obstacles:
- # - Some test sources use text blocks -- a feature introduced in Java 15.
- # A JDK at a lower version, e.g. 11, cannot compile them.
- # - Some test classes depend on JUnit 5 modules that this ebuild does not
- # include, like junit-platform-runner and junit-platform-testkit.
- #
- # Therefore, this ebuild uses a simpler approach to test the artifacts just
- # built: it uses the artifacts to run tests in examples under the
- # 'documentation/src' directory. The test coverage will not be impressive,
- # but at least this approach verifies that the copy of JUnit 5 just built
- # is capable of running some simple tests launched from CLI.
-
- local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
- local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
- local JUNIT5_TEST_RM=(
- $(usev !migration-support example/IgnoredTestsDemo.java)
- $(use !suite && echo \
- example/DocumentationTestSuite.java \
- example/SuiteDemo.java \
- )
- $(usev !vintage example/JUnit4Tests.java)
-
- # Need excluded module junit-platform-runner
- example/JUnitPlatformClassDemo.java
- example/JUnitPlatformSuiteDemo.java
-
- # Need excluded module junit-platform-testkit
- example/testkit/
-
- # Not necessary for the tests; some files even require extra dependency
- org/junit/api/tools/
-
- # Needs dev-java/hamcrest; no need to pull in extra dependency
- # as the examples already provide ample tests to run
- example/HamcrestAssertionsDemo.java
-
- # Makes an HTTP request and expects a certain response
- example/session/HttpTests.java
- )
-
- pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
- die "Failed to enter test source directory"
- rm -rv "${JUNIT5_TEST_RM[@]}" ||
- die "Failed to remove unneeded test sources"
- # Test sources expect the working directory to be 'documentation'
- sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
- example/ParameterizedTestDemo.java ||
- die "Failed to update file paths in test sources"
- popd > /dev/null || die "Failed to leave test source directory"
-
- local test_dir="${T}/junit5_src_test"
- local example_classes="${test_dir}/classes"
- local test_classes="${test_dir}/test-classes"
- mkdir -p "${example_classes}" "${test_classes}" ||
- die "Failed to create test directories"
-
- local example_sources="${test_dir}/sources.lst"
- local test_sources="${test_dir}/test-sources.lst"
- find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
- die "Failed to get a list of example sources"
- find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
- die "Failed to get a list of test sources"
-
- ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
- -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
- "@${example_sources}"
-
- local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
- ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
- -classpath "${test_cp}" ${JAVAC_ARGS} \
- "@${test_sources}"
-
- set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
- org.junit.platform.console.ConsoleLauncher \
- --disable-ansi-colors --fail-if-no-tests --scan-classpath \
- --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
- --exclude-tag="exclude"
- echo "${@}" >&2
- "${@}"
- local status="${?}"
- [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
- [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
-}
-
-junit5_module_install() {
- # It is OK to let java-pkg-simple_src_install call einstalldocs for
- # each module as long as each documentation file being installed
- # has a unique filename among _all_ modules; otherwise, some files
- # would overwrite other ones.
- if [[ -f README.md ]]; then
- mv -v README.md "README-${module}.md" ||
- die "Failed to rename ${module}'s README.md"
- fi
- java-pkg-simple_src_install
-}
-
-src_install() {
- junit5_foreach_module junit5_module_install
- einstalldocs # For project-global documentation
-
- if use doc; then
- einfo "Installing Javadoc for all modules ..."
- local apidoc="target/api"
- java-pkg_dojavadoc "${apidoc}"
- fi
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/
@ 2024-08-31 7:52 Miroslav Šulc
0 siblings, 0 replies; 55+ messages in thread
From: Miroslav Šulc @ 2024-08-31 7:52 UTC (permalink / raw
To: gentoo-commits
commit: 04031a6cef44eb83b85ff5bf7bac1e537eef861d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Aug 30 16:23:57 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 07:52:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04031a6c
dev-java/junit: test dependencies use java-pkg_getjars with '--build-only'
Closes: https://bugs.gentoo.org/938743
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37748
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/junit/junit-4.13.2_p20240222.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 6a2ce43fc405..50aa3c3c6763 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -44,7 +44,8 @@ src_prepare() {
src_test() {
cd "${JAVA_TEST_SRC_DIR}" || die
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
+ local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars \
+ --build-only ${JAVA_TEST_GENTOO_CLASSPATH})"
ejavac -cp "${CP}" -d . $(find * -name "*.java")
# pom.xml lines 264-268
^ permalink raw reply related [flat|nested] 55+ messages in thread
end of thread, other threads:[~2024-08-31 7:52 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-16 6:00 [gentoo-commits] repo/gentoo:master commit in: dev-java/junit/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-31 7:52 Miroslav Šulc
2024-05-17 9:28 Miroslav Šulc
2024-05-15 12:49 Sam James
2024-05-15 10:31 Sam James
2024-05-15 10:31 Sam James
2024-05-15 10:31 Sam James
2024-05-11 8:17 Miroslav Šulc
2024-05-10 22:50 Sam James
2024-05-10 22:50 Sam James
2024-05-10 22:50 Sam James
2024-05-10 22:50 Sam James
2024-05-01 23:18 Ionen Wolkens
2024-05-01 23:18 Ionen Wolkens
2024-04-14 13:39 Arthur Zamarin
2024-04-14 13:39 Arthur Zamarin
2024-04-14 7:49 Miroslav Šulc
2024-04-11 6:52 Miroslav Šulc
2024-04-11 6:52 Miroslav Šulc
2024-04-11 6:52 Miroslav Šulc
2023-11-13 7:07 Sam James
2023-11-13 7:07 Sam James
2023-04-16 6:00 Sam James
2023-04-16 6:00 Sam James
2023-04-16 6:00 Sam James
2023-03-15 12:18 Arthur Zamarin
2023-03-11 8:06 Arthur Zamarin
2023-03-10 9:43 Arthur Zamarin
2023-03-10 9:43 Arthur Zamarin
2023-03-10 7:34 Miroslav Šulc
2023-03-09 6:42 Miroslav Šulc
2023-01-07 13:19 Joonas Niilola
2021-05-06 16:39 Miroslav Šulc
2021-05-06 10:09 Sam James
2021-05-06 10:01 Sam James
2021-05-06 6:57 Agostino Sarubbo
2021-05-06 6:55 Agostino Sarubbo
2021-04-05 11:01 Miroslav Šulc
2021-03-26 20:42 Agostino Sarubbo
2021-03-26 7:50 Agostino Sarubbo
2021-03-15 16:18 Agostino Sarubbo
2021-03-14 8:21 Miroslav Šulc
2021-03-13 8:44 Miroslav Šulc
2021-03-12 12:18 Miroslav Šulc
2021-02-15 8:31 Miroslav Šulc
2019-05-18 1:14 Aaron Bauman
2019-03-16 19:24 Patrice Clement
2019-03-16 19:24 Patrice Clement
2017-07-13 7:48 Alexis Ballier
2017-07-13 7:48 Alexis Ballier
2017-04-01 23:20 Patrice Clement
2016-04-07 9:59 James Le Cuirot
2016-04-07 9:59 James Le Cuirot
2016-02-10 19:41 Mike Frysinger
2015-11-19 22:56 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox