dev-java/snakeyaml: add 2.5

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/44063 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
2026-01-10 00:04:51 +03:00 · 2025-02-13 09:23:33 +01:00
parent d76fe406ac
commit a0038366ca
3 changed files with 130 additions and 0 deletions
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1 +1,3 @@
+DIST lombok-1.18.30.jar 2011339 BLAKE2B 052f0eff4f3c4d3669e7c7f9d62a26d76733a079c995f5a62234112b6e7cd4bb1f9ed0b3655c588323aceda7acdae7bd5dcc62d1f411e5417f83e5c74cbdad02 SHA512 432978b662744078f86e2e808c692744be31a49ce5bd1ff9188158b1ed262da0b25adf5a5eff23cf6bce1f98df12e424e6e14e6ed34bc22e00b4cb9c8f743135
 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
+DIST snakeyaml-2.5.tar.gz 429266 BLAKE2B 80058ef17d91afe3921c481da0f89dc939c17f08ee8ab07672c36a4d6f6b2d47d8e342fe4fc8da8acd77589d5a45f733425bc7ec84ecc1b5e68a43459c1af33f SHA512 ecaaf94a17f67f10e57cee7441f93a75ebfc511229707bdfdd524964e0843f480d4fb28d489b3f14a09c9566eb9bfa10945267249d8494968ac89ce23f9b3546
--- a/dev-java/snakeyaml/files/snakeyaml-2.5-skipFailingTests.patch
+++ b/dev-java/snakeyaml/files/snakeyaml-2.5-skipFailingTests.patch
@@ -0,0 +1,42 @@
+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:445)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:592)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525)
+	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.inspector.TagInspector
+	at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:445)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:592)
+	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:525)
+	at org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest.domainInDifferentConstructor(ContextClassLoaderTest.java:135)
+
+FAILURES!!!
+Tests run: 3,  Failures: 2
+
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
+@@ -30,6 +30,7 @@ import java.util.Properties;
+ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Test;
+import org.junit.Ignore;
+ import org.yaml.snakeyaml.LoaderOptions;
+ import org.yaml.snakeyaml.Yaml;
+ import org.yaml.snakeyaml.inspector.TagInspector;
+@@ -122,12 +123,12 @@ public class ContextClassLoaderTest {
+     yamlCL.loadClass(DomainBean.class.getName());
+   }
+ 
+-  @Test
+  @Test @Ignore
+   public void yamlClassInYAMLCL() throws ClassNotFoundException {
+     yamlCL.loadClass(Yaml.class.getName());
+   }
+ 
+-  @Test
+  @Test @Ignore
+   public void domainInDifferentConstructor() throws ClassNotFoundException, InstantiationException,
+       IllegalAccessException, NoSuchMethodException, SecurityException, IllegalArgumentException,
+       InvocationTargetException {
--- a/dev-java/snakeyaml/snakeyaml-2.5.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-2.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+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"
+LV="1.18.30"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz
+	test? ( https://repo.maven.apache.org/maven2/org/projectlombok/lombok/${LV}/lombok-${LV}.jar )"
+S="${WORKDIR}/snakeyaml-snakeyaml-225cf7b0166c"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/jackson-core-2.20.0:0
+		>=dev-java/jackson-databind-2.20.0:0
+		>=dev-java/jackson-dataformat-yaml-2.20.0:0
+		>=dev-java/jmh-core-1.37:0
+		>=dev-java/velocity-2.4.1:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}/snakeyaml-2.5-skipFailingTests.patch" )
+
+JAVA_INTERMEDIATE_JAR_NAME="org.yaml.snakeyaml"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/main/java9" )
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	jackson-core
+	jackson-databind
+	jackson-dataformat-yaml
+	jmh-core
+	junit-4
+	velocity
+"
+
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# JSR-310
+	# Since Java 8, the Joda-Time library has been integrated into the JDK as a new package 'java.time'.
+	rm -r src/test/java/examples/jodatime || die "jodatime"
+}
+
+src_test() {
+	export EnvironmentKey1="EnvironmentValue1"
+	export EnvironmentEmpty=""
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 25; then
+		einfo "Removing 2 Tests which on Java 25 won't even compile"
+		rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java || die "rm EnvLombokTest"
+		rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die "rm Yaml...ContextTest"
+		rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die "rm ApplicationProperties.java"
+	else
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/lombok-${LV}.jar"	# Presently not packaged
+	fi
+
+	local JAVA_TEST_RUN_ONLY=$(find src/test/java -name '*Test.java' \
+		! -name 'AbstractTest.java' \
+		! -name 'PyImportTest.java' -printf "%P\n")
+
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+
+	java-pkg-simple_src_test
+}