[gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-xml-soap-api/

[Florian Schmaus]

commit:     0be9ae93c59cdce8cfb6a6d195965a7b3ab48471
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue May 10 08:42:46 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 10 14:46:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be9ae93

dev-java/jakarta-xml-soap-api: virtual/jdk-1.8:*" -> -11:*

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

 ....2.ebuild => jakarta-xml-soap-api-1.4.2-r1.ebuild} | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
similarity index 67%
rename from dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
rename to dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
index cd78fb76c776..be69299aa916 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
-SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # EDL-1.0 equivalent to BSD
 # - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
@@ -24,11 +24,11 @@ SLOT="1"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
-	dev-java/jakarta-activation-api:1
+	>=dev-java/jakarta-activation-api-1.2.2-r1:1
 "
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 "
 
@@ -44,21 +44,10 @@ JAVA_SRC_DIR="api/src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="api/src/test/java"
 JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" )
+JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
 
 DOCS=( CONTRIBUTING.md NOTICE.md README.md )
 
-src_test() {
-	if ver_test "$(java-config -g PROVIDES_VERSION)" -lt 9; then
-		# https://github.com/javaee/javax.xml.soap/blob/1.4.0/pom.xml#L134-L143
-		JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/p:target/classes )
-	else
-		# '-Xbootclasspath/p' removed since JDK 9; '-Xbootclasspath/a' remains
-		# https://openjdk.java.net/jeps/261
-		JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
-	fi
-	java-pkg-simple_src_test
-}
-
 src_install() {
 	java-pkg-simple_src_install
 	einstalldocs # https://bugs.gentoo.org/789582