7 files changed, 103 insertions, 12 deletions
diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 5e218dde6c1d..d809ac37efab 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -1,2 +1,2 @@
-DIST owasp-java-encoder-1.2.3.tar.gz 134303 BLAKE2B 76b9652863fcdfdce82bd26062fa500bb92b21ba6edff7b3f409a1375e135176f826dca4bb02b4dd48905112ae20a0af0a1f09cb4e21ea41c672a44c52fea209 SHA512 19c13894ce68325553bdbee41190cb113d698c79ec74885604fd9db4f083efe0fcdc4313b7191014bfd972d0ee52f0fbe0621d7bb407745bd1feeb2ac9e49783
 DIST owasp-java-encoder-1.3.0.tar.gz 150029 BLAKE2B 31e350f02a7374f809e435d90ee9b4b1424cd9cb2da7d4062dfe0fc5898e02623496e464483bafd550b82b926260ab4df918f9be776e47f66587c6bc3829ebba SHA512 0ccdd6ae63e657ee28a4d9de7664269eff57802bddb03c7163fdb27326668256573d995b0111dc83cc1e5a6acc247e03da443f4b34c08cf99b085ec0a383a439
+DIST owasp-java-encoder-1.3.1.tar.gz 150103 BLAKE2B 6fc372364a13df497b1f5380d1d9b1c90e0981bfa059c31f2d138a3d0db3210105d0055b2a39a341cb3374b8149c5d61e1f967677e1159e843bb0143713e58b2 SHA512 9a75dea53e2859a4a213e2a511440c1bcbaea6c7a13fece674d155bc859f049fd45bbbd83fd6869a792af3b0e3f447e90ab450545684aa5ccc5b88a051114cdc
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
index 84640fdb1e59..d97245755a5f 100644
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
index 482d2d258e37..84640fdb1e59 100644
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild
+++ b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,19 +16,19 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
-RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
-PATCHES=( "${FILESDIR}/owasp-java-encoder-1.2.3-BenchmarkTest.patch" )
-
+# skipping 10 tests because they seem to be unreliable depending on hardware used
+# as some of them fail on some setups because the benchmark results don't align
+# with the hardcoded value 200 for the expected results. here are some examples:
+# Benchmarked Encode.forJavaScript: 442,382250 ns/op (+253,85% on baseline)
+# Benchmarked Encode.forCssString: 446,929231 ns/op (+257,49% on baseline)
+# Benchmarked Encode.forJava: 409,038065 ns/op (+227,18% on baseline)
+JAVA_RM_FILES=( src/test/java/org/owasp/encoder/BenchmarkTest.java )
 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"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-}
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 9057f75a73c0..d98aa33f1abc 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1 +1,3 @@
 DIST poi-src-5.2.3-20220909.tgz 117839114 BLAKE2B 8b62f212dbbb6c7c20900dad97eaee20d416129d1529f42d3f3d15c42dd737af389f3d46c0891f733ba6ce143fa30c73aa921a2f007e68ecbfcd2a61da27baec SHA512 15d1d9387a3003fa30dc77cb42721daefb07a0f8ef1a69873107fd2266d66ae5c0138f47f2867d49154bbde4f28939ac1aa1b49e367230408e67c05099addc1c
+DIST poi-src-5.2.5-20231118.tgz 120325373 BLAKE2B a998b874040ac2fb136b9ffa59d30cf5939434efe59d51fc2e79c63f6fd1f3ad1679b532840f0e1975aa0fe79368951ecf2ddc0259e3dfce9fc2c34d95cb7216 SHA512 d46e94cfadc3a843d8e06033a618098dde738830f20146c6e39abd8f467aa88987719363ee2b91ecf6812e604cdc72a5c0a799676e264a6f9d3799aa4639a6c9
+DIST poi-src-5.2.5-20231118.tgz.asc 488 BLAKE2B 634ed5e3bacd71213a96b9da147348deb3dd2837f6cf47f4d76c254442504815e41b1d9a3facfaa27c927f11f1ba552acf4dc94c4ffbfd11cc70eefd054a1523 SHA512 3588d60ad1c5e59540f19e345f2cfd6600a592fda313ab53bfd280599906e9d3c44aedae8fb72409ebae67c0285b257290bdca9128a632379db894143585dd1e
diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild
new file mode 100644
index 000000000000..7320886dbe8a
--- /dev/null
+++ b/dev-java/poi/poi-5.2.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.poi:poi-main:${PV}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Maven build of Apache POI for Sonar checks"
+HOMEPAGE="https://poi.apache.org/"
+RELEASE_DATE="20231118"
+SRC_URI="https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz
+	verify-sig? ( https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz.asc )"
+S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )"
+DEPEND="
+	dev-java/commons-codec:0
+	dev-java/commons-collections:4
+	dev-java/commons-io:1
+	dev-java/commons-math:3
+	dev-java/log4j-api:2
+	>=dev-java/sparsebitset-1.3:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.poi.poi"
+JAVA_CLASSPATH_EXTRA="
+	commons-codec
+	commons-collections-4
+	commons-io-1
+	commons-math-3
+	log4j-api-2
+	sparsebitset
+"
+JAVA_RESOURCE_DIRS="poi/src/main/resources"
+JAVA_SRC_DIR=( poi/src/main/java{,9} )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	sed \
+		-e "s:@VERSION@:${PV}:g" \
+		-e "s:@DSTAMP@:${RELEASE_DATE}:g" \
+		poi/src/main/version/Version.java.template \
+		> poi/src/main/java/org/apache/poi/Version.java || die
+	# log4j-api does not provide Automatic-Module
+	sed \
+		-e '/org.apache.logging.log4j/d' \
+		-i poi/src/main/java9/module-info.java || die
+}
diff --git a/dev-java/sparsebitset/Manifest b/dev-java/sparsebitset/Manifest
index 170900e3d8e7..e1a04093f54e 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1 +1,2 @@
+DIST SparseBitSet-1.3.tar.gz 1670241 BLAKE2B e9d8ff537b65e4c2be68d66f02595048381c4a2574e3bdc5d05602d440a57a6c7a96edb23581741a6800516e3d571dce8e016e0ce477300ce7ad08c3e81bcad2 SHA512 6851613df21bcdccb28c24535fac886d6ad74d6feb37dea477dff1711218ecf30093d90ff78becb1159c6bd570a7afbd8c86482d72a5af8f0864d6e443cd603b
 DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
diff --git a/dev-java/sparsebitset/sparsebitset-1.3.ebuild b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
new file mode 100644
index 000000000000..06c06a825139
--- /dev/null
+++ b/dev-java/sparsebitset/sparsebitset-1.3.ebuild
@@ -0,0 +1,28 @@
+# 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="com.zaxxer:SparseBitSet:1.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An efficient sparse bitset implementation for Java"
+HOMEPAGE="https://github.com/brettwooldridge/SparseBitSet"
+SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/SparseBitSet-${PV}.tar.gz"
+S="${WORKDIR}/SparseBitSet-SparseBitSet-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.zaxxer.sparsebitset"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"