From a37088132ba08a680bbc5bbce95ce927251b9787 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 10 Jun 2022 17:12:20 +0000 Subject: Adding metadata --- .../jackson-annotations-2.13.2.ebuild | 43 -------- dev-java/jackson-core/jackson-core-2.13.2.ebuild | 69 ------------- dev-java/jackson-databind/Manifest | 1 - .../jackson-databind-2.13.2.ebuild | 83 ---------------- .../jackson-dataformat-xml-2.13.2.ebuild | 110 --------------------- .../jackson-dataformat-yaml-2.13.2.ebuild | 79 --------------- .../jackson-module-jakarta-xmlbind-2.13.2.ebuild | 83 ---------------- dev-java/tomcat-native/Manifest | 1 - dev-java/tomcat-native/tomcat-native-1.2.32.ebuild | 62 ------------ dev-java/tomcat-native/tomcat-native-1.2.33.ebuild | 2 +- dev-java/tomcat-servlet-api/Manifest | 1 + .../tomcat-servlet-api-9.0.64.ebuild | 99 +++++++++++++++++++ 12 files changed, 101 insertions(+), 532 deletions(-) delete mode 100644 dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild delete mode 100644 dev-java/jackson-core/jackson-core-2.13.2.ebuild delete mode 100644 dev-java/jackson-databind/jackson-databind-2.13.2.ebuild delete mode 100644 dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild delete mode 100644 dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild delete mode 100644 dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild delete mode 100644 dev-java/tomcat-native/tomcat-native-1.2.32.ebuild create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild (limited to 'dev-java') diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild deleted file mode 100644 index c2835290b469..000000000000 --- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild +++ /dev/null @@ -1,43 +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-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Core annotations used for value types, used by Jackson data binding package." -HOMEPAGE="https://github.com/FasterXML/jackson-annotations" -SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( README.md release-notes/VERSION-2.x ) - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_EXCLUDES=( - # 1) warning(junit.framework.TestSuite$1) - # junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase - com.fasterxml.jackson.annotation.TestBase -) - -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 deleted file mode 100644 index e156fbe67bdc..000000000000 --- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild +++ /dev/null @@ -1,69 +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-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.2" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -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/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( README.md release-notes/{CREDITS-2.x,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="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" - -src_prepare() { - default - - sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \ - -e "s:@projectversion@:${PV}:g" \ - -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \ - -e 's:@projectartifactid@:jackson-core:g' \ - "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \ - > "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die - - 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-databind/Manifest b/dev-java/jackson-databind/Manifest index 98f3432cffb3..a1c1ac059d50 100644 --- a/dev-java/jackson-databind/Manifest +++ b/dev-java/jackson-databind/Manifest @@ -1,3 +1,2 @@ DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245 -DIST jackson-databind-2.13.2.tar.gz 48047657 BLAKE2B 9efb9004d983613b4b0f9a3242d7c0a8610eaac868beff1b5343c268b9381a86c22176d2bbe847fba121f9f928f87838fc7e05bd34955ea3f811ed02a8547e5f SHA512 d15167e1a5a19a9aea369123faca3e7dd5b27a9a3cfa2f76c871967ec7b4331f1d5a266cf6084e94dafe00971abcbf17d01c6e3b91cae0b4a298769dac05f486 DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9 diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild deleted file mode 100644 index 9500e3416646..000000000000 --- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild +++ /dev/null @@ -1,83 +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-databind/archive/jackson-databind-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API" -HOMEPAGE="https://github.com/FasterXML/jackson-databind" -SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo -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 - -CP_DEPEND=" - ~dev-java/jackson-annotations-2.13.2:2 - ~dev-java/jackson-core-2.13.2:0 -" - -# Compile dependencies -# POM: pom.xml -# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 -# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!! -# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!! -# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!! - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND}" -# test? ( -# !!!groupId-not-found!!! -# ) -#" - -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="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" -# 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.databind.cfg:g' \ - -e "s:@projectversion@:${PV}:g" \ - -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \ - -e "s:@projectartifactid@:${PN}:g" \ - "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \ - > "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild deleted file mode 100644 index c5854f85e438..000000000000 --- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild +++ /dev/null @@ -1,110 +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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2" -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.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.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7: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:0 - dev-java/woodstox-core:0 -" - -# Compile dependencies -# POM: pom.xml -# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2: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-1.8:* - ${CP_DEPEND} - test? ( - ~dev-java/jackson-module-jakarta-xmlbind-${PV}:0 - dev-java/jaxb-api:3 - dev-java/sjsxp:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -DOCS=( README.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-3,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 -} - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild deleted file mode 100644 index a324875e0e97..000000000000 --- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild +++ /dev/null @@ -1,79 +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-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions" -HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text" -SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# 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 -# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0 - -CP_DEPEND=" - ~dev-java/jackson-core-${PV}:0 - ~dev-java/jackson-databind-${PV}:0 - dev-java/snakeyaml:0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -DOCS=( README.md release-notes/{CREDITS,VERSION} ) - -S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml" - -JAVA_SRC_DIR=( "src/main/java" "src/moditect" ) -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's usual exclude pattern: "**/failing**/*.java" - com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test - com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test - com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test -) - -src_prepare() { - default - java-pkg-2_src_prepare - - sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml: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/yaml/PackageVersion.java.in" \ - > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die - - # dev-java/snakeyaml-1.30 does not provide module-info - sed -e '/snakeyaml;/d' -i src/moditect/module-info.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.2.ebuild deleted file mode 100644 index 18d572895a82..000000000000 --- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild +++ /dev/null @@ -1,83 +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-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 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2" -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" - -# 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.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-api:1 - dev-java/jaxb-api:3 -" - -# 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-1.8:* - ${CP_DEPEND}" -# test? ( -# !!!groupId-not-found!!! -# ) -#" - -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" ) -JAVA_RESOURCE_DIRS="src/main/resources" - -# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!" -# JAVA_TEST_SRC_DIR="src/test/java" - -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/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 8e8e960e5e21..197078c8dcba 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,2 +1 @@ -DIST tomcat-native-1.2.32-src.tar.gz 429747 BLAKE2B 48fd1d93866cd4c4e610d54a65b429a31be27a90507bf28c547c2127218896646b385eb9741af3eba46d2dd3534b998352c7ab655dbb02dd8a646127e5bfaad3 SHA512 97587fdec8f12550003db44ae41cb864a16c08fc9362ca4c709b8090ead178d4f9d841436699b29496004b412a097ed5f56655f4fddfc5f4b6e333cbf890423e DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f diff --git a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild deleted file mode 100644 index 39a5c2b3e960..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.2.32.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Allows Tomcat to use certain native resources for better performance" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" - -KEYWORDS="amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/apr:1= - dev-libs/openssl:0= - >=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - -S=${WORKDIR}/${P}-src - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_configure() { - local myeconfargs=( - --with-apr="${EPREFIX}"/usr/bin/apr-1-config - --with-ssl="${EPREFIX}"/usr - ) - - cd native || die - econf "${myeconfargs[@]}" -} - -src_compile() { - eant jar - - cd native || die - default -} - -src_install() { - java-pkg_newjar "dist/${P}.jar" "${PN}.jar" - - cd native || die - default - - ! use static-libs && find "${D}" -name '*.la' -delete || die -} - -src_test() { - java-pkg-2_src_test -} - -pkg_postinst() { - elog "For more information, please visit" - elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" -} diff --git a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild index 1d527ab32b16..39a5c2b3e960 100644 --- a/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild +++ b/dev-java/tomcat-native/tomcat-native-1.2.33.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc HOMEPAGE="https://tomcat.apache.org/" SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="Apache-2.0" SLOT="0" IUSE="static-libs test" diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index d5fbce26304a..91b8a7651e3c 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -9,3 +9,4 @@ DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d8 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 +DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild new file mode 100644 index 000000000000..09fffd263372 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="4.0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${MY_P}/" + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package + + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} -- cgit v1.3