gentoo resync : 12.05.2022

3 files changed, 26 insertions, 23 deletions

diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 8f34301c6f9a..bd94be2730ae 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,4 @@
-DIST jackson-core-2.13.0.tar.gz 11437457 BLAKE2B d4629f7a5c497bb837369050564ed91b9520290c2355a3fe20939c6211112c552b8e2db5dfc8bd9965ec17df8194191368189dcb425e3f9a5ad60a08c3a2b900 SHA512 b3d50849f0912252cbdde77de05a1c9836d044f48c50c4a4992e7b207d1f83ea9580df2bf843d9cb1c50008a808525ca82dd22d8dfa192fa394f8a923ee274a3
 DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
-EBUILD jackson-core-2.13.0.ebuild 2215 BLAKE2B 7783e6a6f574c54427fad6d256b652394170e5587a6dc2b8c7a358ead90f2b1db94a63af228d0e612ac9e3461e37d85560b6d1ebcb921b5ee3878fce4a25114b SHA512 a133ad7be357b05af753ee228f4978d26535af30c1d58179eba48a4567fc7ef04f10e0cb18e8c3d60ef1d4385231323dbbdfa7a3572e7e2742ad03f5298c92fd
-EBUILD jackson-core-2.13.2.ebuild 2090 BLAKE2B aa21495f81271773550a6e9e31ca4d483f3f1d0822e4f4db5df2d276e8be1f12aeaa945808d0978b7886ffbab053cc9dbcbde042a300d531ed7eaad819056635 SHA512 ead02b325acbc966a669065f2afbc2f7fbc0b7f9a80730b0fb9c5f7ce7d110a8844f12a90bc0e882a9a7016e255da728a73bfda69eb96a8d4e56fbe30998a47e
+EBUILD jackson-core-2.13.2-r1.ebuild 2089 BLAKE2B 651f71fcf51ff24725078c008391ff16ef24f524d153493079af657f319e565fd51163f88b5d8a5e058a614d2a5bb1de4fd70592a84d8c1901b973704a611431 SHA512 9bd82d0407ecd86bcb6e1435b31e6a7a5afca0ed3943f74618affe07336dd87926867500d82018df62af122935c858f6bb2671cf28ad55f056d7bf095afed072
+EBUILD jackson-core-2.13.2.ebuild 2086 BLAKE2B 2985b182545844f21a57bedcf0ccb80d88b3ef5256ad8627c20eb4a2156cd6c4a8874da62741e995da05fb0924766c9f6cabfe9a5a7345182e8dc97cb8a7d230 SHA512 37fb40bea78345bd524ff326bfbfee0676b06087833a61e9c1fb024eef369416fa65f371f8afda7b2d69148595c124b66bc3c1591709bff7e4ac7d3c480c2fdd
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.0.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
index 562b36a94013..9892ac01a0ed 100644
--- a/dev-java/jackson-core/jackson-core-2.13.0.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
@@ -2,28 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.0"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Core Jackson processing abstractionis (Streaming API), implementation for JSON"
+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/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-DOCS=( LICENSE README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
 
 S="${WORKDIR}/${PN}-${P}"
 
@@ -33,18 +33,6 @@ JAVA_RESOURCE_DIRS="src/main/resources"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
-	# Upstream doesn't run these tests and gets
-	# »Tests run: 928, Failures: 0, Errors: 0, Skipped: 0«
-	com.fasterxml.jackson.failing.async.AsyncTokenErrorTest
-	com.fasterxml.jackson.failing.filter.BasicParserFilteringTest
-	com.fasterxml.jackson.failing.ParserErrorHandling105Test
-	com.fasterxml.jackson.failing.ParserErrorHandling679Test
-	com.fasterxml.jackson.failing.ParserFilterEmpty708Test
-	com.fasterxml.jackson.failing.Surrogate223Test
-	perf.ConcurrencyReadTest
-	perf.ManualCharAccessTest
-)
 
 src_prepare() {
 	default
@@ -59,6 +47,22 @@ src_prepare() {
 	java-pkg-2_src_prepare
 }
 
+src_test() {
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
+			! -wholename "**/failing**/*.java" \
+			! -wholename "**/testsupport**/*.java" \
+			! -wholename "perf**/*.java" \
+			! -name "*TestBase.java" \
+			! -name "*BaseTest.java" \
+			)
+	popd
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
 src_install() {
 	default # https://bugs.gentoo.org/789582
 	java-pkg-simple_src_install
diff --git a/dev-java/jackson-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
index 89cdf79b4682..e156fbe67bdc 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"