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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     d68cb9e859e7ad68af005fa8bccc85000b35d35a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Sep 14 06:56:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 08:37:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68cb9e8

dev-java/opentest4j: back to >=virtual/jre-1.8:* #939580

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

 dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild | 52 ++++++++++++++++++++++++++
 dev-java/opentest4j/opentest4j-1.3.0.ebuild    | 28 --------------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..1fd5072d0edf
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.opentest4j:opentest4j:1.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-r${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"	#939580
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
+
+src_test() {
+	# src/test/java/org/opentest4j/FileInfoTests.java:52: error: cannot find symbol
+	# 		var out = new ByteArrayOutputStream();
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:55: error: cannot find symbol
+	# 		var deserialized = (AssertionFailedError) new ObjectInputStream(
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:64: error: cannot find symbol
+	# 		var contents = "contents".getBytes(UTF_8);
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:65: error: cannot find symbol
+	# 		var fileInfo = new FileInfo("path", contents);
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	JAVAC_ARGS="--source 11 --target 11" java-pkg-simple_src_test
+}

diff --git a/dev-java/opentest4j/opentest4j-1.3.0.ebuild b/dev-java/opentest4j/opentest4j-1.3.0.ebuild
deleted file mode 100644
index 646ec2c91a4e..000000000000
--- a/dev-java/opentest4j/opentest4j-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.opentest4j:opentest4j:1.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Open Test Alliance for the JVM"
-HOMEPAGE="https://github.com/ota4j-team/opentest4j"
-SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-r${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
-
-JAVA_SRC_DIR=( src/{main,module}/java )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( src/test/java )
-JAVA_TEST_RESOURCE_DIRS=( src/test/resources )