Adding metadata

41 files changed, 954 insertions, 48 deletions

diff --git a/dev-java/bnd/bnd-7.1.0-r2.ebuild b/dev-java/bnd/bnd-7.1.0-r3.ebuild
index cddf68c90f4d..d8b6f75976c4 100644
--- a/dev-java/bnd/bnd-7.1.0-r2.ebuild
+++ b/dev-java/bnd/bnd-7.1.0-r3.ebuild
@@ -30,7 +30,7 @@ CP_DEPEND="
 	dev-java/osgi-cmpn:8
 	dev-java/osgi-core:0
 	dev-java/slf4j-simple:0
-	dev-java/snakeyaml:0
+	dev-java/snakeyaml:1
 	dev-java/xz-java:0
 "
 
diff --git a/dev-java/fastdoubleparser/Manifest b/dev-java/fastdoubleparser/Manifest
new file mode 100644
index 000000000000..b3c42efebc62
--- /dev/null
+++ b/dev-java/fastdoubleparser/Manifest
@@ -0,0 +1 @@
+DIST fastdoubleparser-2.0.1.tar.gz 3989074 BLAKE2B 92f0c50b2510ecae8b0262b6bc31f70b922ff335b23f64eb3c91703feb5bb14d28cd1ad0f44af0b2379dde9b5b0008b062e3db6155166b534cfd30ff8c576e8f SHA512 dc4d9d6c9b5ad7e4bf154e3bf5660ea104bf53c430e42425fc2fcbd5eb5b56347448329a09b06bfea6b8da433fd3851fe74bf116541afa701853c8646a48e412
diff --git a/dev-java/fastdoubleparser/fastdoubleparser-2.0.1.ebuild b/dev-java/fastdoubleparser/fastdoubleparser-2.0.1.ebuild
new file mode 100644
index 000000000000..eae842f77495
--- /dev/null
+++ b/dev-java/fastdoubleparser/fastdoubleparser-2.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java port of Daniel Lemire's fast_float project"
+HOMEPAGE="https://github.com/wrandelshofer/FastDoubleParser/"
+SRC_URI="https://github.com/wrandelshofer/FastDoubleParser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FastDoubleParser-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-25:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="ch.randelshofer.fastdoubleparser"
+JAVA_RELEASE_SRC_DIRS=(
+	["11"]="fastdoubleparser-java11/src/main/java"
+	["17"]="fastdoubleparser-java17/src/main/java"
+	["21"]="fastdoubleparser-java21/src/main/java"
+	["23"]="fastdoubleparser-java23/src/main/java"
+)
+JAVA_SRC_DIR="fastdoubleparser-java8/src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	rm fastdoubleparser-java11/src/main/java/ch.randelshofer.fastdoubleparser/ch/randelshofer/fastdoubleparser/NumberFormatSymbols.java || die
+	pushd fastdoubleparser-dev > /dev/null || die "pushd"
+		find src/main/java -type f -name '*.java' \
+			! -name 'BigSignificand.java' \
+			! -name 'Decimal.java' \
+			! -name 'FastDoubleSwar.java' \
+			! -name 'FastDoubleVector.java' \
+			! -name 'FastIntegerMath.java' \
+			! -name 'NumberFormatSymbols.java' \
+			! -name 'module-info.java' |
+			xargs cp --parent -t ../fastdoubleparser-java8 || die "java8"
+
+		find src/main/java -type f \
+			-name 'BigSignificand.java' |
+			xargs cp --parent -t ../fastdoubleparser-java11 || die "java11"
+
+		find src/main/java -type f \
+			-name 'FastIntegerMath.java' |
+			xargs cp --parent -t ../fastdoubleparser-java17 || die "java17"
+
+		find src/main/java -type f \
+			-name 'FastIntegerMath.java' |
+			xargs cp --parent -t ../fastdoubleparser-java21 || die "java21"
+
+		find src/main/java -type f \
+			\( -name 'FastDoubleSwar.java' \
+			-o -name 'FastIntegerMath.java' \) |
+			xargs cp --parent -t ../fastdoubleparser-java23 || die "java23"
+	popd > /dev/null || die "popd"
+}
diff --git a/dev-java/fastdoubleparser/metadata.xml b/dev-java/fastdoubleparser/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/fastdoubleparser/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index e56fa64c2593..2776733bc78a 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1 +1,2 @@
 DIST jackson-annotations-2.13.4.tar.gz 1984001 BLAKE2B 8c4eed89fc0c5b3d68f25f2db28a38e55a2e629c7c38289a82f4ff4a122967326e0221cb020afb69577fe4d5baa2ba89f8db5a398302cd25404083a5d0830eaf SHA512 5ad1d07b254956f9d4123eb01e32d8a8f43eccefe60c6841675ccfecd8837feb4de9352d90f8b8a2703f0f12a0fd20083f8d274594e1ca5674894b2cd76ce322
+DIST jackson-annotations-2.20.tar.gz 83455 BLAKE2B bb97034f1785d6ac9c19262f4829f43db1e2f712c450ab2b65e0a7052aa56725718e96938d71382b9533cd89cef8b5bb6b58ae4459c72a53b823e964ec98083c SHA512 c630a048d391062258d6d36cf6f4e6f1b8166c0e546d38874035061bbcde36d680954e79856a90d839fc4d423098a674c5b36c91527d441c83484294965dadbc
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4-r1.ebuild
index cb9faac05f7e..deb21136a988 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
 SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="2"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.20.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.20.ebuild
new file mode 100644
index 000000000000..ce0186742a58
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-11:*" # module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {README,SECURITY}.md release-notes/VERSION-2.x )
+
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.annotation"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index ebe2f5072775..3b87423aa168 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1 +1,2 @@
 DIST jackson-core-2.13.4.tar.gz 12270995 BLAKE2B d4556ad35eaf4f3182cb07eb39b14691a0d9c5d7801a4f6450536fcb33c19e9d6f24e80477c09dae167d4ff3b3e57798d63f4c24ca689a902350a6ff4ce0b19d SHA512 95fba755c9289728ce6168e57ef8f2417df03616b5839beacc338947d1447719e930b6f820144c0f398f162676e5d56a6a5bbcb86cbdb15f80de566ba45c478a
+DIST jackson-core-2.20.0.tar.gz 1223528 BLAKE2B 549a94eddd4a0e452d4aa35677a259a7609516b8b6528a89984dfc284b4e8685a2399d3f415e476d7db4056419f9f06b6941b540ae3fedac36aded1906704946 SHA512 ea730a5bd15c14efa385c71b209026f0150baabcaa2ad760696784862dd91c09f9b6141daf361682ec5cfc43722d907235e6c2750de003b8e2b1c85fb55f62d1
diff --git a/dev-java/jackson-core/jackson-core-2.13.4.ebuild b/dev-java/jackson-core/jackson-core-2.13.4-r1.ebuild
index 237b13f1d151..f40e4981d7ed 100644
--- a/dev-java/jackson-core/jackson-core-2.13.4.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-core"
 SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/jackson-core/jackson-core-2.20.0.ebuild b/dev-java/jackson-core/jackson-core-2.20.0.ebuild
new file mode 100644
index 000000000000..2ba3df1fd086
--- /dev/null
+++ b/dev-java/jackson-core/jackson-core-2.20.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
+HOMEPAGE="https://github.com/FasterXML/jackson-core"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-java/fastdoubleparser:0
+	>=virtual/jdk-11:*
+	test? ( >=dev-java/assertj-core-3.27.6:0 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+JAVA_CLASSPATH_EXTRA="fastdoubleparser"
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.core"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e 's:@projectartifactid@:jackson-core:g' \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+}
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 34113ea0eb6d..6df936920404 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1 +1,3 @@
 DIST jackson-databind-2.13.4.1.tar.gz 48063423 BLAKE2B 88370810068f3c1b3973f310e55e6fb53067ff9796de960d2c57cd50ee59dd552f58b4e73d4455076b18ec996ce7714ab84000a4887a1779fcf259859c891346 SHA512 22b7a4225903a0fad3d7d17a5fad79905da96a4a7ebf70b7d9f2c778e88f8c9c2a27d96f66beae96f189ebcd9ca19fd7b12405009ae38023ec8b0511e1ba1af2
+DIST jackson-databind-2.20.0.tar.gz 1744001 BLAKE2B 3167541356510eba3b2573b0df3e8f03a4798f78ba03f93b038bc63c746419a8d2ba4a765686de24b0c1de83c2d0560159835a4c2b4fb4d4e9b6b9613b051ce2 SHA512 d6c25efac9084809b9c6406a629e3b526ddbdcbb0b1b5dd8736711cb899718bd7bb54f38b300deeca009c6d1acebb1d7e6a13144d3755d4b8ae5d63695a69eff
+DIST jsr-275-0.9.1.jar 238820 BLAKE2B 6e49815d4806fb4f7f85ccefd05cdbcef77bf309ed0a538d06ef5138d5f456901d3e4099aee9d8a6b18e40b75728fbc5218130d54e50ff6e2728223487172796 SHA512 58c8c4a98145ea4eaeffe070c592c3dde2cc0987d3aa99555509c04566d2fd356eb6bc5f484fe922eb61c875de359f9aff027f76ac9cc20b196d7fd954406c70
diff --git a/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKStringLikeTypeDeserTest.patch b/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKStringLikeTypeDeserTest.patch
new file mode 100644
index 000000000000..8f95f28f0bb2
--- /dev/null
+++ b/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKStringLikeTypeDeserTest.patch
@@ -0,0 +1,37 @@
+testInetAddress()
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.deser.jdk.JDKStringLikeTypeDeserTest]/[method:testInetAddress()]
+   parent: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.deser.jdk.JDKStringLikeTypeDeserTest]
+   source: MethodSource [className = 'com.fasterxml.jackson.databind.deser.jdk.JDKStringLikeTypeDeserTest', methodName = 'testInetAddress', methodParameterTypes = '']
+   caught: com.fasterxml.jackson.databind.JsonMappingException: Unexpected IOException (of type java.net.UnknownHostException): google.com: Temporary failure in name resolution
+             	at com.fasterxml.jackson.databind.JsonMappingException.fromUnexpectedIOE(JsonMappingException.java:344)
+             	at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3958)
+             	at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3922)
+             	at com.fasterxml.jackson.databind.deser.jdk.JDKStringLikeTypeDeserTest.testInetAddress(JDKStringLikeTypeDeserTest.java:178)
+             	at java.base/java.lang.reflect.Method.invoke(Method.java:565)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+ duration: 13 ms
+   status: ✘ FAILED
+
+diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java
+index 8fe9ca9..56ac9a9 100644
+--- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java
++++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java
+@@ -10,6 +10,7 @@ import java.util.UUID;
+ import java.util.regex.Pattern;
+ 
+ import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
+ 
+ import com.fasterxml.jackson.annotation.*;
+ 
+@@ -167,7 +168,7 @@ public class JDKStringLikeTypeDeserTest
+         assertEquals("abc", cs.toString());
+     }
+ 
+-    @Test
++    @Test @Disabled
+     public void testInetAddress() throws IOException
+     {
+         InetAddress address = MAPPER.readValue(q("127.0.0.1"), InetAddress.class);
diff --git a/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKTypeSerializationTest.patch b/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKTypeSerializationTest.patch
new file mode 100644
index 000000000000..5942fdc9c7e0
--- /dev/null
+++ b/dev-java/jackson-databind/files/jackson-databind-2.20.0-JDKTypeSerializationTest.patch
@@ -0,0 +1,42 @@
+testInetAddress()
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.ser.jdk.JDKTypeSerializationTest]/[method:testInetAddress()]
+   parent: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.ser.jdk.JDKTypeSerializationTest]
+   source: MethodSource [className = 'com.fasterxml.jackson.databind.ser.jdk.JDKTypeSerializationTest', methodName = 'testInetAddress', methodParameterTypes = '']
+   caught: java.net.UnknownHostException: google.com: Temporary failure in name resolution
+             	at java.base/java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method)
+             	at java.base/java.net.Inet6AddressImpl.lookupAllHostAddr(Inet6AddressImpl.java:52)
+             	at java.base/java.net.InetAddress$PlatformResolver.lookupByName(InetAddress.java:1134)
+             	at java.base/java.net.InetAddress.getAddressesFromNameService(InetAddress.java:1712)
+             	at java.base/java.net.InetAddress$NameServiceAddresses.get(InetAddress.java:1060)
+             	at java.base/java.net.InetAddress.getAllByName0(InetAddress.java:1702)
+             	at java.base/java.net.InetAddress.getAllByName(InetAddress.java:1582)
+             	at java.base/java.net.InetAddress.getByName(InetAddress.java:1492)
+             	at com.fasterxml.jackson.databind.ser.jdk.JDKTypeSerializationTest.testInetAddress(JDKTypeSerializationTest.java:111)
+             	at java.base/java.lang.reflect.Method.invoke(Method.java:565)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+ duration: 11 ms
+   status: ✘ FAILED
+
+diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/JDKTypeSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/JDKTypeSerializationTest.java
+index c41228d..3907623 100644
+--- a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/JDKTypeSerializationTest.java
++++ b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/JDKTypeSerializationTest.java
+@@ -10,6 +10,7 @@ import java.util.*;
+ import java.util.regex.Pattern;
+ 
+ import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
+ 
+ import com.fasterxml.jackson.annotation.JsonFormat;
+ 
+@@ -104,7 +105,7 @@ public class JDKTypeSerializationTest
+         assertEquals(q(""), MAPPER.writeValueAsString(Locale.ROOT));
+     }
+ 
+-    @Test
++    @Test @Disabled
+     public void testInetAddress() throws IOException
+     {
+         assertEquals(q("127.0.0.1"), MAPPER.writeValueAsString(InetAddress.getByName("127.0.0.1")));
diff --git a/dev-java/jackson-databind/files/jackson-databind-2.20.0-NoClassDefFoundWorkaroundTest.patch b/dev-java/jackson-databind/files/jackson-databind-2.20.0-NoClassDefFoundWorkaroundTest.patch
new file mode 100644
index 000000000000..154bd5ddeb5b
--- /dev/null
+++ b/dev-java/jackson-databind/files/jackson-databind-2.20.0-NoClassDefFoundWorkaroundTest.patch
@@ -0,0 +1,60 @@
+testClassIsMissing()
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest]/[method:testClassIsMissing()]
+   parent: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest]
+   source: MethodSource [className = 'com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest', methodName = 'testClassIsMissing', methodParameterTypes = '']
+   caught: org.opentest4j.AssertionFailedError: Should not have found javax.measure.Measure
+             	at org.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:38)
+             	at org.junit.jupiter.api.Assertions.fail(Assertions.java:138)
+             	at com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest.testClassIsMissing(NoClassDefFoundWorkaroundTest.java:29)
+             	at java.base/java.lang.reflect.Method.invoke(Method.java:565)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+ duration: 19 ms
+   status: ✘ FAILED
+testUseMissingClass()
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest]/[method:testUseMissingClass()]
+   parent: [engine:junit-jupiter]/[class:com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest]
+   source: MethodSource [className = 'com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest', methodName = 'testUseMissingClass', methodParameterTypes = '']
+   caught: org.opentest4j.AssertionFailedError: cannot instantiate a missing class ==> expected: <true> but was: <false>
+             	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
+             	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
+             	at org.junit.jupiter.api.AssertTrue.failNotTrue(AssertTrue.java:63)
+             	at org.junit.jupiter.api.AssertTrue.assertTrue(AssertTrue.java:36)
+             	at org.junit.jupiter.api.Assertions.assertTrue(Assertions.java:214)
+             	at com.fasterxml.jackson.databind.introspect.NoClassDefFoundWorkaroundTest.testUseMissingClass(NoClassDefFoundWorkaroundTest.java:53)
+             	at java.base/java.lang.reflect.Method.invoke(Method.java:565)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+             	at java.base/java.util.ArrayList.forEach(ArrayList.java:1604)
+ duration: 5 ms
+   status: ✘ FAILED
+
+--- a/src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java
++++ b/src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java
+@@ -4,6 +4,7 @@ import java.util.List;
+ 
+ import javax.measure.Measure;
+ import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
+ 
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+@@ -21,7 +22,7 @@ public class NoClassDefFoundWorkaroundTest extends DatabindTestUtil
+         public Measure<?> measure;
+     }
+ 
+-    @Test
++    @Test @Disabled
+     public void testClassIsMissing()
+     {
+         try {
+@@ -40,7 +41,7 @@ public class NoClassDefFoundWorkaroundTest extends DatabindTestUtil
+         assertNotNull(result);
+     }
+ 
+-    @Test
++    @Test @Disabled
+     public void testUseMissingClass() throws Exception
+     {
+         boolean missing = false;
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1-r1.ebuild
index 8e6624f019b3..7e42b056aad8 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-databind"
 SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 # Common dependencies
@@ -27,8 +27,8 @@ KEYWORDS="amd64 arm64 ppc64"
 # com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0
 
 CP_DEPEND="
-	~dev-java/jackson-annotations-2.13.4:2
-	~dev-java/jackson-core-2.13.4:0
+	~dev-java/jackson-annotations-2.13.4:1
+	~dev-java/jackson-core-2.13.4:1
 "
 
 # Compile dependencies
diff --git a/dev-java/jackson-databind/jackson-databind-2.20.0.ebuild b/dev-java/jackson-databind/jackson-databind-2.20.0.ebuild
new file mode 100644
index 000000000000..fbc174314608
--- /dev/null
+++ b/dev-java/jackson-databind/jackson-databind-2.20.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+JMV="0.9.1"
+DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
+HOMEPAGE="https://github.com/FasterXML/jackson-databind"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz
+	test? ( https://repo1.maven.org/maven2/javax/measure/jsr-275/${JMV}/jsr-275-${JMV}.jar )"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-$(ver_cut 1-2):0
+	~dev-java/jackson-core-${PV}:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	|| ( virtual/jdk:25 virtual/jdk:21 virtual/jdk:17 virtual/jdk:11 )
+	test? (
+		>=dev-java/asm-9.8-r1:0
+		>=dev-java/assertj-core-3.27.6:0
+		dev-java/fastdoubleparser:0
+		>=dev-java/guava-testlib-33.5.0:0
+		>=dev-java/jol-core-0.17:0
+		dev-java/junit:5[suite]
+		>=dev-java/mockito-5.20.0:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
+PATCHES=(
+	"${FILESDIR}/jackson-databind-2.20.0-NoClassDefFoundWorkaroundTest.patch"
+	"${FILESDIR}/jackson-databind-2.20.0-JDKStringLikeTypeDeserTest.patch" 
+	"${FILESDIR}/jackson-databind-2.20.0-JDKTypeSerializationTest.patch"
+)
+
+JAVA_GENTOO_CLASSPATH_EXTRA=( "${DISTDIR}/jsr-275-${JMV}.jar" )
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.databind"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS=( -Djdk.attach.allowAttachSelf -Djol.magicFieldOffset=true )
+JAVA_TEST_GENTOO_CLASSPATH="asm assertj-core fastdoubleparser guava-testlib jol-core mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default # bug #780585
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.{lang,util}=ALL-UNNAMED )
+	fi
+}
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index e8a729e86a91..e74a8a2afb71 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1 +1,2 @@
 DIST jackson-dataformat-xml-2.13.4.tar.gz 3203115 BLAKE2B c959c878c6905de9fee73fab87381296d30146ab755765e715f49f141ea80d3843116752710e78f270c96abb0a2dd784fff01769ce68c126b3c7bd5acbe1a880 SHA512 8b6c76d8b324ceffece806f2de1352e2b2b557d64f51885bec8e60033c254e9c5a9adad29c07b6a5aaa77d535245ad581f67768a62af7a44160221aae62115e6
+DIST jackson-dataformat-xml-2.20.0.tar.gz 205292 BLAKE2B d98a62ca554c2803c62f48f682eb784b4bb8371312b6b10f1266b242e85b2e4028a47d79c384b9f62e0c854a17b3b0de015b8c64939e5df21dfec62b3f95842e SHA512 8d3f726153143848fbb2054b9484ab252eb027b0c253a805486cd28217bacdc83a9b0014849b1e371d5f0a4b9be7316832501ed8a2e6e92d1aca7238ff2570d2
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r2.ebuild
index bbbf48a2f339..345fc414bd06 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
 SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 # Common dependencies
@@ -29,9 +29,9 @@ KEYWORDS="amd64 arm64 ppc64"
 # org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
 
 CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.1:0
+	~dev-java/jackson-annotations-${PV}:1
+	~dev-java/jackson-core-${PV}:1
+	~dev-java/jackson-databind-${PV}.1:1
 	>=dev-java/stax2-api-4.2.1-r1:0
 	dev-java/woodstox-core:0
 "
@@ -47,7 +47,7 @@ DEPEND="
 	>=virtual/jdk-11:*
 	${CP_DEPEND}
 	test? (
-		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
+		~dev-java/jackson-module-jakarta-xmlbind-${PV}:1
 		dev-java/jaxb-api:4
 		dev-java/sjsxp:0
 	)
@@ -64,7 +64,7 @@ S="${WORKDIR}/${PN}-${P}"
 JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
 JAVA_RESOURCE_DIRS="src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4"
+JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind-1,sjsxp,jaxb-api-4,junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.20.0.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.20.0.ebuild
new file mode 100644
index 000000000000..b793daa005e5
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.20.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Data format extension for Jackson"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-$(ver_cut 1-2):0
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	>=dev-java/stax2-api-4.2.1-r1:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/fastdoubleparser:0
+		>=dev-java/hamcrest-3.0:0
+		~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
+		dev-java/junit:4
+		dev-java/sjsxp:0
+		>=dev-java/woodstox-core-7.1.0:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.dataformat.xml"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	fastdoubleparser
+	hamcrest
+	jackson-module-jakarta-xmlbind
+	junit-4
+	junit-5
+	sjsxp
+	woodstox-core
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+}
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 3788f2029f74..d736adc6528a 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1 +1,2 @@
 DIST jackson-dataformats-text-2.13.4.tar.gz 3530892 BLAKE2B 3cbfcbbd33aeac67476caa453b77c19a1da88a9fb9482360bf427af3f41d689a04fc1ecb28d4424c5bfd7436979f1b03c215ca88a0064338f53dfd169f288562 SHA512 792f416c7cabd639b42bd93205e55328ace53c093e59d57eeaedc27a61358527515031c70dd503702471a13237f6389ca118e453da0ab002e20a531885d58a11
+DIST jackson-dataformats-text-2.20.0.tar.gz 4733336 BLAKE2B 1bc69498e41bebe85b8df257410cc83100464772717df6180d4cecb6a29e1d82804e231a5257115a09bd50f9c83c57733f663323f9e0bc093cfadbde80bc554c SHA512 64e220406fff60f336712b05e6611fed6a34ca9b87c7989f6ed88232e71b5c80b70373e94066161ef1857b411ddc0089325d43ec45df2a11cbb72997218871d8
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r2.ebuild
index a63f1c452946..2334ecd8b4c1 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,13 +17,13 @@ HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
 SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.1:0
-	dev-java/snakeyaml:0
+	~dev-java/jackson-core-${PV}:1
+	~dev-java/jackson-databind-${PV}.1:1
+	dev-java/snakeyaml:1
 	>=virtual/jdk-11:*
 "
 
@@ -33,7 +33,7 @@ DOCS=( README.md release-notes/{CREDITS,VERSION} )
 
 S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
 
-JAVA_CLASSPATH_EXTRA="jackson-core,jackson-databind,snakeyaml"
+JAVA_CLASSPATH_EXTRA="jackson-core-1,jackson-databind-1,snakeyaml-1"
 JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
 JAVA_RESOURCE_DIRS="src/main/resources"
 
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.20.0.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.20.0.ebuild
new file mode 100644
index 000000000000..2ed940660946
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
+HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
+SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
+S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-java/jackson-annotations-$(ver_cut 1-2):0
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	>=dev-java/snakeyaml-2.5:0
+	>=virtual/jdk-11:*
+	test? ( dev-java/fastdoubleparser:0 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( README.md release-notes/{CREDITS,VERSION} )
+JAVA_CLASSPATH_EXTRA="jackson-annotations jackson-core jackson-databind snakeyaml"
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.dataformat.yaml"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="fastdoubleparser junit-5"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
+		-e "s:@projectartifactid@:${PN}:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 9066121ef023..e914f586926e 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1 +1,2 @@
 DIST jackson-module-jakarta-xmlbind-2.13.4.tar.gz 2146134 BLAKE2B ae20a115464a052a8403172706025fc595d6e6aeafda60cf3cce784e1e0a29f38d672fb5205e9dbd74de1ef9615f3bfd0268711d9992c123cac0ef692e59be3a SHA512 0706566a9e5e68697d54319a425fde53948ad610a6eb9519d2e02d375ea280468c7e9e3d5ff4378535ed3a71480f207257a558f73819b1b81edc69f9d3c317a8
+DIST jackson-module-jakarta-xmlbind-2.20.0.tar.gz 2452067 BLAKE2B 8b4afe565792b811aef327288ba9bd7edcf3c82d4af0520146b26d375668e1a837127d0f02a99f7d86ec07ca4ce600b7baa2e435b00bf99e626306d4bd67f8ce SHA512 eaab6aafa1a740f46af50a20f05311b3da34cb40579db5bf682573ad91b1c966fdc4b4166cfacc32b0d3373ea7ea1267f7c7d3b341c0865699a780d854022661
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r2.ebuild
index ad03a7d154b7..51dd84d7089c 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
 SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 # Common dependencies
@@ -29,9 +29,9 @@ KEYWORDS="amd64 arm64 ppc64"
 # jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
 
 CP_DEPEND="
-	~dev-java/jackson-annotations-${PV}:2
-	~dev-java/jackson-core-${PV}:0
-	~dev-java/jackson-databind-${PV}.1:0
+	~dev-java/jackson-annotations-${PV}:1
+	~dev-java/jackson-core-${PV}:1
+	~dev-java/jackson-databind-${PV}.1:1
 	dev-java/jakarta-activation:1
 	dev-java/jaxb-api:4
 "
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.20.0.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.20.0.ebuild
new file mode 100644
index 000000000000..9702c9ad8c20
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.20.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
+HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
+SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	~dev-java/jackson-annotations-$(ver_cut 1-2):0
+	~dev-java/jackson-core-${PV}:0
+	~dev-java/jackson-databind-${PV}:0
+	>=dev-java/jaxb-api-4.0.2:4
+	>=dev-java/jakarta-activation-2.0.1-r1:2
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/jaxb-runtime-4.0.0-r1:4
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_INTERMEDIATE_JAR_NAME="com.fasterxml.jackson.module.jakarta.xmlbind"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4 junit-5"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
+		-e "s:@projectversion@:${PV}:g" \
+		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
+		-e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
+		"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
+		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
+}
diff --git a/dev-java/jcommander/jcommander-1.82.ebuild b/dev-java/jcommander/jcommander-1.82-r1.ebuild
index 0f13c5ff3e27..664b5ca6b26f 100644
--- a/dev-java/jcommander/jcommander-1.82.ebuild
+++ b/dev-java/jcommander/jcommander-1.82-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
-	test? ( dev-java/jackson-annotations:2 )
+	test? ( dev-java/jackson-annotations:1 )
 "
 RDEPEND="
 	>=virtual/jre-1.8:*
@@ -40,7 +40,7 @@ JAVA_SRC_DIR="src/main/java"
 # Needs "java-util-2-runner-args.patch" from https://github.com/gentoo/gentoo/pull/21319#issuecomment-878128343
 JAVA_TEST_RUNNER_EXTRA_ARGS=( -verbose 3 -usedefaultlisteners true )
 
-JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-2,testng"
+JAVA_TEST_GENTOO_CLASSPATH="jackson-annotations-1,testng"
 JAVA_TEST_EXTRA_ARGS=( -Djava.io.tmpdir="${T}" )
 JAVA_TEST_SRC_DIR=( src/test/java )
 JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/json-path/json-path-2.9.0.ebuild b/dev-java/json-path/json-path-2.9.0-r1.ebuild
index eae3051cc66e..8a9a95006b30 100644
--- a/dev-java/json-path/json-path-2.9.0.ebuild
+++ b/dev-java/json-path/json-path-2.9.0-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64"
 CP_DEPEND="
 	dev-java/tapestry-json:0
 	dev-java/gson:0
-	dev-java/jackson-databind:0
+	dev-java/jackson-databind:1
 	dev-java/jettison:0
 	dev-java/json:0
 	dev-java/jsonb-api:0
diff --git a/dev-java/junit-pioneer/junit-pioneer-1.9.1.ebuild b/dev-java/junit-pioneer/junit-pioneer-1.9.1-r1.ebuild
index 26581990ea26..d672368a5138 100644
--- a/dev-java/junit-pioneer/junit-pioneer-1.9.1.ebuild
+++ b/dev-java/junit-pioneer/junit-pioneer-1.9.1-r1.ebuild
@@ -18,13 +18,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	dev-java/jackson-databind:0
+	dev-java/jackson-databind:1
 	dev-java/junit:5
 	>=virtual/jdk-11:*
 "
 
 RDEPEND=">=virtual/jre-1.8:*"
 
-JAVA_CLASSPATH_EXTRA="jackson-databind junit-5"
+JAVA_CLASSPATH_EXTRA="jackson-databind-1 junit-5"
 JAVA_RESOURCE_DIRS="src/main/resources"
 JAVA_SRC_DIR=( src/main/{java,module} )
diff --git a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild
index c3bca3cfeaf1..e6e5076d8a37 100644
--- a/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.19.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -45,10 +45,10 @@ CP_DEPEND="
 	dev-java/commons-compress:0
 	dev-java/commons-csv:0
 	dev-java/conversant-disruptor:0
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
-	dev-java/jackson-dataformat-xml:0
-	dev-java/jackson-dataformat-yaml:0
+	dev-java/jackson-core:1
+	dev-java/jackson-databind:1
+	dev-java/jackson-dataformat-xml:1
+	dev-java/jackson-dataformat-yaml:1
 	dev-java/jansi:2
 	dev-java/javax-mail:0
 	>=dev-java/jctools-core-4.0.3-r1:0
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6e4f2dba1ebf..24c00594a273 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1 +1,2 @@
 DIST protobuf-32.1.tar.gz 9676391 BLAKE2B f6c1faa260ecb57c0a1a5d4be7d56e431cac9e325a02b86d9eecd0318a0964618063db218a4720fcb1121614016f112ba00880a5b743a5c34f19f79ea4420735 SHA512 e7f8fe01912ba30cc7ce101beac1cfbd089bcb57b159a57d4d90cabd1b29d978ad322f0607e1b955617f035a6b68d4e7bc940fa4afa67d255a21f513a2c62172
+DIST protobuf-33.0.tar.gz 6872665 BLAKE2B 5d456c000117b590dea5b7e721a8b8d00d9e7067ba2156f082e4959a17fcf8d4f2e306f90335aad97e1a94dfd2491544d67cb29670f0022034fde574140a8066 SHA512 2956270a81631895ab6ed8c3c2a22b353a461b0827ee17a1c569b24374307a8e2525a06db6728140bff759a40e47a1d2a291cfb34293b364fe279f10468f3cb9
diff --git a/dev-java/protobuf-java/protobuf-java-4.32.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.32.1-r1.ebuild
index 055b5380cf1a..e529591e7bb2 100644
--- a/dev-java/protobuf-java/protobuf-java-4.32.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.32.1-r1.ebuild
@@ -32,8 +32,8 @@ DEPEND="
 	test? (
 		>=dev-java/guava-33.4.8:0
 		dev-java/mockito:4
-		dev-java/snakeyaml:0
-		dev-java/testparameterinjector:0
+		dev-java/snakeyaml:1
+		~dev-java/testparameterinjector-1.18:0
 		dev-java/truth:0
 	)
 "
@@ -44,7 +44,7 @@ JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
 JAVA_JAR_FILENAME="protobuf.jar"
 JAVA_RESOURCE_DIRS="java/core/src/main/resources"
 JAVA_SRC_DIR="java/core/src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4,snakeyaml"
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4,snakeyaml-1"
 JAVA_TEST_RESOURCE_DIRS="java/core/src/main/resources"
 JAVA_TEST_SRC_DIR="java/core/src/test/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-4.33.0.ebuild b/dev-java/protobuf-java/protobuf-java-4.33.0.ebuild
new file mode 100644
index 000000000000..649b45a2ab61
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-4.33.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
+
+inherit cmake java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+MY_PV4="${PV#4.}"
+MY_PV="${MY_PV4/_rc/-rc}"
+MY_P="protobuf-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="system-protoc"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
+	!system-protoc? ( >=dev-cpp/abseil-cpp-20250512.1:= )
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/guava-33.5.0:0
+		dev-java/mockito:4
+		>=dev-java/snakeyaml-2.5:0
+		>=dev-java/testparameterinjector-1.19:0
+		dev-java/truth:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4,snakeyaml"
+JAVA_TEST_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+	if use system-protoc; then
+		protoc "$1"
+	else
+		"${BUILD_DIR}/protoc" "$1"
+	fi
+}
+
+src_prepare() {
+	# If the corrsponding version of system-protoc is not available we build protoc locally
+	if ! use system-protoc; then
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	# ${S}/java/core/generate-sources-build.xml
+	einfo "Replace variables in generate-sources-build.xml"
+	sed \
+		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
+		-e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+	# ${S}/java/core/generate-test-sources-build.xml
+	einfo "Replace variables in generate-test-sources-build.xml"
+	sed \
+		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Split the file in two parts, one for each run-protoc call
+	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+		java/core/generate-test-sources-build.xml || die
+
+	# We add some *.proto files to the 'test-sources-build-1' file which
+	# are needed to avoid compilation errors on related test classes.
+	cat <<-EOF >> test-sources-build-1 || die "append test-sources-build-1"
+		src/google/protobuf/edition_unittest.proto
+		src/google/protobuf/unittest_delimited.proto
+		src/google/protobuf/unittest_delimited_import.proto
+		src/google/protobuf/unittest_import_option.proto
+		java/core/src/test/proto/com/google/protobuf/large_open_enum.proto
+		java/core/src/test/proto/com/google/protobuf/generator_names_edition2024_defaults.proto
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_BUILD_TESTS=OFF
+		-Dprotobuf_LOCAL_DEPENDENCIES_ONLY=ON
+	)
+	if ! use system-protoc; then
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if ! use system-protoc; then
+		cmake_src_compile
+	fi
+
+	einfo "Run protoc to generate sources"
+	run-protoc @java/core/generate-sources-build.xml \
+		|| die "protoc sources failed"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	# Note: Annotation processing is enabled because one or more processors were found
+	#   on the class path. A future release of javac may disable annotation processing
+	#   unless at least one processor is specified by name (-processor), or a search
+	#   path is specified (--processor-path, --processor-module-path), or annotation
+	#   processing is enabled explicitly (-proc:only, -proc:full).
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only testparameterinjector,truth)"
+
+	# java/core/src/test/java/com/google/protobuf/GeneratorNamesTest.java:33: error: cannot find symbol
+	#               GeneratorNamesPre2024Defaults.getDescriptor(), GeneratorNamesPre2024Defaults.class),
+	#                                                              ^
+	#   symbol:   class GeneratorNamesPre2024Defaults
+	#   location: class FileClassProvider
+	rm java/core/src/test/java/com/google/protobuf/GeneratorNamesTest.java || die "remove test"
+
+	einfo "Running protoc on first part of generate-test-sources-build.xml"
+	# java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto:15:1:
+	# Import "google/protobuf/java_features.proto" was not found or had errors.
+	cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
+	run-protoc @test-sources-build-1 \
+		|| die "run-protoc test-sources-build-1 failed"
+
+	einfo "Running protoc on second part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-2 \
+		|| die "run-protoc test-sources-build-2 failed"
+
+	einfo "Running tests"
+	# Invalid test class 'map_test.MapInitializationOrderTest':
+	# 1. Test class should have exactly one public constructor
+	# Invalid test class 'proto2_unittest.CachedFieldSizeTest':
+	# 1. Test class should have exactly one public constructor
+	local JAVA_TEST_RUN_ONLY=$(find "${JAVA_TEST_SRC_DIR}" \
+		-path "**/*Test.java" \
+		! -path "**/Abstract*Test.java" \
+		! -name "MapInitializationOrderTest.java" \
+		! -name 'CachedFieldSizeTest.java' -printf "%P\n")
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index c2603d2f156f..ff332e3e2309 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1 +1,3 @@
+DIST lombok-1.18.30.jar 2011339 BLAKE2B 052f0eff4f3c4d3669e7c7f9d62a26d76733a079c995f5a62234112b6e7cd4bb1f9ed0b3655c588323aceda7acdae7bd5dcc62d1f411e5417f83e5c74cbdad02 SHA512 432978b662744078f86e2e808c692744be31a49ce5bd1ff9188158b1ed262da0b25adf5a5eff23cf6bce1f98df12e424e6e14e6ed34bc22e00b4cb9c8f743135
 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
+DIST snakeyaml-2.5.tar.gz 429266 BLAKE2B 80058ef17d91afe3921c481da0f89dc939c17f08ee8ab07672c36a4d6f6b2d47d8e342fe4fc8da8acd77589d5a45f733425bc7ec84ecc1b5e68a43459c1af33f SHA512 ecaaf94a17f67f10e57cee7441f93a75ebfc511229707bdfdd524964e0843f480d4fb28d489b3f14a09c9566eb9bfa10945267249d8494968ac89ce23f9b3546
diff --git a/dev-java/snakeyaml/files/snakeyaml-2.5-skipFailingTests.patch b/dev-java/snakeyaml/files/snakeyaml-2.5-skipFailingTests.patch
new file mode 100644
index 000000000000..6ababfd78a12
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-2.5-skipFailingTests.patch
@@ -0,0 +1,42 @@
+There were 2 failures:
+1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
+java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
+	at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:445)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:592)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525)
+	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.inspector.TagInspector
+	at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:445)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:592)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525)
+	at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
+
+FAILURES!!!
+Tests run: 3,  Failures: 2
+
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
+@@ -30,6 +30,7 @@ import java.util.Properties;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.yaml.snakeyaml.LoaderOptions;
+ import org.yaml.snakeyaml.Yaml;
+ import org.yaml.snakeyaml.inspector.TagInspector;
+@@ -122,12 +123,12 @@ public class ContextClassLoaderTest {
+     yamlCL.loadClass(DomainBean.class.getName());
+   }
+ 
+-  @Test
++  @Test @Ignore
+   public void yamlClassInYAMLCL() throws ClassNotFoundException {
+     yamlCL.loadClass(Yaml.class.getName());
+   }
+ 
+-  @Test
++  @Test @Ignore
+   public void domainInDifferentConstructor() throws ClassNotFoundException, InstantiationException,
+       IllegalAccessException, NoSuchMethodException, SecurityException, IllegalArgumentException,
+       InvocationTargetException {
diff --git a/dev-java/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33-r1.ebuild
index a5d4b02db176..9cd2bcce0e15 100644
--- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml"
 SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="amd64 arm64 ppc64"
 
 # Compile dependencies
diff --git a/dev-java/snakeyaml/snakeyaml-2.5.ebuild b/dev-java/snakeyaml/snakeyaml-2.5.ebuild
new file mode 100644
index 000000000000..b3ea542ec7d3
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-2.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+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"
+LV="1.18.30"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz
+	test? ( https://repo.maven.apache.org/maven2/org/projectlombok/lombok/${LV}/lombok-${LV}.jar )"
+S="${WORKDIR}/snakeyaml-snakeyaml-225cf7b0166c"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/jackson-core-2.20.0:0
+		>=dev-java/jackson-databind-2.20.0:0
+		>=dev-java/jackson-dataformat-yaml-2.20.0:0
+		>=dev-java/jmh-core-1.37:0
+		>=dev-java/velocity-2.4.1:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}/snakeyaml-2.5-skipFailingTests.patch" )
+
+JAVA_INTERMEDIATE_JAR_NAME="org.yaml.snakeyaml"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/main/java9" )
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	jackson-core
+	jackson-databind
+	jackson-dataformat-yaml
+	jmh-core
+	junit-4
+	velocity
+"
+
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# JSR-310
+	# Since Java 8, the Joda-Time library has been integrated into the JDK as a new package 'java.time'.
+	rm -r src/test/java/examples/jodatime || die "jodatime"
+}
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 25; then
+		einfo "Removing 2 Tests which on Java 25 won't even compile"
+		rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java || die "rm EnvLombokTest"
+		rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die "rm Yaml...ContextTest"
+		rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die "rm ApplicationProperties.java"
+	else
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/lombok-${LV}.jar"	# Presently not packaged
+	fi
+
+	local JAVA_TEST_RUN_ONLY=$(find src/test/java -name '*Test.java' \
+		! -name 'AbstractTest.java' \
+		! -name 'PyImportTest.java' -printf "%P\n")
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/testng/testng-6.11-r1.ebuild b/dev-java/testng/testng-6.11-r3.ebuild
index 40d44ef075f7..9b69765b7e7a 100644
--- a/dev-java/testng/testng-6.11-r1.ebuild
+++ b/dev-java/testng/testng-6.11-r3.ebuild
@@ -37,7 +37,7 @@ CP_DEPEND="
 	dev-java/guice:4
 	dev-java/jcommander:1.64
 	dev-java/junit:4
-	dev-java/snakeyaml:0
+	dev-java/snakeyaml:1
 "
 
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/testng/testng-6.11-r2.ebuild b/dev-java/testng/testng-6.11-r4.ebuild
index 7825193871c6..1940f7aa0b83 100644
--- a/dev-java/testng/testng-6.11-r2.ebuild
+++ b/dev-java/testng/testng-6.11-r4.ebuild
@@ -39,7 +39,7 @@ CP_DEPEND="
 	>=dev-java/guice-7.0.0:0
 	dev-java/jcommander:1.64
 	dev-java/junit:4
-	~dev-java/snakeyaml-1.33:0
+	~dev-java/snakeyaml-1.33:1
 "
 
 DEPEND="${CP_DEPEND}
diff --git a/dev-java/testparameterinjector/Manifest b/dev-java/testparameterinjector/Manifest
index e71e16f7aa01..810a9e0228c3 100644
--- a/dev-java/testparameterinjector/Manifest
+++ b/dev-java/testparameterinjector/Manifest
@@ -1 +1,2 @@
 DIST testparameterinjector-1.18.tar.gz 112051 BLAKE2B a1eead83d484c82992262cb0232464df54c94c4266a534fde0faa208db2f0d81fccc16d12f97ea27687eebc5889495ab33b4de8768839ee5c747619378ab1f15 SHA512 3cc620286d89cb5e6fb039d832b8c23c2d163f69f707811075ff26679601e54ea34f396516e40f2d392f11493363ea53b72c861329d6c3e79d869ff700b2dc35
+DIST testparameterinjector-1.19.tar.gz 116236 BLAKE2B d4e4f9ce948e25d182f0b6ea0c5dfa9f5bc3356627ab982b9a6447184c9663121e45a804d1cd03dbe72bf38efa84bc5b5e92e0b78b4c65773d66f63879a0176c SHA512 ebe81ce38f78f4cef768c432d07b27e1c8c2fb84c20d53f2c702e27e30a825d7817d4a11bbe90538224219e640b1659ff1937e65b55949da5c0c161b787014dd
diff --git a/dev-java/testparameterinjector/testparameterinjector-1.18.ebuild b/dev-java/testparameterinjector/testparameterinjector-1.18-r1.ebuild
index e41248d74e05..88f7a14b570d 100644
--- a/dev-java/testparameterinjector/testparameterinjector-1.18.ebuild
+++ b/dev-java/testparameterinjector/testparameterinjector-1.18-r1.ebuild
@@ -22,7 +22,7 @@ CP_DEPEND="
 	>=dev-java/guava-33.4.8:0
 	dev-java/jsr305:0
 	dev-java/junit:4
-	dev-java/snakeyaml:0
+	dev-java/snakeyaml:1
 "
 
 DEPEND="
@@ -32,7 +32,7 @@ DEPEND="
 	dev-java/incap:0
 	dev-java/javapoet:0
 	test? (
-		>=dev-java/protobuf-java-4.30.2:0
+		~dev-java/protobuf-java-4.32.1:0
 		dev-java/truth:0
 	)
 "
@@ -42,7 +42,7 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-JAVA_CLASSPATH_EXTRA="jsr305,junit-4,snakeyaml"
+JAVA_CLASSPATH_EXTRA="jsr305,junit-4,snakeyaml-1"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,protobuf-java,truth"
 JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/testparameterinjector/testparameterinjector-1.19.ebuild b/dev-java/testparameterinjector/testparameterinjector-1.19.ebuild
new file mode 100644
index 000000000000..b123cd252868
--- /dev/null
+++ b/dev-java/testparameterinjector/testparameterinjector-1.19.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="TestParameterInjector For JUnit4"
+HOMEPAGE="https://github.com/google/testparameterinjector"
+SRC_URI="https://github.com/google/TestParameterInjector/archive//v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/TestParameterInjector-${PV}/junit4"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/auto-value:0
+	>=dev-java/guava-33.5.0:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+	>=dev-java/snakeyaml-2.5:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/escapevelocity:0
+	dev-java/incap:0
+	dev-java/javapoet:0
+	test? (
+		>=dev-java/protobuf-java-4.33.0:0
+		dev-java/truth:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="jsr305,junit-4,snakeyaml"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,protobuf-java,truth"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	# get processorpath
+	local pp="$(java-pkg_getjar auto-value auto-value.jar)"
+	pp="${pp}:$(java-pkg_getjar auto-value auto-common.jar)"
+	pp="${pp}:$(java-pkg_getjars --build-only escapevelocity,guava,incap,javapoet)"
+
+	JAVAC_ARGS="-processorpath ${pp} -s src/main/java -parameters"
+
+	java-pkg-simple_src_compile
+}