commit: c733fc136cefaa18f8ea9dfe9a3934608c5dcd0b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 26 06:12:05 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 06:48:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c733fc13
dev-java/snakeyaml: drop 1.28-r1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/snakeyaml/Manifest | 1 -
.../files/snakeyaml-1.28-fix-test-check.patch | 14 ----
dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild | 95 ----------------------
3 files changed, 110 deletions(-)
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index a4c33c19b816..9fabc3068f10 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,2 +1 @@
-DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B
054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a
SHA512
2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B
1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07
SHA512
9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
deleted file mode 100644
index fe903380fd61..000000000000
--- a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git
a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-index e87f330..28c836b 100644
----
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,8 @@ public class BillionLaughsAttackTest {
- map.toString();
- fail("Expected overflow");
- } catch (Throwable e) {
-- assertTrue(e.getMessage().contains("heap"));
-+ final String message = e.getMessage();
-+ assertTrue(message == null || message.contains("heap"));
- }
- }
-
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
deleted file mode 100644
index 771b05ba5ef1..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 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/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz --slot 0
--keywords "~amd64 ~x86" --ebuild snakeyaml-1.28-r1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.yaml:snakeyaml:1.28"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_COMMIT="b28f0b4d87c6"
-MY_P="asomov-snakeyaml-${MY_COMMIT}"
-
-DESCRIPTION="YAML 1.1 parser and emitter for Java"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml";
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1
-# 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.1:4
-# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4
-# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/commons-io-2.4:1
- dev-java/commons-lang:3.6
- >=dev-java/joda-time-2.10.10:0
- >=dev-java/velocity-1.7:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-test-check.patch"
-)
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- "examples.spring.TestEntityDescription" # Invalid test class
- "org.yaml.snakeyaml.constructor.TestBean1" # Invalid test class
- "org.yaml.snakeyaml.introspector.TestAnnotation" # Invalid test
class
- "org.yaml.snakeyaml.introspector.TestBean" # Invalid test class
- "org.yaml.snakeyaml.ruby.TestObject" # Invalid test class
- "org.yaml.snakeyaml.issues.issue154.TestBean" # Invalid test class
- "org.yaml.snakeyaml.issues.issue193.TestYaml" # Invalid test class
-
- # initializationError(org.yaml.snakeyaml.constructor.TestBean)
- # java.lang.IllegalArgumentException: Test class can only have one
constructor
- "org.yaml.snakeyaml.constructor.TestBean"
-
- # testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest)
- # java.lang.NullPointerException
- "org.yaml.snakeyaml.emitter.template.VelocityTest"
-
- #
yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
- # java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
- "org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest"
-
- "examples.spring.TestEntity" # Invalid test class
-
- "org.pyyaml.PyImportTest" # No tests found in
org.pyyaml.PyImportTest
-)
-
-src_prepare() {
- default
- java-utils-2_src_prepare
-}
-
-src_test() {
- export EnvironmentKey1="EnvironmentValue1"
- export EnvironmentEmpty=""
- java-pkg-simple_src_test
-}
