diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/joda-time/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/joda-time/joda-time-2.11.2.ebuild | 95 | ||||
| -rw-r--r-- | dev-java/snakeyaml/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/snakeyaml/snakeyaml-1.33.ebuild (renamed from dev-java/snakeyaml/snakeyaml-1.31.ebuild) | 32 |
4 files changed, 107 insertions, 23 deletions
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest index 1ce8b77b7124..f88a1d4f314c 100644 --- a/dev-java/joda-time/Manifest +++ b/dev-java/joda-time/Manifest @@ -1,2 +1,3 @@ DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1 DIST joda-time-2.11.0.tar.gz 1055531 BLAKE2B 98b64e0419a1b7379d3467d012a1162afedb537048c86f8e9069ef5e21649dfe01d458a8e74ccb5dc052940b6edd2eba73ad86ae25bc20d3e62ec73a7a56a605 SHA512 357c8b3d1cc1cdd164cf2486a55ab9489db43c4243f140da5c21ee84bc3a801f51e2e2c2a257dbe2d2ce41bc33c676854136eddf3606ed7da69dcd3a10b2d010 +DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3 diff --git a/dev-java/joda-time/joda-time-2.11.2.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild new file mode 100644 index 000000000000..127dbb0f8733 --- /dev/null +++ b/dev-java/joda-time/joda-time-2.11.2.ebuild @@ -0,0 +1,95 @@ +# 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/JodaOrg/joda-time/archive/v2.11..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.11..ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="joda-time:joda-time:2.11.2" +JAVA_TESTING_FRAMEWORKS="junit" + +inherit edo java-pkg-2 java-pkg-simple + +DESCRIPTION="Date and time library to replace JDK date handling" +HOMEPAGE="https://www.joda.org/joda-time/" +SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + +# Common dependencies +# POM: pom.xml +# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0 + +CP_DEPEND="dev-java/joda-convert:0" + +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND}" + +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND}" + +PATCHES=( + # Enable tests for jdk-11 in + # src/test/java/org/joda/time/TestDateTimeZone.java + "${FILESDIR}/joda-time-2.11.0-test.patch" +) + +DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt ) + +S="${WORKDIR}/${P}" + +JAVA_AUTOMATIC_MODULE_NAME="org.joda.time" +JAVA_RESOURCE_DIRS="src/main/res" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default + # move .properties files to JAVA_RESOURCE_DIRS + mkdir -p src/main/res + cp -r src/main/{java/*,res} || die + find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die +} + +src_compile() { + java-pkg-simple_src_compile + + # Generate the missing "org/joda/time/tz/data/ZoneInfoMap" + # Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427 + edo "$(java-config -J)" \ + -cp ${PN}.jar \ + org.joda.time.tz.ZoneInfoCompiler \ + -src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \ + -dst "${P}/src/main/resources/org/joda/time/tz/data" \ + africa \ + antarctica \ + asia \ + australasia \ + europe \ + northamerica \ + southamerica \ + etcetera \ + backward + + java-pkg_addres ${PN}.jar "${P}"/src/main/resources +} + +src_test() { + # There are test failures in + # src/test/java/org/joda/time/TestDateTimeZone.java + # with jdk higher than 11 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -le 11 ; then + java-pkg-simple_src_test + else + einfo "Tests restricted to <=jdk-11" + fi +} diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest index 6e4530b6dd01..9b7bb7dc83e5 100644 --- a/dev-java/snakeyaml/Manifest +++ b/dev-java/snakeyaml/Manifest @@ -1,2 +1,2 @@ DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908 -DIST snakeyaml-1.31.tar.gz 407514 BLAKE2B 88d600aae5ba7dc5e1877a020082878e20fff7a30d9ff799d358e53e96da01bc8478bd5966c1058de186198d6ef10431480f8b2644d5fdb7e87dca462d9addee SHA512 e5c56cb4ad8ee68e41da63351f39be48ef9ceb50239580d1de1f7a331d66d92fd9aa9b26b4ba6dcb9db6c5acc682c7c2098b3468d32e73bdd2dbf4d07bcc5c55 +DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414 diff --git a/dev-java/snakeyaml/snakeyaml-1.31.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild index 1b37722f47ac..f9978f4168dc 100644 --- a/dev-java/snakeyaml/snakeyaml-1.31.ebuild +++ b/dev-java/snakeyaml/snakeyaml-1.33.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://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.31.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.31.ebuild +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.33.ebuild EAPI=8 JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.yaml:snakeyaml:1.31" +MAVEN_ID="org.yaml:snakeyaml:1.33" JAVA_TESTING_FRAMEWORKS="junit-4" inherit java-pkg-2 java-pkg-simple @@ -22,10 +22,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" # Compile dependencies # POM: pom.xml -# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.14:0 -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 +# test? joda-time:joda-time:2.11.2 -> >=dev-java/joda-time-2.11.2:0 +# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 # test? org.apache.velocity:velocity-engine-core:2.3 -> >=dev-java/velocity-2.3:0 -# test? org.projectlombok:lombok:1.18.22 -> !!!groupId-not-found!!! +# test? org.projectlombok:lombok:1.18.24 -> !!!groupId-not-found!!! DEPEND=" >=virtual/jdk-1.8:* @@ -37,14 +37,14 @@ DEPEND=" RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/snakeyaml-snakeyaml-04401a88fa9b" +S="${WORKDIR}/snakeyaml-snakeyaml-7f5106920d77" -JAVA_SRC_DIR="src/main/java" JAVA_AUTOMATIC_MODULE_NAME="org.yaml.snakeyaml" +JAVA_SRC_DIR="src/main/java" JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity" -JAVA_TEST_SRC_DIR="src/test/java" JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" src_test() { export EnvironmentKey1="EnvironmentValue1" @@ -55,26 +55,14 @@ src_test() { rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die # Tests run: 1 rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die # No tests - # There were 2 failures: - https://bugs.gentoo.org/868681 - # 1) yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest) - # java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml - # at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476) - # at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589) - # at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522) - # at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.yamlClassInYAMLCL(ContextClassLoaderTest.java:127) - # 2) domainInDifferentConstructor(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest) - # java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml - # at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:476) - # at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:589) - # at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522) - # at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135) - + # https://bugs.gentoo.org/871744 pushd src/test/java || die local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \ ! -name "StressTest.java" \ ! -name "ParallelTest.java" \ ! -name "AbstractTest.java" \ ! -name "PyImportTest.java" \ + ! -name "Fuzzer50355Test.java" \ ! -name "ContextClassLoaderTest.java" \ ) popd |