From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-java/snakeyaml/Manifest | 5 +- .../files/snakeyaml-1.30-fix-test-check.patch | 18 ++++ dev-java/snakeyaml/metadata.xml | 5 +- dev-java/snakeyaml/snakeyaml-1.30.ebuild | 95 ++++++++++++++++++++++ 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch create mode 100644 dev-java/snakeyaml/snakeyaml-1.30.ebuild (limited to 'dev-java/snakeyaml') diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest index 02c7996972eb..41d05244861a 100644 --- a/dev-java/snakeyaml/Manifest +++ b/dev-java/snakeyaml/Manifest @@ -1,4 +1,7 @@ AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8 +AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c +DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908 EBUILD snakeyaml-1.28-r1.ebuild 2964 BLAKE2B bf8a1757ad1d41516cc55ac05737d48c6dbc681fe33fd8ead62de25a1fb0006059c778858e945c85bab913a37928869d33281ada50e4c6b8e7afbddb98dd38be SHA512 a70b5a39e84eb98623536a9e3eafee142c1d99f50697680b9f9b6db4415c247a9a7053294cbdbc9dbc6d75a3d2b6e2b22e0c30e1763d8b13584b12bba5a84570 -MISC metadata.xml 321 BLAKE2B 289b6f22e9b660717461d5da64ab6fc7543bc6d46dc803e79ac0694ad1836297469eec4ab224b1c5dccf8a77e7e750b688e0cfcdab371506aff143fce090794c SHA512 b4a92e6a613847f4b8d59e723505b223ee34cc03a31ab656b5d4f8424ff76f3073ec626dbe4ef6cabb93674c62a4ac923756d05bec8a110c25f0b9880effa5d7 +EBUILD snakeyaml-1.30.ebuild 3147 BLAKE2B 7ecb31f84c2f779f31e5cd3d22ab09a5e54dc77d1d6865adeffd8b59d4fa36614300d27acbf133c184a97c16cbafc81aa67851534549646e5171b16f70715097 SHA512 6784de89821f053ceb8f8164ad58bae8d4c89db74bef105aeb0c4e95839a59b15d6f3a23a4fc8accb8d2fc919cc16ed95ba463710574c84a7fe3b490bf9c1fbf +MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61 diff --git a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch new file mode 100644 index 000000000000..f2742f658fa2 --- /dev/null +++ b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch @@ -0,0 +1,18 @@ +--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java ++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java +@@ -69,7 +69,7 @@ public class BillionLaughsAttackTest { + map.toString(); + fail("Expected overflow"); + } catch (Throwable e) { +- assertTrue(e.getMessage().contains("heap")); ++ assertTrue("Catched exception " + e + " is not an instance of OutOfMemoryError", e instanceof OutOfMemoryError); + } + } + +@@ -94,4 +94,4 @@ public class BillionLaughsAttackTest { + assertNotNull(map); + } + +-} +\ No newline at end of file ++} diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml index 48c5a4489132..6bb50777c8e8 100644 --- a/dev-java/snakeyaml/metadata.xml +++ b/dev-java/snakeyaml/metadata.xml @@ -6,6 +6,9 @@ Java - asomov/snakeyaml + snakeyaml/snakeyaml + https://bitbucket.org/snakeyaml/snakeyaml/wiki/Changes + https://bitbucket.org/snakeyaml/snakeyaml/issues + https://bitbucket.org/snakeyaml/snakeyaml/wiki/Documentation diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild new file mode 100644 index 000000000000..6ae8d5e2d63e --- /dev/null +++ b/dev-java/snakeyaml/snakeyaml-1.30.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://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild snakeyaml-1.30.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.yaml:snakeyaml:1.30" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="YAML 1.1 parser and emitter for Java" +HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml" +SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +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.10:0 +# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 +# test? org.apache.velocity:velocity:1.6.2 -> !!!artifactId-not-found!!! + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/velocity:0 + dev-java/joda-time:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7 +PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" ) +DOCS=( README.md ) + +S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/" + +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" + +src_prepare() { + default + java-utils-2_src_prepare +} + +src_test() { + export EnvironmentKey1="EnvironmentValue1" + export EnvironmentEmpty="" + + # There were 2 failures: + # 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) + + 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 "ContextClassLoaderTest.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 +} -- cgit v1.2.3