4 files changed, 97 insertions, 13 deletions
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 5468474998c7..bf51cb75043f 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1,4 +1,6 @@
 DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
-EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2797 BLAKE2B 3fb3ebfbe0db71fa162703af10d62a18c3b32bc7875199cf4c555467c4af855ba3188f33f99c8fb66a4ec2f1d80a5d4944bb36f5b8e9873a25bb514993a5a6ae SHA512 e682ffdfa4022ef9d1fabf2cd07a5842d802cdb121eaf26e58004755f7b553fbdd79a23d7b3fe5920e9e5b93e43b7e263e26bf68ddb3caadbf35d190abc7333c
-EBUILD jackson-module-jakarta-xmlbind-2.13.2.ebuild 2792 BLAKE2B cc25393d71497d490dd6156a9ae1121959b09cc8d13b9a839f38a435c495ec4e01d8da6e4e7dc2c35309156b4f3a068c886fe5a7642eeab7dcf5a47ce4541334 SHA512 3ac9d6ea9bd1facb0496aad8c687543ca1e7edf432a0dde014c5530acede124b1df4d9bd3e8a17d228bbc678a9e4a67f6750a6dc3c2433d60199c4840484218c
+DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
+EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2793 BLAKE2B 74c68733494b6ddec21d334f52e166df316db33e7c0d15a580d2cfd61676c12abe1abb58a98043ef2804c5f847c28d39aa8387c091f61741de6ec93919aa3f3c SHA512 c6f9c14be15c0d58771d2695508ea590fdc50384ff592642a5fa7c6cfa3eda2b24da22ae255f7c34f026886e46387aefaa7e3e0aed0b278d1fcf3f93702c89a8
+EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2888 BLAKE2B d8c0b8adb7576aa03a4a3999308ae374bfc67ef9c9ddde6b092372fcb759848852de520b0c699cf238d8ac98c673ceb661c95ba8e25e666a8a82456c6b44981e SHA512 516ca0ae25dd319c66057256e8ff35fd96b32a8e6c9b89299e5515070d852ec6b5cfbad053ccb980a617bbc89afc4b483379646498f0be566c024cf34ec43e87
+EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2766 BLAKE2B d442d46c8941dd0f061dc86ed2276369be83a47eddd5dc8982f29d6cf04d54a83f3f82f39fa3b13b0b490d85acc3e7b7d2ebf2c9accfebe60cdb02f2c2b64613 SHA512 ba7133da91b84f82000d4395db83b6824f3e024cefd9243a55f4afd838dd681d61d37b5ffe2744502849269418d27aa3b49150681c8a57a959af3d72598cc431
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
index bc1ab00b11a4..729776debe50 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..b063ac9c72df
--- /dev/null
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# 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-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+# 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}:0
+	dev-java/jakarta-activation:1
+	dev-java/jaxb-api:4
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+	test? (
+		dev-java/jaxb-runtime:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
+
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run these 
+	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestUnwrapping
+	com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestXmlID3
+)
+
+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
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
index 18d572895a82..baf70d9cdfe8 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
@@ -2,12 +2,12 @@
 # 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-modules-base/archive/jackson-modules-base-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,16 +18,16 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
 
 # Common dependencies
 # POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
+# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
 # com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
 # jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
 
@@ -35,7 +35,7 @@ CP_DEPEND="
 	~dev-java/jackson-annotations-${PV}:2
 	~dev-java/jackson-core-${PV}:0
 	~dev-java/jackson-databind-${PV}:0
-	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-activation:1
 	dev-java/jaxb-api:3
 "
 
@@ -45,7 +45,7 @@ CP_DEPEND="
 # test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
 
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}"
 #	test? (
 #		!!!groupId-not-found!!!
@@ -56,8 +56,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-DOCS=( ../README.md )
-
 S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
 
 JAVA_SRC_DIR=( "src/main/java" "src/moditect" )