Adding metadata

16 files changed, 388 insertions, 103 deletions

diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 41958b701e76..1b9b573d75ab 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,5 +1,3 @@
 DIST commons-beanutils-1.11.0-src.tar.gz 403183 BLAKE2B 3823f9ff060d182485cd7cae54999ae5d076d3cff0eec5f5ae87d66cfc960f9224cf17940023991b7e599a826796d572dd476681ced2a46accbeb209ff723f13 SHA512 edd930e7f8118d0cceb8647666fe1d5f873f939f858f433cd19985a75c4575455f2a2d339e4bcbf08b3f586c785a60429d4bb33ff6239da8f2c6183c8c318f18
 DIST commons-beanutils-1.11.0-src.tar.gz.asc 488 BLAKE2B 57401bf829ff9badc9ace98c8b3e36e65d2a649b4eb07a314426bd7b5b566965c9b5122a976be78e665f203af67d732fa401b1f417a4b0a349a0071f5cdc26e1 SHA512 f40927ad294f0280460aef5c53fd4a29357e59238a7f407013b9f67c333aa0752bde709f2fedc802f8140175bc3eedc446d8ad68d184643e6bf643aeff42f319
-DIST commons-beanutils-1.9.4-src.tar.gz 412606 BLAKE2B 213a2ad4d976ed4c55c9a73c0970a656e2f03efcba886369c8be164e04618937ad636ce7ffa6aa7b981e9595b24e4cbacc2bc632268bbfede8172091ef6eb4ff SHA512 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73
-DIST commons-beanutils-1.9.4-src.tar.gz.asc 833 BLAKE2B c971231cfb034bd9bbbd6e7801a4fcb54853c0d18872cfae81ce761fc8f71ebb70955456827ad33b4abd4df8c9820031fd49f28c50eddef5251b2a0d1b01cff9 SHA512 2a966959b2c94bf013df71885c2906a092b43a0ac6d63963f1462e7c09376964bb948c0681278a58fffae6716d042dc846b1649e1f4b0816e2adb3733bf14451
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
deleted file mode 100644
index bbced5733489..000000000000
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
-HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
-# We need some test classes of commons-collections which are not part of the jar file.
-ACC="commons-collections-3.2.2"
-SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz
-	test? ( https://archive.apache.org/dist/commons/collections/source/${ACC}-src.tar.gz )
-	verify-sig? ( https://downloads.apache.org/commons/beanutils/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-CP_DEPEND="
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt )
-
-JAVA_ENCODING="iso-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4 "
-JAVA_TEST_SRC_DIR=(
-	src/test/java
-	../"${ACC}"-src/src/test
-)
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_test() {
-	export LC_ALL="en_US.UTF-8"
-	# Apply patch to unpacked commons-collections
-	pushd "../${ACC}-src" >> /dev/null || die
-		eapply "${FILESDIR}/${ACC}-fixes.patch"
-	popd
-
-	pushd src/test/java || die
-		# Selection according to lines 375-383 pom.xml
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*TestCase.java" \
-			! -path "**/*MemoryTestCase.java" \
-			! -path "**/*MemoryLeakTestCase.java" \
-			! -path "**/*LocaleBeanificationTestCase.java" \
-			! -path "**/Jira347TestCase.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-
-	# We skip 2 more test classes conditionally which have failures with Java 21
-	# Error converting 'String' to 'java.sql.Time' using pattern 'h:mm a'
-	# Error converting 'String' to 'java.sql.Timestamp' using pattern 'M/d/yy, h:mm a'
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "21"; then
-		JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.commons.beanutils.converters.SqlTimeConverterTestCase}
-		JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.commons.beanutils.converters.SqlTimestampConverterTestCase}
-	fi
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 66ce6a8cfb20..fe3e5d91af86 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,2 +1,4 @@
 DIST commons-cli-1.10.0-src.tar.gz 222015 BLAKE2B 963c9c246571dc14b126b2605972cad73752e505ea51b2387d6f24c3c60d980688382c378da20617e5b2a267123f7c6c0a132c1c3cd4712807329c248d3795f8 SHA512 245951919a88068f692fc4cab906cb210bbefd853d851167d5c34fd4aebab7370766458033c47cf8174d7a409c4364752770b573252d19746cbb9a0e2c8c255b
 DIST commons-cli-1.10.0-src.tar.gz.asc 488 BLAKE2B a4951bf94331014141b73c1c272b321b5b83a079f5133d5892edc8ccb8df542e857e333ecc890ba4de674c0a97b506ab68da851e673ba4da6dd5135449490d9b SHA512 430fab63278f4ecd025e7fcb51a0bdfe5e648bf69d98c2cd51c7bc83887ae57afdd0238a8a9d00dcb1999b9a021bfdbcad5ec694dd7ce0c9dc54278bb62134b3
+DIST commons-cli-1.11.0-src.tar.gz 302658 BLAKE2B 211305ad218e2a5639499200b7e9ca52eb9f91040a3697fdff0a6bd725c1ba4a95effd2544c3957d5482ccf94cff8c02f87ea3b2cf9399177878cc4a3f88519f SHA512 161b4efb628943c3292fc89325632147a4677f7f68bfb06d7d868fc8df07f1ec11623f812d69c3434938487af96e810ff3431ae1d384108d6847cad849160d9d
+DIST commons-cli-1.11.0-src.tar.gz.asc 488 BLAKE2B 7540bf5709e8ea808555e438f4f10ef7f9d04518ef31bd8f59ee37aa2c0f015855900caf05abce3658adcfe92d7544a92a4b9f45ea628513c1534d05c40a052f SHA512 542ec08f2be38a966789de8eb2fc5ec20f0ee2e6ea9af8f0ca495d3bb4ddd4f151a647d77eefcda9f3546fd45cea350b8ea2bca4b530265241268162da78cf2f
diff --git a/dev-java/commons-cli/commons-cli-1.11.0.ebuild b/dev-java/commons-cli/commons-cli-1.11.0.ebuild
new file mode 100644
index 000000000000..a7fab08be141
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2026 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"
+
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
+inherit java-pkg-2 java-pkg-simple junit5 verify-sig
+
+DESCRIPTION="A Java library for working with the command line arguments and options"
+HOMEPAGE="https://commons.apache.org/proper/commons-cli/"
+SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/cli/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+# [-vintage] because, if junit:5 compiled with 'USE=vintage':
+# Error: Module junit not found, required by org.junit.vintage.engine
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/commons-io-2.21.0:0
+		>=dev-java/commons-lang-3.19.0:0
+		>=dev-java/commons-text-1.14.0:0
+		dev-java/junit:5[-vintage]
+		>=dev-java/junit-pioneer-1.9.1-r1:0
+		>=dev-java/mockito-4.11.0:4
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="commons-io commons-lang commons-text junit-5 junit-pioneer mockito-4 opentest4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index dee74108f4a0..1126432ab7ab 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,3 +1,4 @@
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
 DIST commons-digester-2.1-src.tar.gz.asc 194 BLAKE2B d9f958c0aee8342b92e860fbb7a9f865b22d3ec0b368e4c7df311409d26295bf50e9ee0f595b47f72203df039681fa4c0822264444458bbc8fe1ae72dbac2968 SHA512 99907110f741feb4f36298e9cdc0c0224b98a211de47a2773de03dba6b11e1f80af779cca9e5307384af6078fc70a01e3b207487f97b57e10ffebf6d7da60033
 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
+DIST commons-digester-3.2.tar.gz.asc 195 BLAKE2B f071c9226f9633e5a78760a4f14b8a8fb7ef57ef0f01a50a101c801dc40a39673b8b6543ebf324e9194b56896796efb2b3cb35bda350daa57cd3b2371e7c0eb1 SHA512 674b018267c96cbe6793ccda9e9fe04798d5649469c4d6188edd3bb95eba646bc7390c4ff801692fc399309935f5884f040d7ba19caf9d1d1f6dfcc9a7f389e5
diff --git a/dev-java/commons-digester/commons-digester-3.2-r4.ebuild b/dev-java/commons-digester/commons-digester-3.2-r5.ebuild
index cce136b3888f..9da653e3a0cf 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r4.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r5.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-digester3:3.2"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="https://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz
+	verify-sig? ( mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}.tar.gz.asc )"
 S="${WORKDIR}/commons-digester3-${PV}-src"
 
 LICENSE="Apache-2.0"
@@ -23,10 +23,12 @@ KEYWORDS="amd64 ppc64"
 PROPERTIES="test_network"
 RESTRICT="test"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
 CP_DEPEND="
 	>=dev-java/cglib-3.3.0-r3:0
-	>=dev-java/commons-beanutils-1.9.4:1.7
-	>=dev-java/commons-logging-1.2:0
+	>=dev-java/commons-beanutils-1.11.0:0
+	>=dev-java/commons-logging-1.3.5:0
 "
 
 DEPEND="
@@ -45,19 +47,18 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 
 src_test() {
-	pushd src/test/java || die
-		# Exclusions according to 226,229 pom.xml
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*TestCase.java" \
-			! -name "Abstract*.java" \
-			! -name "TestBean.java" \
-			! -name "TestRule.java" \
-			! -name "TestRuleSet.java")
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
+	# Exclusions according to 226,229 pom.xml
+	local JAVA_TEST_RUN_ONLY=$(find src/test/java \
+		-name "*TestCase.java" \
+		! -name "Abstract*.java" \
+		! -name "TestBean.java" \
+		! -name "TestRule.java" \
+		! -name "TestRuleSet.java" -printf '%P\n')
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 
 	local vm_version="$(java-config -g PROVIDES_VERSION)"
 	if ver_test "${vm_version}" -ge "17" ; then
diff --git a/dev-java/commons-exec/Manifest b/dev-java/commons-exec/Manifest
new file mode 100644
index 000000000000..1705e7854aa5
--- /dev/null
+++ b/dev-java/commons-exec/Manifest
@@ -0,0 +1,2 @@
+DIST commons-exec-1.6.0-src.tar.gz 193951 BLAKE2B 621b66f88d0b33a3888964fd30d9fd35c800265a8b35c1764966d97408b234be1d0b85785501e4eef3645ae12ef28fa483f5268f82564276acf466afdf5059fa SHA512 00e8eb552e886ba9da0b9636ee9ffce142eb33faa9d2873e7619e6508ab59b214bde1818f43012ecdab928ddc0697514482b33c3c268729c3049ce4306a7ea1e
+DIST commons-exec-1.6.0-src.tar.gz.asc 228 BLAKE2B effe1288b9b0a5369b50ca1c0c6c66c5c4d0f3e9a1610a40c78f278353632084d67c04bfa28d93af6a7bab8fdfc214c75c216077d51ab245b7e35295eb6cfb7d SHA512 7f97e0adc05a2beb0dc6ad1c41baebc5592dbb33d04c4408245b712d09fc0e39a95f225045540b7d3e178d02524a883e07cb8a6736c55f86efb82936adafd236
diff --git a/dev-java/commons-exec/commons-exec-1.6.0.ebuild b/dev-java/commons-exec/commons-exec-1.6.0.ebuild
new file mode 100644
index 000000000000..50b76c6111bc
--- /dev/null
+++ b/dev-java/commons-exec/commons-exec-1.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2026 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 verify-sig
+
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
+HOMEPAGE="https://commons.apache.org/proper/commons-exec/"
+SRC_URI="mirror://apache/commons/exec/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/exec/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? ( app-admin/sudo )
+	verify-sig? ( sec-keys/openpgp-keys-apache-commons )
+"
+
+# [-vintage] because, if junit:5 compiled with 'USE=vintage':
+# Error: Module junit not found, required by org.junit.vintage.engine
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/commons-lang-3.20.0:0
+		dev-java/junit:5[-vintage]
+		~dev-java/junit-pioneer-1.9.1:0
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="commons-lang junit-5 junit-pioneer opentest4j"
+JAVA_TEST_EXCLUDES=(
+	# ERROR: ld.so: object 'libsandbox.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored.
+	# ping: socktype: SOCK_RAW
+	# ping: socket: Operation not permitted
+	# ping: => missing cap_net_raw+p capability or setuid?
+	org.apache.commons.exec.issues.Exec41Test
+	org.apache.commons.exec.issues.Exec34Test
+)
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-exec/metadata.xml b/dev-java/commons-exec/metadata.xml
new file mode 100644
index 000000000000..e25b5c52aab3
--- /dev/null
+++ b/dev-java/commons-exec/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+  <name>Java</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index f48c401e72ae..3aa97340b439 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -2,3 +2,5 @@ DIST commons-io-2.18.0-src.tar.gz 670984 BLAKE2B 3d8ffbd602cf31e89cb42059e9a7f83
 DIST commons-io-2.18.0-src.tar.gz.asc 488 BLAKE2B 2c88e3374a839fb58ef25422c33e120699b319ebdf2baa8f72180e0db8089a4b9b851fc648c0508aad9c7707c463fbb9b849b3eaf545f101195083a4dffae160 SHA512 8101ffb12f3253e71f0234eb8a5a04d88bc7e8777cabfc88ac64f50b416dd6b4be28f8dfd14d09a97a63257c159fab4b512584085550ce965fcfd97cdb637a9e
 DIST commons-io-2.20.0-src.tar.gz 700475 BLAKE2B 37d54c842a8bab868872a614ff70fb8d500e64a7f25f406ec157813e1ea0942c477a748317f7f4ec608afdc15233d523117ce804998c1b010c021cbda9a2328e SHA512 4c05970ad34e2aa32dc07de3b3335f46bb069dcb6f28fc6ed82867d890d4f31d6dfb5edb03ec3333f789f9ac0a57d84b5ffa782bd715ccffed41b1a9004217fb
 DIST commons-io-2.20.0-src.tar.gz.asc 488 BLAKE2B e33492847b5ed634b494b9c82ff9cbc6847d81224c39c6c6c5efe4839ef22f7cb5994a9afd96bbe56016347abd7e5bc6cd3fc0406bcc30fd10c85ac123eb3d4a SHA512 29ec14c947c68817d8d42307405fb7133ed6557cc36945609a6427c7064743e60a89a0c6702ffe51db0e28dd0679908688ffa11f6d623b459bc22cb93c443b43
+DIST commons-io-2.21.0-src.tar.gz 818160 BLAKE2B 4d836d18540c9ccb96855f17f2eb2701f809511cfdfa05001078c4eaed33589c291deb5b2ce1943b935a3ced7148139a35a0f7a0f78885da1eb144ffb0630e4d SHA512 50eb2ef3e42362b090e6d8bca954b20c940ae7e5391ce7ef8e0756c70c78e273fdd2f3dd76151d2078628e5a05a077bd712e331362f430eda3ddf8a3adc45898
+DIST commons-io-2.21.0-src.tar.gz.asc 488 BLAKE2B bcbba5f4ee89278cb87aae14ba624d52f3043bc28de0f7d664ac7726b02e3d290bcee41f8fb5c6e054af6ce97776c1da7b6e359fc537dbec088fad6f5d125f84 SHA512 2967359111dfe7b130496680b2c2087a347b63d3378409e7c75bf8926dd722916c023ca7ef28931da48bc5cd1b99bbdd547e8af9afd49297fdb99bcfe5d6f3dc
diff --git a/dev-java/commons-io/commons-io-2.21.0.ebuild b/dev-java/commons-io/commons-io-2.21.0.ebuild
new file mode 100644
index 000000000000..43e3f7b8917d
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.21.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2026 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 verify-sig
+
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
+HOMEPAGE="https://commons.apache.org/proper/commons-io/"
+SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/io/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+# [-vintage] because, if junit:5 compiled with 'USE=vintage':
+# Error: Module junit not found, required by org.junit.vintage.engine
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/asm-9.9:0
+		>=dev-java/byte-buddy-1.17.8:0
+		>=dev-java/commons-codec-1.20.0:0
+		>=dev-java/commons-lang-3.19.0:0
+		>=dev-java/jimfs-1.3.1:0
+		>=dev-java/jmh-core-1.37:0
+		>=dev-java/jna-5.18.1:0
+		>=dev-java/jsr305-3.0.2-r1:0
+		dev-java/junit:5[-vintage]
+		>=dev-java/junit-pioneer-1.9.1-r1:0
+		>=dev-java/mockito-5.20.0-r1:0
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}/commons-io-2.20.0-BOMInputStreamTest.patch" # java.nio.BufferOverflowException
+	"${FILESDIR}/commons-io-2.20.0-CharSequenceInputStreamTest.patch" # java.nio.BufferOverflowException
+	"${FILESDIR}/commons-io-2.21.0-URIOriginalTest.patch" # java.net.UnknownHostException: example.com
+	"${FILESDIR}/commons-io-2.20.0-XmlStreamReaderTest.patch" # Needs network access
+)
+
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="asm byte-buddy commons-codec commons-lang
+	jimfs jmh-core jna jsr305 junit-pioneer junit-5 mockito opentest4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# This test has compilation errors:
+	# src/test/java/org/apache/commons/io/file/PathUtilsContentEqualsTest.java:125:
+	# error: reference to newFileSystem is ambiguous
+	#  FileSystem fileSystem2 = FileSystems.newFileSystem(refDir.resolveSibling(refDir.getFileName() + ".zip"), null)) {
+	#                                      ^
+	#   both method newFileSystem(Path,ClassLoader) in FileSystems and method newFileSystem(Path,Map<String,?>)
+	#   in FileSystems match
+	rm src/test/java/org/apache/commons/io/file/PathUtilsContentEqualsTest.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.{io,lang,util,time,time.chrono}=ALL-UNNAMED )
+	fi
+}
diff --git a/dev-java/commons-io/files/commons-io-2.21.0-URIOriginalTest.patch b/dev-java/commons-io/files/commons-io-2.21.0-URIOriginalTest.patch
new file mode 100644
index 000000000000..307200e29270
--- /dev/null
+++ b/dev-java/commons-io/files/commons-io-2.21.0-URIOriginalTest.patch
@@ -0,0 +1,37 @@
+[1] http://example.com dynamically registered
+[1] http://example.com
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:org.apache.commons.io.build.URIOriginTest]/[test-template:testGetInputStream(java.lang.String)]/[test-template-invocation:#1]
+   parent: [engine:junit-jupiter]/[class:org.apache.commons.io.build.URIOriginTest]/[test-template:testGetInputStream(java.lang.String)]
+   source: MethodSource [className = 'org.apache.commons.io.build.URIOriginTest', methodName = 'testGetInputStream', methodParameterTypes = 'java.lang.String']
+   caught: java.net.UnknownHostException: example.com
+ duration: 80 ms
+   status: ✘ FAILED
+[2] https://example.com dynamically registered
+[2] https://example.com
+     tags: []
+ uniqueId: [engine:junit-jupiter]/[class:org.apache.commons.io.build.URIOriginTest]/[test-template:testGetInputStream(java.lang.String)]/[test-template-invocation:#2]
+   parent: [engine:junit-jupiter]/[class:org.apache.commons.io.build.URIOriginTest]/[test-template:testGetInputStream(java.lang.String)]
+   source: MethodSource [className = 'org.apache.commons.io.build.URIOriginTest', methodName = 'testGetInputStream', methodParameterTypes = 'java.lang.String']
+   caught: java.net.UnknownHostException: example.com
+ duration: 114 ms
+   status: ✘ FAILED
+
+--- a/src/test/java/org/apache/commons/io/build/URIOriginTest.java
++++ b/src/test/java/org/apache/commons/io/build/URIOriginTest.java
+@@ -29,6 +29,7 @@ import java.nio.file.StandardOpenOption;
+ import org.apache.commons.io.build.AbstractOrigin.URIOrigin;
+ import org.apache.commons.lang3.ArrayUtils;
+ import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
+ import org.junit.jupiter.params.ParameterizedTest;
+ import org.junit.jupiter.params.provider.ValueSource;
+ 
+@@ -58,6 +59,7 @@ class URIOriginTest extends AbstractOriginTest<URI, URIOrigin> {
+         Files.write(rwPath, ArrayUtils.EMPTY_BYTE_ARRAY, StandardOpenOption.CREATE);
+     }
+ 
++    @Disabled
+     @ParameterizedTest
+     @ValueSource(strings = {
+             "http://apache.com",
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 61ebeb9697a3..cafb67bdf2f0 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -2,3 +2,5 @@ DIST commons-lang-3.17.0-src.tar.gz 1195408 BLAKE2B 1f612b8e5ef3ecc820ae04009063
 DIST commons-lang-3.17.0-src.tar.gz.asc 488 BLAKE2B ad6bbd5658a4fcdd56f830d55abef4a387fc8f42f4e3cc19d4700033acef8b02e30df4d6774014ae2b0a4f6811bdcc97a5c1a0c154705aa37724325850218beb SHA512 34f48ab6080c5730821bbf32f3715672c9f916d69985940f1dd17f9ab2c2ec04d1907426ee1dac1bd3654f7f50c65730042ebbffde1c12aa758f9a1e5634fcd0
 DIST commons-lang-3.19.0-src.tar.gz 1325280 BLAKE2B f7f27404a35284e156950832b5d1d6a95782ab734c5292110c4953de201899bd0cec629f0830ada5d8ffcd301f702371076bb041ca6f4950cc87b290032032a2 SHA512 75f7626925af2605a936e696c9947bae90b5b0d05830cbb7c97db2051d3e4e71f8e2563a0ff29c1780863fce188334398faf5413052c1df0fd8dae07fb09233a
 DIST commons-lang-3.19.0-src.tar.gz.asc 488 BLAKE2B aade88ca133cecedbab0cfaa5de226dac2fa6bf39f2fff80ce806dd527b839b38d3fe3eeddfe0c1561dc7cfcab3fb83fe0c1a553c34ef70ae73fe1dd944126d2 SHA512 4e71fa045e104116dd64aedbb0b3e1e9720ddfb1d6b49e850119a76895de7b92a1f12c23d16be01c9beeee3152448628770f405f0e2f62d0f9adda668ccfb209
+DIST commons-lang-3.20.0-src.tar.gz 1338908 BLAKE2B 3cabb0411e4bfccf84758fff64c3a8bc56b71905b42a413ebd45cb783553264e70757f8bc5cb7d2766b9913b663b7bdf6c6145256e007fb747ea33f6d1571e4e SHA512 aebc40e4cccdaa56d6b9831e4928fde872c4accdc1e62cfe4dce937a285002eba6b01636051e52fd458116480b50ec824356c2b1534750d6ad477cbcff3d59bb
+DIST commons-lang-3.20.0-src.tar.gz.asc 488 BLAKE2B 562de979861e400fdbcddc0c4b0c9aa7fc2e3d522a3d844ca99dec0a12a59d6b49b1f1ea6fc97f8cffe28b9216c4962197639b4567129d1584df0351ad6d8944 SHA512 4fb70de2770676177dc91832e256cbbcbdcebe3637c7261a81e6dc7304896334022bedb525ac1e3a1b536778dbd9041822c9c60837744266a390dd4883de41ba
diff --git a/dev-java/commons-lang/commons-lang-3.20.0.ebuild b/dev-java/commons-lang/commons-lang-3.20.0.ebuild
new file mode 100644
index 000000000000..35aee3195788
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.20.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2026 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 verify-sig
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
+SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${PN}3-${PV}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+# [-vintage] because, if junit:5 compiled with 'USE=vintage':
+# Error: Module junit not found, required by org.junit.vintage.engine
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/asm-9.9:0
+		>=dev-java/commons-text-1.14.0:0
+		>=dev-java/easymock-5.6.0:0
+		>=dev-java/jmh-core-1.37:0
+		dev-java/junit:5[-vintage]
+		>=dev-java/junit-pioneer-1.9.1-r1:0
+		>=dev-java/jsr305-3.0.2-r1:0
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/commons-lang-3.19.0-skip-testGetJavaAwtHeadless.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3"
+JAVA_GENTOO_CLASSPATH_EXTRA="org.apache.commons.lang3.jar"
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}3"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="asm commons-text easymock jmh-core junit-pioneer junit-5 jsr305 opentest4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	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,time,time.chrono}=ALL-UNNAMED )
+	fi
+	LC_ALL="en_US.UTF-8" junit5_src_test
+}
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index 9f998471cd9d..2bfb9f573597 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,2 +1,4 @@
 DIST commons-text-1.14.0-src.tar.gz 365401 BLAKE2B bde7f76383f967c5d1cfc9dba383d93ec0f9ba37573d9ff7b030c52cd3b88405f73d56576cb151a5625be8922315438141a921ebbc5c5f4376a60a93e7475dfb SHA512 db9369ca5249e447f871b03f826782ff34d55f7f375c6fe9a6e6ffb740124ad38ced4487ea0bd9fafe1603b5dade9ce6fdd7d595af63b6d3a66560de936aa46a
 DIST commons-text-1.14.0-src.tar.gz.asc 488 BLAKE2B 354170784d3e126633725c384e4fa2f1971adf67dfad5b4e20d215c62a1eafe31abb639a6ecf11d3fc22ce5bf72e521812cee01eef43571229aaab09aa96741c SHA512 9ad22be03e791dab3a1fa66c1781e6d2b2759e0c9ef2ab17bf5d1f83c17943cd5603dd243e9bcec0ae1005f884555969fd0c60ea05709780370d6eafc334b47a
+DIST commons-text-1.15.0-src.tar.gz 462785 BLAKE2B 250619852061c5ee7ca8a0ff8016135013592532e24aa6424cd8e61907db637e7094d83e1b1b10e4ba49cb3640226680a54f4a552a199bca20948f74bafc4d05 SHA512 5bbeebbe5853525d72a54ad483344f2a55b360cb3abeeada2eb52ca6118f10102bb8fb8ca42417c38b6f8ed7147807414f50c5093473fac9fd3f74cfb8160958
+DIST commons-text-1.15.0-src.tar.gz.asc 228 BLAKE2B 2124d9178d2ea97df1f382d86e06ea986470f0e4208901713db28514f341d425937fc4ab5fc4adab359a8aa2ef0bbce404e6ac797f089d64e3945d7a07a51732 SHA512 da7c8858cabafbf1a904f0465339444b084f31d941f02a3492a412c29b95862a0c7da56ae542b0c14e22d3a34fd5915d77f77bb62c23be0ae9b6046d6a82bca9
diff --git a/dev-java/commons-text/commons-text-1.15.0.ebuild b/dev-java/commons-text/commons-text-1.15.0.ebuild
new file mode 100644
index 000000000000..25041c218135
--- /dev/null
+++ b/dev-java/commons-text/commons-text-1.15.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2026 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 verify-sig
+
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
+HOMEPAGE="https://commons.apache.org/proper/commons-text/"
+SRC_URI="mirror://apache//commons/text/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/text/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-apache-commons-20251102 )"
+CP_DEPEND=">=dev-java/commons-lang-3.20.0:0"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/asm-9.9:0
+		>=dev-java/byte-buddy-1.17.8:0
+		>=dev-java/commons-io-2.21.0:0
+		dev-java/commons-rng:0
+		>=dev-java/jmh-core-1.37:0
+		>=dev-java/jmh-generator-annprocess-1.37:0
+		>=dev-java/jna-5.18.1:0
+		>=dev-java/jsr305-3.0.2-r1:0
+		>=dev-java/junit-pioneer-1.9.1-r1:0
+		>=dev-java/mockito-5.20.0-r1:0
+		>=dev-java/objenesis-3.4:0
+		>=dev-java/opentest4j-1.3.0-r1:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt )
+PATCHES=(
+	"${FILESDIR}/commons-text-1.14.0-ScriptStringLookupTest.patch"
+	"${FILESDIR}/commons-text-1.14.0-StringSubstitutorWithInterpolatorStringLookupTest.patch"
+	"${FILESDIR}/commons-text-1.14.0-UrlStringLookupTest.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.text"
+JAVA_INTERMEDIATE_JAR_NAME="org.apache.${PN/-/.}"
+JAVA_MODULE_INFO_OUT="src/main"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="asm byte-buddy commons-io commons-rng jmh-core
+	jmh-generator-annprocess jna jsr305 junit-pioneer junit-5 mockito objenesis opentest4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	export LC_ALL="en_US.UTF-8"	# needed for DateStringLookupTest
+}