7 files changed, 197 insertions, 65 deletions
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index c81931d3700b..1ce8b77b7124 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1 +1,2 @@
 DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1
+DIST joda-time-2.11.0.tar.gz 1055531 BLAKE2B 98b64e0419a1b7379d3467d012a1162afedb537048c86f8e9069ef5e21649dfe01d458a8e74ccb5dc052940b6edd2eba73ad86ae25bc20d3e62ec73a7a56a605 SHA512 357c8b3d1cc1cdd164cf2486a55ab9489db43c4243f140da5c21ee84bc3a801f51e2e2c2a257dbe2d2ce41bc33c676854136eddf3606ed7da69dcd3a10b2d010
diff --git a/dev-java/joda-time/files/joda-time-2.11.0-test.patch b/dev-java/joda-time/files/joda-time-2.11.0-test.patch
new file mode 100644
index 000000000000..a74cd01edfbc
--- /dev/null
+++ b/dev-java/joda-time/files/joda-time-2.11.0-test.patch
@@ -0,0 +1,14 @@
+--- a/src/test/java/org/joda/time/TestDateTimeZone.java
++++ b/src/test/java/org/joda/time/TestDateTimeZone.java
+@@ -778,9 +778,10 @@ public class TestDateTimeZone extends TestCase {
+     static final boolean JDK9;
+     static {
+         boolean jdk9 = true;
++        System.out.println("java.version = " + System.getProperty("java.version")  );
+         try {
+             String str = System.getProperty("java.version");
+-            jdk9 = str.startsWith("9");
++            jdk9 = str.startsWith("11");
+         } catch (Exception ex) {
+             jdk9 = false;
+         }
diff --git a/dev-java/joda-time/joda-time-2.11.0.ebuild b/dev-java/joda-time/joda-time-2.11.0.ebuild
new file mode 100644
index 000000000000..f9c720bebe0a
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.11.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/v2.11.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.11.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="joda-time:joda-time:2.11.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit edo java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Date and time library to replace JDK date handling"
+HOMEPAGE="https://www.joda.org/joda-time/"
+SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0
+
+CP_DEPEND="dev-java/joda-convert:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+PATCHES=(
+	# Enable tests for jdk-11 in
+	# src/test/java/org/joda/time/TestDateTimeZone.java
+	"${FILESDIR}/joda-time-2.11.0-test.patch"
+)
+
+DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/res"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages"
+
+src_prepare() {
+	default
+	# move .properties files to JAVA_RESOURCE_DIRS
+	mkdir -p src/main/res
+	cp -r src/main/{java/*,res} || die
+	find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
+	# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
+	edo "$(java-config -J)" \
+		-cp ${PN}.jar \
+		org.joda.time.tz.ZoneInfoCompiler \
+		-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
+		-dst "${P}/src/main/resources/org/joda/time/tz/data" \
+		africa \
+		antarctica \
+		asia \
+		australasia \
+		europe \
+		northamerica \
+		southamerica \
+		etcetera \
+		backward
+
+	java-pkg_addres ${PN}.jar "${P}"/src/main/resources
+}
+
+src_test() {
+	# There are test failures in
+	# src/test/java/org/joda/time/TestDateTimeZone.java
+	# with jdk higher than 11
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -le 11 ; then
+		java-pkg-simple_src_test
+	else
+		einfo "Tests restricted to <=jdk-11"
+	fi
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index ff948ed9ad93..c54fc46bb46b 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1 @@
-DIST apache-maven-3.8.3-bin.tar.gz 9042049 BLAKE2B 2709a47fddca340d9ddaa1f716990e5a4580667169552cedcda2f2017b190cacfc545e2d5b0d5aaae5f95172fb49201eefc4edaff1009f855fb93065e0de6919 SHA512 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
 DIST apache-maven-3.8.6-bin.tar.gz 8676320 BLAKE2B 7ad7695aaed86b478044dd0ce59d359c8eb3644ddf0bc3ea501a9eb5c373e2bdacbe8cdf8c85edab930d84d446ff1cb25975281bb7c9cb517a005accba9e413d SHA512 f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
diff --git a/dev-java/maven-bin/maven-bin-3.8.3.ebuild b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
deleted file mode 100644
index 15cbb360e0de..000000000000
--- a/dev-java/maven-bin/maven-bin-3.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.8"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 9fabc3068f10..6e4530b6dd01 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1 +1,2 @@
 DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
+DIST snakeyaml-1.31.tar.gz 407514 BLAKE2B 88d600aae5ba7dc5e1877a020082878e20fff7a30d9ff799d358e53e96da01bc8478bd5966c1058de186198d6ef10431480f8b2644d5fdb7e87dca462d9addee SHA512 e5c56cb4ad8ee68e41da63351f39be48ef9ceb50239580d1de1f7a331d66d92fd9aa9b26b4ba6dcb9db6c5acc682c7c2098b3468d32e73bdd2dbf4d07bcc5c55
diff --git a/dev-java/snakeyaml/snakeyaml-1.31.ebuild b/dev-java/snakeyaml/snakeyaml-1.31.ebuild
new file mode 100644
index 000000000000..1b37722f47ac
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.31.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.31.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.31.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.yaml:snakeyaml:1.31"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="YAML 1.1 parser and emitter for Java"
+HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.14:0
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.velocity:velocity-engine-core:2.3 -> >=dev-java/velocity-2.3:0
+# test? org.projectlombok:lombok:1.18.22 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/velocity:0
+		dev-java/joda-time:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/snakeyaml-snakeyaml-04401a88fa9b"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_AUTOMATIC_MODULE_NAME="org.yaml.snakeyaml"
+
+JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+
+	# Not packaged org.projectlombok:lombok - https://bugs.gentoo.org/868684
+	rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java || die # Tests run: 1
+	rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die # Tests run: 1
+	rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die # No tests
+
+	# There were 2 failures: - https://bugs.gentoo.org/868681
+	# 1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.yamlClassInYAMLCL(ContextClassLoaderTest.java:127)
+	# 2) domainInDifferentConstructor(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	#         at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589)
+	#         at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+	#         at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
+
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \
+			! -name "StressTest.java" \
+			! -name "ParallelTest.java" \
+			! -name "AbstractTest.java" \
+			! -name "PyImportTest.java" \
+			! -name "ContextClassLoaderTest.java" \
+			)
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	java-pkg-simple_src_test
+}