From 96d3426e58f17e89f9724033865eaec7371eabe6 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 13 Oct 2022 09:27:30 +0200 Subject: dev-java/jackson-dataformat-xml: depend on jackson-databind-2.13.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/27763 Signed-off-by: Miroslav Šulc --- .../jackson-dataformat-xml-2.13.4-r1.ebuild | 105 +++++++++++++++++++++ .../jackson-dataformat-xml-2.13.4.ebuild | 105 --------------------- 2 files changed, 105 insertions(+), 105 deletions(-) create mode 100644 dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild delete mode 100644 dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild new file mode 100644 index 000000000000..d407fdda4d1e --- /dev/null +++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild @@ -0,0 +1,105 @@ +# 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-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.4.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Data format extension for Jackson" +HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml" +SRC_URI="https://github.com/FasterXML/${PN}/archive/${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.4 -> >=dev-java/jackson-annotations-2.13.4:2 +# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0 +# com.fasterxml.jackson.core:jackson-databind:2.13.4 -> >=dev-java/jackson-databind-2.13.4:0 +# com.fasterxml.woodstox:woodstox-core:6.3.1 -> >=dev-java/woodstox-core-6.3.1:0 +# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0 + +CP_DEPEND=" + ~dev-java/jackson-annotations-${PV}:2 + ~dev-java/jackson-core-${PV}:0 + ~dev-java/jackson-databind-${PV}.1:0 + >=dev-java/stax2-api-4.2.1-r1:0 + dev-java/woodstox-core:0 +" + +# Compile dependencies +# POM: pom.xml +# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.4 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.4:0 +# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0 +# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3 +# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 + +DEPEND=" + >=virtual/jdk-11:* + ${CP_DEPEND} + test? ( + ~dev-java/jackson-module-jakarta-xmlbind-${PV}:0 + dev-java/jaxb-api:4 + dev-java/sjsxp:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND}" + +DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x ) + +S="${WORKDIR}/${PN}-${P}" + +JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + java-pkg-2_src_prepare + + sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \ + -e "s:@projectversion@:${PV}:g" \ + -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \ + -e "s:@projectartifactid@:${PN}:g" \ + "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \ + > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die +} + +src_test() { + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \ + ! -wholename "**/failing**/*.java" \ + ! -name "*TestBase.java" ) + popd + + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + + # The same failure under openjdk-17 occurs upstream (running 'mvn test') + + # 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest) + # com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to + # `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node + # java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee + + 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.util=ALL-UNNAMED ) + fi + + java-pkg-simple_src_test +} diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild deleted file mode 100644 index f7c722ff3c0b..000000000000 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# 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-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.4.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Data format extension for Jackson" -HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml" -SRC_URI="https://github.com/FasterXML/${PN}/archive/${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.4 -> >=dev-java/jackson-annotations-2.13.4:2 -# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0 -# com.fasterxml.jackson.core:jackson-databind:2.13.4 -> >=dev-java/jackson-databind-2.13.4:0 -# com.fasterxml.woodstox:woodstox-core:6.3.1 -> >=dev-java/woodstox-core-6.3.1:0 -# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0 - -CP_DEPEND=" - ~dev-java/jackson-annotations-${PV}:2 - ~dev-java/jackson-core-${PV}:0 - ~dev-java/jackson-databind-${PV}:0 - >=dev-java/stax2-api-4.2.1-r1:0 - dev-java/woodstox-core:0 -" - -# Compile dependencies -# POM: pom.xml -# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.4 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.4:0 -# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0 -# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3 -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} - test? ( - ~dev-java/jackson-module-jakarta-xmlbind-${PV}:0 - dev-java/jaxb-api:4 - dev-java/sjsxp:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x ) - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_prepare() { - java-pkg-2_src_prepare - - sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \ - -e "s:@projectversion@:${PV}:g" \ - -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \ - -e "s:@projectartifactid@:${PN}:g" \ - "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \ - > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die -} - -src_test() { - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \ - ! -wholename "**/failing**/*.java" \ - ! -name "*TestBase.java" ) - popd - - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - - # The same failure under openjdk-17 occurs upstream (running 'mvn test') - - # 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest) - # com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to - # `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node - # java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee - - 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.util=ALL-UNNAMED ) - fi - - java-pkg-simple_src_test -} -- cgit v1.2.3-65-gdbad