1 |
commit: c733fc136cefaa18f8ea9dfe9a3934608c5dcd0b |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Tue Apr 26 06:12:05 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 26 06:48:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c733fc13 |
7 |
|
8 |
dev-java/snakeyaml: drop 1.28-r1 |
9 |
|
10 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
11 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
12 |
|
13 |
dev-java/snakeyaml/Manifest | 1 - |
14 |
.../files/snakeyaml-1.28-fix-test-check.patch | 14 ---- |
15 |
dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild | 95 ---------------------- |
16 |
3 files changed, 110 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest |
19 |
index a4c33c19b816..9fabc3068f10 100644 |
20 |
--- a/dev-java/snakeyaml/Manifest |
21 |
+++ b/dev-java/snakeyaml/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c |
24 |
DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908 |
25 |
|
26 |
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 |
27 |
deleted file mode 100644 |
28 |
index fe903380fd61..000000000000 |
29 |
--- a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch |
30 |
+++ /dev/null |
31 |
@@ -1,14 +0,0 @@ |
32 |
-diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java |
33 |
-index e87f330..28c836b 100644 |
34 |
---- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java |
35 |
-+++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java |
36 |
-@@ -69,7 +69,8 @@ public class BillionLaughsAttackTest { |
37 |
- map.toString(); |
38 |
- fail("Expected overflow"); |
39 |
- } catch (Throwable e) { |
40 |
-- assertTrue(e.getMessage().contains("heap")); |
41 |
-+ final String message = e.getMessage(); |
42 |
-+ assertTrue(message == null || message.contains("heap")); |
43 |
- } |
44 |
- } |
45 |
- |
46 |
|
47 |
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild |
48 |
deleted file mode 100644 |
49 |
index 771b05ba5ef1..000000000000 |
50 |
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,95 +0,0 @@ |
53 |
-# Copyright 1999-2021 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-# Skeleton command: |
57 |
-# 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 |
58 |
- |
59 |
-EAPI=7 |
60 |
- |
61 |
-JAVA_PKG_IUSE="doc source test" |
62 |
-MAVEN_ID="org.yaml:snakeyaml:1.28" |
63 |
-JAVA_TESTING_FRAMEWORKS="junit-4" |
64 |
- |
65 |
-inherit java-pkg-2 java-pkg-simple |
66 |
- |
67 |
-MY_COMMIT="b28f0b4d87c6" |
68 |
-MY_P="asomov-snakeyaml-${MY_COMMIT}" |
69 |
- |
70 |
-DESCRIPTION="YAML 1.1 parser and emitter for Java" |
71 |
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml" |
72 |
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz" |
73 |
- |
74 |
-LICENSE="Apache-2.0" |
75 |
-SLOT="0" |
76 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86" |
77 |
- |
78 |
-# Compile dependencies |
79 |
-# POM: pom.xml |
80 |
-# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1 |
81 |
-# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0 |
82 |
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4 |
83 |
-# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4 |
84 |
-# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0 |
85 |
- |
86 |
-DEPEND=" |
87 |
- >=virtual/jdk-1.8:* |
88 |
- test? ( |
89 |
- >=dev-java/commons-io-2.4:1 |
90 |
- dev-java/commons-lang:3.6 |
91 |
- >=dev-java/joda-time-2.10.10:0 |
92 |
- >=dev-java/velocity-1.7:0 |
93 |
- ) |
94 |
-" |
95 |
- |
96 |
-RDEPEND=" |
97 |
- >=virtual/jre-1.8:* |
98 |
-" |
99 |
- |
100 |
-S="${WORKDIR}/${MY_P}" |
101 |
- |
102 |
-PATCHES=( |
103 |
- "${FILESDIR}/${P}-fix-test-check.patch" |
104 |
-) |
105 |
- |
106 |
-JAVA_SRC_DIR="src/main/java" |
107 |
- |
108 |
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity" |
109 |
-JAVA_TEST_SRC_DIR="src/test/java" |
110 |
-JAVA_TEST_RESOURCE_DIRS="src/test/resources" |
111 |
- |
112 |
-JAVA_TEST_EXCLUDES=( |
113 |
- "examples.spring.TestEntityDescription" # Invalid test class |
114 |
- "org.yaml.snakeyaml.constructor.TestBean1" # Invalid test class |
115 |
- "org.yaml.snakeyaml.introspector.TestAnnotation" # Invalid test class |
116 |
- "org.yaml.snakeyaml.introspector.TestBean" # Invalid test class |
117 |
- "org.yaml.snakeyaml.ruby.TestObject" # Invalid test class |
118 |
- "org.yaml.snakeyaml.issues.issue154.TestBean" # Invalid test class |
119 |
- "org.yaml.snakeyaml.issues.issue193.TestYaml" # Invalid test class |
120 |
- |
121 |
- # initializationError(org.yaml.snakeyaml.constructor.TestBean) |
122 |
- # java.lang.IllegalArgumentException: Test class can only have one constructor |
123 |
- "org.yaml.snakeyaml.constructor.TestBean" |
124 |
- |
125 |
- # testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest) |
126 |
- # java.lang.NullPointerException |
127 |
- "org.yaml.snakeyaml.emitter.template.VelocityTest" |
128 |
- |
129 |
- # yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest) |
130 |
- # java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml |
131 |
- "org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest" |
132 |
- |
133 |
- "examples.spring.TestEntity" # Invalid test class |
134 |
- |
135 |
- "org.pyyaml.PyImportTest" # No tests found in org.pyyaml.PyImportTest |
136 |
-) |
137 |
- |
138 |
-src_prepare() { |
139 |
- default |
140 |
- java-utils-2_src_prepare |
141 |
-} |
142 |
- |
143 |
-src_test() { |
144 |
- export EnvironmentKey1="EnvironmentValue1" |
145 |
- export EnvironmentEmpty="" |
146 |
- java-pkg-simple_src_test |
147 |
-} |