4 files changed, 3 insertions, 86 deletions
diff --git a/dev-java/owasp-java-encoder/Manifest b/dev-java/owasp-java-encoder/Manifest
index 557236fdd886..0459430bec41 100644
--- a/dev-java/owasp-java-encoder/Manifest
+++ b/dev-java/owasp-java-encoder/Manifest
@@ -1,6 +1,3 @@
-AUX owasp-java-encoder-1.2.3-BenchmarkTest.patch 1971 BLAKE2B 1a4d60fb1b16b98878f1c9bd056d1600327768613a9df9017395f40f8d249b7034bb44b5573638307398ab5296c01f618f0e5348023e84aa526ca0d76ab41113 SHA512 376c5cad6e7cb4ebc3fe6998d90155c71bdfa793ecb132ea49e018169f6fe150485cd0b79984e5f88c96afb3ceb80cfdb68f49fe9aea4cabffc29ec3a7fc40e0
-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
-EBUILD owasp-java-encoder-1.2.3.ebuild 837 BLAKE2B d80fffeab535d7de8a4c227cd29b2afe74861e7fe8a4df5fc8c21053dfb2bf0503fe8091c62c4bfb62dd00e14a6feee6cac9027704b51da32c18c7b8a6d4b256 SHA512 f8c2275ad2397108a07be95d4cd028d18ae896068bf153fcc4c5819cd556a381e90540116a544ef26a811f0aa47032d6e6e72d354076ecf0818060f2fd4de7dc
-EBUILD owasp-java-encoder-1.3.0.ebuild 1244 BLAKE2B 3c78a5ff087f17578b40c66bf7ac9b320eedb3e7b41dbc8851571241513ca587d8d1782c5aa5ff9623e067751b45b2da4874d194e4f8b3934e38872c3682b472 SHA512 cf37a0865cd38f85ae39d291bc15765ae28260b3ffb26da4b4cd7f95b6b0158975e6751c8be83e6d6af610ea64b51dfaf9e08dbe2677abb1a4c21af3ae381ec5
+DIST owasp-java-encoder-1.3.1.tar.gz 150103 BLAKE2B 6fc372364a13df497b1f5380d1d9b1c90e0981bfa059c31f2d138a3d0db3210105d0055b2a39a341cb3374b8149c5d61e1f967677e1159e843bb0143713e58b2 SHA512 9a75dea53e2859a4a213e2a511440c1bcbaea6c7a13fece674d155bc859f049fd45bbbd83fd6869a792af3b0e3f447e90ab450545684aa5ccc5b88a051114cdc
+EBUILD owasp-java-encoder-1.3.1.ebuild 1243 BLAKE2B 0d6c11e5bc38fe119d0be612698890767c1a6b81f47ce4da37d4a45785e33c458da02e8a431c89d0ca5c8a6da9ae8a4d0a34b30ab3eee6f4be9f7be79fe49fd7 SHA512 88b9aa0c1b6474d3dd12264d699026e68586763b759471dae7dcb1cf27481cd378c3294d6c6e5ae38ebe5c2ca7007d72ed09d71a01eb85223b81d51190ff8f0a
 MISC metadata.xml 306 BLAKE2B 8dfe8c2f01f21e1e865973e9865f3a9439a7a378d2acc52a6e148dcf70e3ef0f0fcce4efff20d89c0e2872e5d23fb0795b2d669eb18c278abf3ae6406db8f84a SHA512 c696a3c2763ff1868b3b80ee7c4b47fc697679a0539c2b9b300f0a969ad3bcd168e75f5d0275c10bac5b1ba7052e2e498c2c7daf3290f593cd0be8c9f35940fd
diff --git a/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch b/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch
deleted file mode 100644
index de988462ede7..000000000000
--- a/dev-java/owasp-java-encoder/files/owasp-java-encoder-1.2.3-BenchmarkTest.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-There were 2 failures:
-1) Encode.forHtmlUnquotedAttribute(org.owasp.encoder.BenchmarkTest$1$3)
-junit.framework.AssertionFailedError
-        at junit.framework.Assert.fail(Assert.java:55)
-        at junit.framework.Assert.assertTrue(Assert.java:22)
-        at junit.framework.Assert.assertTrue(Assert.java:31)
-        at junit.framework.TestCase.assertTrue(TestCase.java:200)
-        at org.owasp.encoder.BenchmarkTest$1$3.runTest(BenchmarkTest.java:115)
-2) Encode.forUriComponent(org.owasp.encoder.BenchmarkTest$1$3)
-junit.framework.AssertionFailedError
-        at junit.framework.Assert.fail(Assert.java:55)
-        at junit.framework.Assert.assertTrue(Assert.java:22)
-        at junit.framework.Assert.assertTrue(Assert.java:31)
-        at junit.framework.TestCase.assertTrue(TestCase.java:200)
-        at org.owasp.encoder.BenchmarkTest$1$3.runTest(BenchmarkTest.java:115)
-
-FAILURES!!!
-Tests run: 962,  Failures: 2
---- a/src/test/java/org/owasp/encoder/BenchmarkTest.java
-+++ b/src/test/java/org/owasp/encoder/BenchmarkTest.java
-@@ -209,12 +209,6 @@ public class BenchmarkTest extends TestCase {
-                 return Encode.forXml(input);
-             }
-         },
--        new Bench("Encode.forHtmlUnquotedAttribute") {
--            @Override
--            public String encode(String input) {
--                return Encode.forHtmlUnquotedAttribute(input);
--            }
--        },
-         new Bench("Encode.forJavaScript") {
-             @Override
-             public String encode(String input) {
-@@ -227,12 +221,6 @@ public class BenchmarkTest extends TestCase {
-                 return Encode.forCssString(input);
-             }
-         },
--        new Bench("Encode.forUriComponent") {
--            @Override
--            public String encode(String input) {
--                return Encode.forUriComponent(input);
--            }
--        },
-         new Bench("Encode.forCDATA") {
-             @Override
-             public String encode(String input) {
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.2.3.ebuild
deleted file mode 100644
index 482d2d258e37..000000000000
--- a/dev-java/owasp-java-encoder/owasp-java-encoder-1.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.owasp.encoder:encoder:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OWASP Java Encoder"
-HOMEPAGE="https://owasp.org/www-project-java-encoder/"
-SRC_URI="https://github.com/OWASP/owasp-java-encoder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/core"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=( "${FILESDIR}/owasp-java-encoder-1.2.3-BenchmarkTest.patch" )
-
-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/owasp-java-encoder/owasp-java-encoder-1.3.0.ebuild b/dev-java/owasp-java-encoder/owasp-java-encoder-1.3.1.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.1.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:*"