From b89a664f266dab3b9b5ddac2cb874f8869142370 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 13 Oct 2022 01:41:21 +0100 Subject: gentoo auto-resync : 13:10:2022 - 01:41:21 --- dev-java/snakeyaml/Manifest | 5 +- .../files/snakeyaml-1.30-fix-test-check.patch | 18 ----- dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild | 91 ---------------------- dev-java/snakeyaml/snakeyaml-1.33.ebuild | 2 +- 4 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch delete mode 100644 dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild (limited to 'dev-java/snakeyaml') diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest index 14243df398c4..a3e32ce71897 100644 --- a/dev-java/snakeyaml/Manifest +++ b/dev-java/snakeyaml/Manifest @@ -1,6 +1,3 @@ -AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1 -DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414 -EBUILD snakeyaml-1.30-r1.ebuild 3101 BLAKE2B 1da7c1e114acd0fa56f9f0c6b9870d08ac7fb582cdf31ffb7e82bee10bc90f441c0945ac002b0419ab18c0052b4c1d2622b0d6ecae380c97c0fc58c82ef26822 SHA512 03d2025bf591ef340493e731bb227eb6d0f7fa7de2d1d5897df2aa949c5bbada51b185f9dbbf8ba502125d6cb1cb253cc38a41c5cf77b82a4ea496c9baf7919f -EBUILD snakeyaml-1.33.ebuild 2340 BLAKE2B 13863c65df254418eb21a1e639622f9f281f53d8d16c3100a7e8606554a108280ff3976ca646c276736702062a3265be4f8a7a0cc14a62dd6c0f47584bd7156e SHA512 da976d6974761c102e0dce2efbdd230d2845cbd1306d5323311054428f8036a61ad51f5daf41e09b5454078fa71b19a899f1cf37046d05fcaa1f479a0b6db41b +EBUILD snakeyaml-1.33.ebuild 2339 BLAKE2B 798becfef801473ced001ec15e00a5ddc799369e5a97eff1140236716fe463d592b68eb0ea9f0b5395b1956575ee0b6e070f631fbe135d546f988d945b574f85 SHA512 a9192e54c120b9469ec55d52fd2cfc7ca84e553da4b93ef6c0b2e4495bf5bbd49a65130fcda7a4f38a5d6cf4deda7d190bc50d65259d183af5d3b93deb8f5c9f 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 deleted file mode 100644 index f2742f658fa2..000000000000 --- a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/snakeyaml-1.30-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild deleted file mode 100644 index 8dd5b2edb63c..000000000000 --- a/dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild +++ /dev/null @@ -1,91 +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://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_AUTOMATIC_MODULE_NAME="org.yaml.snakeyaml" - -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 -} diff --git a/dev-java/snakeyaml/snakeyaml-1.33.ebuild b/dev-java/snakeyaml/snakeyaml-1.33.ebuild index 0133ab59aa1b..b2ec55291db0 100644 --- a/dev-java/snakeyaml/snakeyaml-1.33.ebuild +++ b/dev-java/snakeyaml/snakeyaml-1.33.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # Compile dependencies # POM: pom.xml -- cgit v1.2.3