[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Patrice Clement]

commit:     8662305e72228f33ecdbb3680eba30d1db6e6276
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 21:38:46 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 21:44:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8662305e

dev-java/plexus-classworlds: update HOMEPAGE.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index a5b7b5428ac..a75ec187a22 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="http://plexus.codehaus.org/"
+HOMEPAGE="https://github.com/codehaus"
 SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 
 LICENSE="codehaus-classworlds"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     60bb60f667b84dd6e42a64bc21f7fa97949d4b68
Author:     Henning Sudbrock <github <AT> hsudbrock <DOT> de>
AuthorDate: Thu Aug 27 17:24:17 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 16:29:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bb60f6

dev-java/plexus-classworlds: Add missing dependency to ant-junit4

The tests cannot be executed without ant-junit4 during the test phase.

Closes: https://bugs.gentoo.org/736954
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Henning Sudbrock <github <AT> hsudbrock.de>
Closes: https://github.com/gentoo/gentoo/pull/17281
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index a75ec187a22..b9bea04df15 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
-		test? ( dev-java/junit:4 )"
+		test? ( dev-java/ant-junit4 )"
 RDEPEND=">=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     b4daa5c4d131a4ccfc450a7744a6ac1bd3c556f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 16:29:00 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 16:29:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4daa5c4

dev-java/plexus-classworlds: eapi7, min java 1.8, ant task via var

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../plexus-classworlds/plexus-classworlds-2.2.3.ebuild     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index b9bea04df15..49465eea7b4 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-junit4"
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,16 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.6
-		test? ( dev-java/ant-junit4 )"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
 
-java_prepare() {
+src_prepare() {
 	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
+
+	default
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     c9470813dbd973bbaad08073016127d10dbc7090
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 08:48:12 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 08:48:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9470813

dev-java/plexus-classworlds: Keyword 2.2.3 arm, #831479

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 49465eea7b4e..182ba5a22498 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     eeb1803beb375f32e92aa5ecf76191adea6abf22
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 08:48:32 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 08:48:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb1803b

dev-java/plexus-classworlds: Keyword 2.2.3 arm64, #831479

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 182ba5a22498..355e0ebd2673 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     3f7b24fe4c1f8793cc0a1c6fa34851a6fe1eb72b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 09:42:52 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 09:42:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7b24fe

dev-java/plexus-classworlds: Keyword 2.2.3 ppc64, #831479

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 355e0ebd2673..bb3af0835423 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     df0f8ab555bd94c6c1fa70c8af419fc0bdc6726b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 18:50:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 18:50:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0f8ab5

dev-java/plexus-classworlds: Stabilize 2.2.3 x86, #834059

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index bb3af0835423..2b9c01e5a349 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     1d18007e15dbadd3e81f2485816e227c531fdec5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 18:51:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 18:51:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d18007e

dev-java/plexus-classworlds: Stabilize 2.2.3 amd64, #834059

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 2b9c01e5a349..ea0df485cb9f 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Agostino Sarubbo]

commit:     4dfe5135a79a0a13af2aa7d0df563a9d8bb2d847
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 08:57:00 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 08:57:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dfe5135

dev-java/plexus-classworlds: ppc64 stable wrt bug #834059

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index ea0df485cb9f..9cbca2b187e5 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     850b482ba9a5416bddf8e5ea68616b8514055e98
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 09:42:36 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 09:42:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850b482b

dev-java/plexus-classworlds: Stabilize 2.2.3 arm64, #834097

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 9cbca2b187e5..31491d6dd752 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Florian Schmaus]

commit:     ae371a31579a5903dd42c6c529a3b97d1ac204fb
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jul 20 08:50:03 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 18:26:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae371a31

dev-java/plexus-classworlds: add 2.6.0

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26495
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/plexus-classworlds/Manifest               |  1 +
 dev-java/plexus-classworlds/metadata.xml           |  3 ++
 .../plexus-classworlds-2.6.0.ebuild                | 59 ++++++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index ce840cb6f52b..78a8b35b095b 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1 +1,2 @@
 DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
+DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e

diff --git a/dev-java/plexus-classworlds/metadata.xml b/dev-java/plexus-classworlds/metadata.xml
index 4221e170cbc0..183a9252fc9e 100644
--- a/dev-java/plexus-classworlds/metadata.xml
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">codehaus-plexus/plexus-classworlds</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
new file mode 100644
index 000000000000..3a2f9d422f54
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The class loader framework of the Plexus project"
+HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
+SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/commons-logging
+		dev-java/xml-commons-external:1.4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
+JAVA_SRC_DIR="src/main/java/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
+JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
+
+src_prepare() {
+	default
+	# Ignore one test case testing the presence of ant-core
+	sed \
+		-e '/testConfigure_Valid/i @Ignore' \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die
+}
+
+src_test(){
+	mkdir -p target/test-lib || die
+	# https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161
+	ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \
+		target/test-lib/xml-apis-1.3.02.jar || die
+	# symlinking works only if java-pkg_getjars finds only one file
+	# but commons-logging has  multiple jar files.
+	ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \
+		target/test-lib/commons-logging-1.0.3.jar || die
+	java-pkg-simple_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     43cf11cee060134ba8bf25e0737a329233d6cfc1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 08:02:55 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 08:02:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43cf11ce

dev-java/plexus-classworlds: Stabilize 2.6.0 arm64, #866905

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
index 3a2f9d422f54..0133468619df 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-cl
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Arthur Zamarin]

commit:     200146d010086815fd3a344a41aa065630d7567f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 08:22:03 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 08:22:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200146d0

dev-java/plexus-classworlds: Stabilize 2.6.0 ppc64, #866905

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
index 0133468619df..aae9d209cf17 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-cl
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     42f3abcfd8950fda06f762c46f5727ddaea56fe4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 08:26:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 08:27:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f3abcf

dev-java/plexus-classworlds: Stabilize 2.6.0 amd64, #866905

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
index cc7ac7e0d7e8..d5eca2023894 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-cl
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     e81f45d3ece00caf6db78739234f3e174b19a055
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 08:25:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 08:27:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81f45d3

dev-java/plexus-classworlds: Stabilize 2.6.0 x86, #866905

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
index aae9d209cf17..cc7ac7e0d7e8 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-cl
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     cbd0841586cdea5e093dc4eeaf2397dc586a58d4
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Aug 27 09:01:46 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 05:17:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd08415

dev-java/plexus-classworlds: drop 2.2.3

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/plexus-classworlds/Manifest               |  1 -
 .../plexus-classworlds-2.2.3.ebuild                | 41 ----------------------
 2 files changed, 42 deletions(-)

diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 78a8b35b095b..2136c99da805 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,2 +1 @@
-DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
 DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
deleted file mode 100644
index 31491d6dd752..000000000000
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-WANT_ANT_TASKS="ant-junit4"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="codehaus-classworlds"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-
-	default
-}
-
-src_install() {
-	java-pkg_newjar "${S}/target/${P}.jar" "${PN}.jar"
-
-	use source && java-pkg_dosrc "${S}"/src/main/java/*
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     dcaf11f20f2661fc23472b8274382e417aff52fc
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Oct 24 09:34:29 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 08:17:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcaf11f2

dev-java/plexus-classworlds: add 2.7.0

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33489
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/plexus-classworlds/Manifest               |  1 +
 .../plexus-classworlds-2.7.0.ebuild                | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 2136c99da805..048135928211 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1 +1,2 @@
 DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
+DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
new file mode 100644
index 000000000000..df33db15f12a
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.codehaus.plexus:plexus-classworlds:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The class loader framework of the Plexus project"
+HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
+SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-core:0
+		dev-java/commons-logging:0
+		dev-java/xml-commons-external:1.4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
+JAVA_SRC_DIR="src/main/java/"
+
+# Invalid test class, No runnable methods
+JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test(){
+	# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
+	mkdir -p target/test-lib || die
+	java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
+	java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar
+	java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
+	java-pkg-simple_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     30f77edda57ab8ef62b8314965da860539d7cba3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 09:32:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 09:32:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f77edd

dev-java/plexus-classworlds: Stabilize 2.7.0 amd64, #918109

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
index 2740865fe788..3b7b40234f87 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     d4cbcd9e25208ee742d3329421cb32bb2cee3140
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 09:32:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 09:32:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cbcd9e

dev-java/plexus-classworlds: Stabilize 2.7.0 x86, #918109

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
index df33db15f12a..2740865fe788 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Sam James]

commit:     2d25990c79f6de9db345957f1590cec8f0e116ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 09:32:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 09:32:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d25990c

dev-java/plexus-classworlds: Stabilize 2.7.0 arm64, #918109

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
index 3b7b40234f87..1c6f4ade8267 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Michał Górny]

commit:     230c5a71db97a9e15a3b539bd7f9b519939f2481
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 11:03:23 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 11:04:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=230c5a71

dev-java/plexus-classworlds: Stabilize 2.7.0 ppc64, #918109

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
index 1c6f4ade8267..5d46ae9f6f12 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     4dd0d020e4872b281039b07cec0f71d481164637
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Nov 29 13:02:56 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 10:02:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd0d020

dev-java/plexus-classworlds: drop 2.6.0

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/plexus-classworlds/Manifest               |  1 -
 .../plexus-classworlds-2.6.0.ebuild                | 59 ----------------------
 2 files changed, 60 deletions(-)

diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 048135928211..444a9642dc6e 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,2 +1 @@
-DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
 DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
deleted file mode 100644
index d5eca2023894..000000000000
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
-SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/commons-logging
-		dev-java/xml-commons-external:1.4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
-JAVA_SRC_DIR="src/main/java/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
-JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
-
-src_prepare() {
-	default
-	# Ignore one test case testing the presence of ant-core
-	sed \
-		-e '/testConfigure_Valid/i @Ignore' \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die
-}
-
-src_test(){
-	mkdir -p target/test-lib || die
-	# https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161
-	ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \
-		target/test-lib/xml-apis-1.3.02.jar || die
-	# symlinking works only if java-pkg_getjars finds only one file
-	# but commons-logging has  multiple jar files.
-	ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \
-		target/test-lib/commons-logging-1.0.3.jar || die
-	java-pkg-simple_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     188fe3627a3523e453f73600b924dfa920860f29
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 12 07:19:07 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 10:22:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188fe362

dev-java/plexus-classworlds: switch dependency to dev-java/ant

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/a3043a5e8da31324cdfb434f089a0886be439f45
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...-classworlds-2.7.0.ebuild => plexus-classworlds-2.7.0-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
similarity index 91%
rename from dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
rename to dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
index 5d46ae9f6f12..b61697448e9a 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.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
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/ant-core:0
+		>=dev-java/ant-1.10.14-r3:0
 		dev-java/commons-logging:0
 		dev-java/xml-commons-external:1.4
 	)
@@ -41,7 +41,7 @@ src_test(){
 	# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
 	mkdir -p target/test-lib || die
 	java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
-	java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar
+	java-pkg_jar-from --into target/test-lib ant ant.jar ant-1.9.0.jar
 	java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
 	java-pkg-simple_src_test
 }