Sync from SUSE:SLFO:Main snakeyaml revision f794fe9fd90e780951aa62e9650216b0
This commit is contained in:
parent
0edc19413c
commit
5bec381a84
|
|
@ -1,29 +1,55 @@
|
|||
From cdee7ec34fb56a84ae4dc6ccb21d5f07c2392df1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Wed, 12 Oct 2022 10:54:38 +0200
|
||||
Subject: [PATCH 1/3] replace bundled base64coder with java.util.Base64
|
||||
From 6519dac7af0b7fed04b3dfeaada0023ea75fa881 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Somov <public.somov@gmail.com>
|
||||
Date: Sat, 6 Apr 2024 16:56:51 +0400
|
||||
Subject: [PATCH 1/2] Remove external Base64Coder and use provided Base64
|
||||
|
||||
---
|
||||
.../constructor/SafeConstructor.java | 4 +-
|
||||
pom.xml | 6 +-
|
||||
.../constructor/SafeConstructor.java | 14 +-
|
||||
.../external/biz/base64Coder/Base64Coder.java | 281 ------------------
|
||||
.../representer/SafeRepresenter.java | 10 +-
|
||||
.../base64Coder/Base64CoderTest.java | 16 +-
|
||||
4 files changed, 14 insertions(+), 297 deletions(-)
|
||||
.../representer/SafeRepresenter.java | 22 +-
|
||||
.../base64Coder/Base64CoderTest.java | 17 +-
|
||||
.../issues/issue99/YamlBase64Test.java | 8 +-
|
||||
6 files changed, 22 insertions(+), 326 deletions(-)
|
||||
delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e4b15074..c242d07d 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -10,9 +10,9 @@
|
||||
<project.scm.id>bitbucket</project.scm.id>
|
||||
<release.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</release.repo.url>
|
||||
<snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots/</snapshot.repo.url>
|
||||
- <maven.compiler.source>7</maven.compiler.source>
|
||||
- <maven.compiler.target>7</maven.compiler.target>
|
||||
- <maven.compiler.release>7</maven.compiler.release>
|
||||
+ <maven.compiler.source>8</maven.compiler.source>
|
||||
+ <maven.compiler.target>8</maven.compiler.target>
|
||||
+ <maven.compiler.release>8</maven.compiler.release>
|
||||
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
|
||||
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
|
||||
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version><!-- for Github CI -->
|
||||
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||
index e124489e..9ec73ccd 100644
|
||||
index e6dcd406..5ddeb13f 100644
|
||||
--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||
+++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||
@@ -15,6 +15,7 @@ package org.yaml.snakeyaml.constructor;
|
||||
@@ -14,21 +14,11 @@
|
||||
package org.yaml.snakeyaml.constructor;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.util.ArrayList;
|
||||
+import java.util.Base64;
|
||||
import java.util.Calendar;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
@@ -28,7 +29,6 @@ import java.util.regex.Matcher;
|
||||
-import java.util.ArrayList;
|
||||
-import java.util.Calendar;
|
||||
-import java.util.HashMap;
|
||||
-import java.util.Iterator;
|
||||
-import java.util.LinkedHashMap;
|
||||
-import java.util.List;
|
||||
-import java.util.Map;
|
||||
-import java.util.Set;
|
||||
-import java.util.TimeZone;
|
||||
-import java.util.TreeSet;
|
||||
+import java.util.*;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import org.yaml.snakeyaml.LoaderOptions;
|
||||
import org.yaml.snakeyaml.error.YAMLException;
|
||||
|
|
@ -31,7 +57,7 @@ index e124489e..9ec73ccd 100644
|
|||
import org.yaml.snakeyaml.nodes.MappingNode;
|
||||
import org.yaml.snakeyaml.nodes.Node;
|
||||
import org.yaml.snakeyaml.nodes.NodeId;
|
||||
@@ -389,7 +389,7 @@ public class SafeConstructor extends BaseConstructor {
|
||||
@@ -386,7 +376,7 @@ public class SafeConstructor extends BaseConstructor {
|
||||
public Object construct(Node node) {
|
||||
// Ignore white spaces for base64 encoded scalar
|
||||
String noWhiteSpaces = constructScalar((ScalarNode) node).replaceAll("\\s", "");
|
||||
|
|
@ -328,18 +354,26 @@ index db43b474..00000000
|
|||
-
|
||||
-} // end class Base64Coder
|
||||
diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||
index f0951fb4..fdb5fb8c 100644
|
||||
index 889b573c..d524ea4a 100644
|
||||
--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||
+++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||
@@ -17,6 +17,7 @@ import java.math.BigInteger;
|
||||
@@ -15,22 +15,10 @@ package org.yaml.snakeyaml.representer;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
+import java.util.Base64;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
@@ -30,7 +31,6 @@ import java.util.UUID;
|
||||
-import java.util.ArrayList;
|
||||
-import java.util.Arrays;
|
||||
-import java.util.Calendar;
|
||||
-import java.util.Date;
|
||||
-import java.util.HashMap;
|
||||
-import java.util.Iterator;
|
||||
-import java.util.LinkedHashMap;
|
||||
-import java.util.List;
|
||||
-import java.util.Map;
|
||||
-import java.util.Set;
|
||||
-import java.util.TimeZone;
|
||||
-import java.util.UUID;
|
||||
+import java.util.*;
|
||||
import java.util.regex.Pattern;
|
||||
import org.yaml.snakeyaml.DumperOptions;
|
||||
import org.yaml.snakeyaml.error.YAMLException;
|
||||
|
|
@ -347,57 +381,49 @@ index f0951fb4..fdb5fb8c 100644
|
|||
import org.yaml.snakeyaml.nodes.Node;
|
||||
import org.yaml.snakeyaml.nodes.Tag;
|
||||
import org.yaml.snakeyaml.reader.StreamReader;
|
||||
@@ -124,7 +124,6 @@ class SafeRepresenter extends BaseRepresenter {
|
||||
if (nonPrintableStyle == DumperOptions.NonPrintableStyle.BINARY
|
||||
&& !StreamReader.isPrintable(value)) {
|
||||
tag = Tag.BINARY;
|
||||
- char[] binary;
|
||||
final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
|
||||
// sometimes above will just silently fail - it will return incomplete data
|
||||
// it happens when String has invalid code points
|
||||
@@ -133,8 +132,7 @@ class SafeRepresenter extends BaseRepresenter {
|
||||
@@ -127,8 +115,7 @@ class SafeRepresenter extends BaseRepresenter {
|
||||
if (!checkValue.equals(value)) {
|
||||
throw new YAMLException("invalid string value has occurred");
|
||||
}
|
||||
- binary = Base64Coder.encode(bytes);
|
||||
- char[] binary = Base64Coder.encode(bytes);
|
||||
- value = String.valueOf(binary);
|
||||
+ value = Base64.getEncoder().encodeToString(bytes);
|
||||
style = DumperOptions.ScalarStyle.LITERAL;
|
||||
}
|
||||
// if no other scalar style is explicitly set, use literal style for
|
||||
@@ -455,8 +453,8 @@ class SafeRepresenter extends BaseRepresenter {
|
||||
@@ -449,8 +436,9 @@ class SafeRepresenter extends BaseRepresenter {
|
||||
protected class RepresentByteArray implements Represent {
|
||||
|
||||
public Node representData(Object data) {
|
||||
- char[] binary = Base64Coder.encode((byte[]) data);
|
||||
- return representScalar(Tag.BINARY, String.valueOf(binary), DumperOptions.ScalarStyle.LITERAL);
|
||||
+ String binary = Base64.getEncoder().encodeToString((byte[]) data);
|
||||
+ return representScalar(Tag.BINARY, binary, DumperOptions.ScalarStyle.LITERAL);
|
||||
+ String encoded = Base64.getEncoder().encodeToString((byte[]) data);
|
||||
+ return representScalar(Tag.BINARY, String.valueOf(encoded),
|
||||
+ DumperOptions.ScalarStyle.LITERAL);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||
index 295eb729..dbe814bf 100644
|
||||
index 295eb729..1bcf0f6c 100644
|
||||
--- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||
+++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||
@@ -13,10 +13,10 @@
|
||||
*/
|
||||
package biz.source_code.base64Coder;
|
||||
@@ -15,8 +15,9 @@ package biz.source_code.base64Coder;
|
||||
|
||||
+import java.util.Base64;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
+import java.util.Base64;
|
||||
+
|
||||
import junit.framework.TestCase;
|
||||
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
|
||||
|
||||
public class Base64CoderTest extends TestCase {
|
||||
|
||||
@@ -30,10 +30,10 @@ public class Base64CoderTest extends TestCase {
|
||||
@@ -30,10 +31,10 @@ public class Base64CoderTest extends TestCase {
|
||||
|
||||
public void testFailure1() throws UnsupportedEncodingException {
|
||||
try {
|
||||
- Base64Coder.decode("YQ=".toCharArray());
|
||||
+ Base64.getDecoder().decode("YQ=".getBytes(StandardCharsets.UTF_8));
|
||||
+ Base64.getDecoder().decode("YQ=");
|
||||
fail();
|
||||
} catch (Exception e) {
|
||||
- assertEquals("Length of Base64 encoded input string is not a multiple of 4.", e.getMessage());
|
||||
|
|
@ -405,30 +431,81 @@ index 295eb729..dbe814bf 100644
|
|||
}
|
||||
}
|
||||
|
||||
@@ -51,18 +51,18 @@ public class Base64CoderTest extends TestCase {
|
||||
@@ -51,18 +52,18 @@ public class Base64CoderTest extends TestCase {
|
||||
|
||||
private void checkInvalid(String encoded) {
|
||||
try {
|
||||
- Base64Coder.decode(encoded.toCharArray());
|
||||
+ Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
|
||||
fail("Illegal chanracter.");
|
||||
- fail("Illegal chanracter.");
|
||||
+ Base64.getDecoder().decode(encoded);
|
||||
+ fail("Illegal character.");
|
||||
} catch (Exception e) {
|
||||
- assertEquals("Illegal character in Base64 encoded data.", e.getMessage());
|
||||
+ assertTrue(e.getMessage().startsWith("Illegal base64 character"));
|
||||
+ assertTrue(e.getMessage().startsWith("Illegal base64 character "));
|
||||
}
|
||||
}
|
||||
|
||||
private void check(String text, String encoded) throws UnsupportedEncodingException {
|
||||
- char[] s1 = Base64Coder.encode(text.getBytes(StandardCharsets.UTF_8));
|
||||
- String t1 = new String(s1);
|
||||
+ byte[] s1 = Base64.getEncoder().encode(text.getBytes(StandardCharsets.UTF_8));
|
||||
+ String t1 = new String(s1, StandardCharsets.UTF_8);
|
||||
+ byte[] s1 = Base64.getEncoder().encode(text.getBytes());
|
||||
String t1 = new String(s1);
|
||||
assertEquals(encoded, t1);
|
||||
- byte[] s2 = Base64Coder.decode(encoded.toCharArray());
|
||||
+ byte[] s2 = Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
|
||||
+ byte[] s2 = Base64.getDecoder().decode(encoded);
|
||||
String t2 = new String(s2, StandardCharsets.UTF_8);
|
||||
assertEquals(text, t2);
|
||||
}
|
||||
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||
index d1fe1f67..220f995e 100644
|
||||
--- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||
@@ -16,6 +16,7 @@ package org.yaml.snakeyaml.issues.issue99;
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
+import java.util.Base64;
|
||||
import java.util.Map;
|
||||
import junit.framework.TestCase;
|
||||
import org.yaml.snakeyaml.LoaderOptions;
|
||||
@@ -24,7 +25,6 @@ import org.yaml.snakeyaml.Yaml;
|
||||
import org.yaml.snakeyaml.YamlDocument;
|
||||
import org.yaml.snakeyaml.constructor.AbstractConstruct;
|
||||
import org.yaml.snakeyaml.constructor.Constructor;
|
||||
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
|
||||
import org.yaml.snakeyaml.nodes.Node;
|
||||
import org.yaml.snakeyaml.nodes.ScalarNode;
|
||||
import org.yaml.snakeyaml.nodes.Tag;
|
||||
@@ -47,12 +47,11 @@ public class YamlBase64Test extends TestCase {
|
||||
all = all + lines[i].trim();
|
||||
}
|
||||
// System.out.println(all);
|
||||
- byte[] decoded = Base64Coder.decode(all.toCharArray());
|
||||
+ byte[] decoded = Base64.getDecoder().decode(all);
|
||||
assertEquals(3737, decoded.length);
|
||||
checkBytes(decoded);
|
||||
}
|
||||
|
||||
- @SuppressWarnings("unchecked")
|
||||
public void testYamlBase64Loading() throws IOException {
|
||||
Yaml yaml = new Yaml();
|
||||
InputStream inputStream =
|
||||
@@ -122,7 +121,7 @@ public class YamlBase64Test extends TestCase {
|
||||
public Object construct(Node node) {
|
||||
String contentWithNewLines = constructScalar((ScalarNode) node);
|
||||
String noNewLines = contentWithNewLines.replaceAll("\\s", "");
|
||||
- byte[] decoded = Base64Coder.decode(noNewLines.toCharArray());
|
||||
+ byte[] decoded = Base64.getDecoder().decode(noNewLines);
|
||||
return decoded;
|
||||
}
|
||||
}
|
||||
@@ -131,7 +130,6 @@ public class YamlBase64Test extends TestCase {
|
||||
/**
|
||||
* Define a local tag to ignore all the white spaces to be able to use literal scalar
|
||||
*/
|
||||
- @SuppressWarnings("unchecked")
|
||||
public void testLocalBinaryTag() throws IOException {
|
||||
Yaml yaml = new Yaml(new SpecialContructor(new Tag("!beautiful")));
|
||||
InputStream inputStream =
|
||||
--
|
||||
2.37.3
|
||||
2.44.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,58 +0,0 @@
|
|||
From 6690e47dfc0d46b4923a5b2c55279782b95a335a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Wed, 12 Oct 2022 11:05:10 +0200
|
||||
Subject: [PATCH 3/3] Fix ReaderBomTest
|
||||
|
||||
---
|
||||
.../yaml/snakeyaml/reader/ReaderBomTest.java | 37 -------------------
|
||||
1 file changed, 37 deletions(-)
|
||||
|
||||
diff --git a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
index c7396c2c..375bb756 100644
|
||||
--- a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
+++ b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
@@ -77,41 +77,4 @@ public class ReaderBomTest extends TestCase {
|
||||
input.close();
|
||||
}
|
||||
|
||||
- public void testUnicodeLeBom() throws IOException {
|
||||
- File file = new File("src/test/resources/reader/unicode-16le.txt");
|
||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
||||
- InputStream input = new FileInputStream(file);
|
||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
||||
- StreamReader reader = new StreamReader(unicodeReader);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('e', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('s', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('\u0000', reader.peek());
|
||||
- assertEquals(StandardCharsets.UTF_16LE, Charset.forName(unicodeReader.getEncoding()));
|
||||
- input.close();
|
||||
- }
|
||||
-
|
||||
- public void testUnicodeBeBom() throws IOException {
|
||||
- File file = new File("src/test/resources/reader/unicode-16be.txt");
|
||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
||||
- InputStream input = new FileInputStream(file);
|
||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
||||
- StreamReader reader = new StreamReader(unicodeReader);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('e', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('s', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('\u0000', reader.peek());
|
||||
- assertEquals(StandardCharsets.UTF_16BE, Charset.forName(unicodeReader.getEncoding()));
|
||||
- input.close();
|
||||
- }
|
||||
}
|
||||
--
|
||||
2.37.3
|
||||
|
||||
BIN
snakeyaml-1.33.tar.bz2
(Stored with Git LFS)
BIN
snakeyaml-1.33.tar.bz2
(Stored with Git LFS)
Binary file not shown.
BIN
snakeyaml-2.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
snakeyaml-2.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -12,21 +12,21 @@
|
|||
<property name="project.description" value="YAML 1.1 parser and emitter for Java"/>
|
||||
<property name="project.groupId" value="org.yaml"/>
|
||||
<property name="project.artifactId" value="snakeyaml"/>
|
||||
<property name="project.version" value="1.33"/>
|
||||
<property name="project.version" value="2.2"/>
|
||||
<property name="bundle.version" value="${project.version}.0"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.release" value="8"/>
|
||||
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
<property name="build.dir" value="target"/>
|
||||
<property name="build.outputDir" value="${build.dir}/classes"/>
|
||||
<property name="build.outputDirJava9" value="${build.outputDir}/META-INF/versions/9"/>
|
||||
<property name="build.srcDir" value="src/main/java"/>
|
||||
<property name="build.srcDirJava9" value="src/main/java9"/>
|
||||
<property name="build.resourceDir" value="src/main/resources"/>
|
||||
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
|
||||
<property name="build.testDir" value="src/test/java"/>
|
||||
<property name="build.testResourceDir" value="src/test/resources"/>
|
||||
<property name="test.reports" value="${build.dir}/test-reports"/>
|
||||
|
||||
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
|
|
@ -35,17 +35,9 @@
|
|||
|
||||
<path id="build.classpath">
|
||||
<fileset dir="lib">
|
||||
<!-- base64coder commons-codec -->
|
||||
<include name="**/*"/>
|
||||
</fileset>
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
<!-- base64coder commons-codec junit hamcrest-core velocity
|
||||
commons-collections commons-lang oro joda-time -->
|
||||
<fileset dir="lib">
|
||||
<include name="**/*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
|
|
@ -61,122 +53,64 @@
|
|||
|
||||
<target name="compile" description="Compile the code">
|
||||
<mkdir dir="${build.outputDir}"/>
|
||||
<javac destdir="${build.outputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
<javac destdir="${build.outputDir}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
encoding="utf-8"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="${compiler.source}">
|
||||
<src>
|
||||
<pathelement location="${build.srcDir}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="test.skip">
|
||||
<mkdir dir="${build.testOutputDir}"/>
|
||||
<javac destdir="${build.testOutputDir}"
|
||||
encoding="UTF-8"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
<mkdir dir="${build.outputDirJava9}"/>
|
||||
<!-- All java9 files without the module-info.java -->
|
||||
<javac destdir="${build.outputDirJava9}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
encoding="utf-8"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="${compiler.source}">
|
||||
<src>
|
||||
<pathelement location="${build.testDir}"/>
|
||||
<pathelement location="${build.srcDirJava9}"/>
|
||||
</src>
|
||||
<exclude name="**/module-info.java"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<path refid="build.classpath"/>
|
||||
<pathelement location="${build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.testOutputDir}">
|
||||
<fileset dir="${build.testResourceDir}"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<env key="EnvironmentKey1" value="EnvironmentValue1"/>
|
||||
<env key="EnvironmentEmpty" value=""/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<!-- Special compilation of module-info.java that needs modulepath -->
|
||||
<javac destdir="${build.outputDirJava9}"
|
||||
nowarn="false"
|
||||
debug="true"
|
||||
encoding="utf-8"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
target="9"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
source="9">
|
||||
<src>
|
||||
<pathelement location="${build.srcDirJava9}"/>
|
||||
<pathelement location="${build.srcDir}"/>
|
||||
</src>
|
||||
<include name="**/module-info.java"/>
|
||||
<modulepath>
|
||||
<path refid="build.classpath"/>
|
||||
<pathelement location="${build.outputDirJava9}"/>
|
||||
<pathelement location="${build.outputDir}"/>
|
||||
<pathelement location="${build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${test.reports}" unless="test">
|
||||
<fileset dir="${build.testDir}">
|
||||
<include name="**/*Test.java"/>
|
||||
<exclude name="**/StressTest.java"/>
|
||||
<exclude name="**/ParallelTest.java"/>
|
||||
<exclude name="**/PyImportTest.java"/>
|
||||
<exclude name="**/AbstractTest.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${test.reports}" if="test">
|
||||
<fileset dir="${build.testDir}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/StressTest.java"/>
|
||||
<exclude name="**/ParallelTest.java"/>
|
||||
<exclude name="**/PyImportTest.java"/>
|
||||
<exclude name="**/AbstractTest.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</modulepath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
|
|
@ -213,7 +147,7 @@
|
|||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<target name="package" depends="compile" description="Package the application">
|
||||
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
|
|
@ -224,14 +158,13 @@
|
|||
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
|
||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||
<attribute name="Bundle-Name" value="${project.name}"/>
|
||||
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.5"/>
|
||||
<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
|
||||
<attribute name="Bundle-Version" value="${bundle.version}"/>
|
||||
<attribute name="Export-Package" value="org.yaml.snakeyaml;version="${project.version}",org.yaml.snakeyaml.composer;version="${project.version}",org.yaml.snakeyaml.constructor;version="${project.version}",org.yaml.snakeyaml.emitter;version="${project.version}",org.yaml.snakeyaml.error;version="${project.version}",org.yaml.snakeyaml.events;version="${project.version}",org.yaml.snakeyaml.extensions.compactnotation;version="${project.version}",org.yaml.snakeyaml.introspector;version="${project.version}",org.yaml.snakeyaml.nodes;version="${project.version}",org.yaml.snakeyaml.parser;version="${project.version}",org.yaml.snakeyaml.reader;version="${project.version}",org.yaml.snakeyaml.representer;version="${project.version}",org.yaml.snakeyaml.resolver;version="${project.version}",org.yaml.snakeyaml.scanner;version="${project.version}",org.yaml.snakeyaml.serializer;version="${project.version}",org.yaml.snakeyaml.tokens;version="${project.version}",org.yaml.snakeyaml.util;version="${project.version}""/>
|
||||
<attribute name="Import-Package" value="biz.source_code.base64Coder;version="[1.0,2)",org.apache.commons.codec.net;version="[1.11,2)",org.yaml.snakeyaml;version="[${project.version},2)",org.yaml.snakeyaml.composer;version="[${project.version},2)",org.yaml.snakeyaml.constructor;version="[${project.version},2)",org.yaml.snakeyaml.emitter;version="[${project.version},2)",org.yaml.snakeyaml.error;version="[${project.version},2)",org.yaml.snakeyaml.events;version="[${project.version},2)",org.yaml.snakeyaml.introspector;version="[${project.version},2)",org.yaml.snakeyaml.nodes;version="[${project.version},2)",org.yaml.snakeyaml.parser;version="[${project.version},2)",org.yaml.snakeyaml.reader;version="[${project.version},2)",org.yaml.snakeyaml.representer;version="[${project.version},2)",org.yaml.snakeyaml.resolver;version="[${project.version},2)",org.yaml.snakeyaml.scanner;version="[${project.version},2)",org.yaml.snakeyaml.serializer;version="[${project.version},2)",org.yaml.snakeyaml.tokens;version="[${project.version},2)",org.yaml.snakeyaml.util;version="[${project.version},2)""/>
|
||||
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
|
||||
<attribute name="Export-Package" value="org.yaml.snakeyaml.comments;version="${project.version}",org.yaml.snakeyaml.composer;version="${project.version}",org.yaml.snakeyaml.constructor;version="${project.version}",org.yaml.snakeyaml.emitter;version="${project.version}",org.yaml.snakeyaml.env;version="${project.version}",org.yaml.snakeyaml.error;version="${project.version}",org.yaml.snakeyaml.events;version="${project.version}",org.yaml.snakeyaml.extensions.compactnotation;version="${project.version}",org.yaml.snakeyaml.inspector;version="${project.version}",org.yaml.snakeyaml.internal;version="${project.version}",org.yaml.snakeyaml.introspector;version="${project.version}",org.yaml.snakeyaml.nodes;version="${project.version}",org.yaml.snakeyaml.parser;version="${project.version}",org.yaml.snakeyaml.reader;version="${project.version}",org.yaml.snakeyaml.representer;version="${project.version}",org.yaml.snakeyaml.resolver;version="${project.version}",org.yaml.snakeyaml.scanner;version="${project.version}",org.yaml.snakeyaml.serializer;version="${project.version}",org.yaml.snakeyaml.tokens;version="${project.version}",org.yaml.snakeyaml.util;version="${project.version}",org.yaml.snakeyaml;version="${project.version}""/>
|
||||
<attribute name="Import-Package" value="org.apache.commons.codec.net,org.yaml.snakeyaml.comments,org.yaml.snakeyaml.composer,org.yaml.snakeyaml.constructor,org.yaml.snakeyaml.emitter,org.yaml.snakeyaml.error,org.yaml.snakeyaml.events,org.yaml.snakeyaml.inspector,org.yaml.snakeyaml.internal,org.yaml.snakeyaml.introspector,org.yaml.snakeyaml.nodes,org.yaml.snakeyaml.parser,org.yaml.snakeyaml.reader,org.yaml.snakeyaml.representer,org.yaml.snakeyaml.resolver,org.yaml.snakeyaml.scanner,org.yaml.snakeyaml.serializer,org.yaml.snakeyaml.tokens,org.yaml.snakeyaml.util,org.yaml.snakeyaml"/>
|
||||
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
|
||||
<attribute name="JavaPackages-Version" value="${project.version}"/>
|
||||
<attribute name="Multi-Release" value="true"/>
|
||||
<attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
||||
</manifest>
|
||||
</jar>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,62 @@
|
|||
-------------------------------------------------------------------
|
||||
Thu May 2 13:24:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Modified patch:
|
||||
* 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||
+ remove unused List variable that was originally used for
|
||||
debugging purposes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 29 11:44:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- The binaries are compatible with java 1.8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 16 13:55:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstrem version 2.2
|
||||
* Changes of 2.2
|
||||
+ Define default scalar style as PLAIN (for polyglot Maven)
|
||||
+ Add missing 'exports org.yaml.snakeyaml.inspector' to
|
||||
module-info.java
|
||||
* Changes of 2.1
|
||||
+ Heavy Allocation in Emitter.analyzeScalar(String) due to Regex
|
||||
Overhead. Fixes 1075.
|
||||
+ Use identity in toString() for sequences to avoid
|
||||
OutOfMemoryError. Fixes 1064.
|
||||
+ NumberFormatException from SnakeYAML due to int overflow for
|
||||
corrupt YAML version. Fixes 1061.
|
||||
+ Document size limit should be applied to single document not
|
||||
the whole input stream. Fixes 1065.
|
||||
+ Detect invalid Unicode code point (thanks to Tatu Saloranta).
|
||||
Fixes 576.
|
||||
+ Remove Trusted*Inspector classes from main sources tree
|
||||
* Changes of 2.0
|
||||
+ Rollback to Java 7 target. Fixes 570.
|
||||
+ Add module-info.java. Fixes 495.
|
||||
+ Migrate to Java 8
|
||||
+ Remove many deprecated constructors
|
||||
+ Remove long deprecated methods in FlowStyle
|
||||
+ Do not allow global tags by default. Fixes 565.
|
||||
+ Yaml.LoadAs() signature to support Class<? super T> type
|
||||
instead of Class<T>. Fixes 556.
|
||||
+ CustomClassLoaderConstructor takes LoaderOptions
|
||||
+ Check input parameters for non-null values
|
||||
- Removed patch:
|
||||
* 0003-Fix-ReaderBomTest.patch
|
||||
+ not needed
|
||||
- Modified patches:
|
||||
* 0001-replace-bundled-base64coder-with-java.util.Base64.patch ->
|
||||
0001-Remove-external-Base64Coder-and-use-provided-Base64.patch
|
||||
+ use the patch integrated for inclusion in 2.3
|
||||
* 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||
+ regenerate and fix tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 17:28:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
|
|
|||
108
snakeyaml.spec
108
snakeyaml.spec
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# spec file for package snakeyaml
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
|
@ -16,10 +16,13 @@
|
|||
#
|
||||
|
||||
|
||||
%global vertag 7f5106920d77
|
||||
%global vertag a34989252e6f
|
||||
# The automatic requires would be java-headless >= 9, but the
|
||||
# binaries are java 8 compatible
|
||||
%define __requires_exclude java-headless
|
||||
%bcond_with tests
|
||||
Name: snakeyaml
|
||||
Version: 1.33
|
||||
Version: 2.2
|
||||
Release: 0
|
||||
Summary: YAML parser and emitter for the Java programming language
|
||||
License: Apache-2.0
|
||||
|
|
@ -27,37 +30,17 @@ Group: Development/Libraries/Java
|
|||
URL: https://bitbucket.org/%{name}/%{name}
|
||||
Source0: https://bitbucket.org/%{name}/%{name}/get/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-build.xml
|
||||
# Upstream has forked gdata-java and base64 and refuses [1] to
|
||||
# consider replacing them by external dependencies. Bundled libraries
|
||||
# need to be removed and their use replaced by system libraries.
|
||||
# See rhbz#875777 and http://code.google.com/p/snakeyaml/issues/detail?id=175
|
||||
#
|
||||
# Replace use of bundled Base64 implementation with java.util.Base64
|
||||
Patch0: 0001-replace-bundled-base64coder-with-java.util.Base64.patch
|
||||
Patch0: 0001-Remove-external-Base64Coder-and-use-provided-Base64.patch
|
||||
# We don't have gdata-java, use commons-codec instead
|
||||
Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||
Patch2: 0003-Fix-ReaderBomTest.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
Requires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: java-devel >= 9
|
||||
BuildRequires: javapackages-local >= 6
|
||||
Requires: java-headless >= 1.8
|
||||
BuildArch: noarch
|
||||
%if %{with tests}
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: apache-commons-collections
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: hamcrest-core
|
||||
BuildRequires: joda-time
|
||||
BuildRequires: junit
|
||||
BuildRequires: oro
|
||||
BuildRequires: velocity
|
||||
# Differently sorted collections make fail some tests that rely on a particular order
|
||||
BuildConflicts: java >= 9
|
||||
BuildConflicts: java-devel >= 9
|
||||
BuildConflicts: java-headless >= 9
|
||||
%endif
|
||||
|
||||
%description
|
||||
SnakeYAML features:
|
||||
|
|
@ -79,77 +62,18 @@ This package contains %{summary}.
|
|||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{vertag}
|
||||
cp %{SOURCE1} build.xml
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%pom_remove_plugin :cobertura-maven-plugin
|
||||
%pom_remove_plugin :maven-changes-plugin
|
||||
%pom_remove_plugin :maven-license-plugin
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
|
||||
sed -i "/<artifactId>spring</s/spring/&-core/" pom.xml
|
||||
rm -f src/test/java/examples/SpringTest.java
|
||||
|
||||
# Replacement for bundled gdata-java-client
|
||||
%pom_add_dep commons-codec:commons-codec
|
||||
%patch -P 0 -p1
|
||||
%patch -P 1 -p1
|
||||
|
||||
# Unnecessary test-time only dependency
|
||||
%pom_remove_dep joda-time:joda-time
|
||||
rm -rf src/test/java/examples/jodatime
|
||||
%pom_remove_dep org.projectlombok:lombok
|
||||
%pom_remove_dep org.apache.velocity:velocity-engine-core
|
||||
|
||||
# fails in rpmbuild only due to different locale
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
|
||||
# fails after unbundling
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
||||
|
||||
# Tests using dependencies we don't have/have removed
|
||||
rm src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java
|
||||
rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java
|
||||
rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue527/Fuzzy47047Test.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue530/Fuzzy47039Test.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue543/Fuzzer50355Test.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue525/FuzzyStackOverflowTest.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue529/Fuzzy47028Test.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue531/Fuzzy47081Test.java
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue526/Fuzzy47027Test.java
|
||||
|
||||
# Problematic test resources for maven-resources-plugin 3.2
|
||||
rm src/test/resources/issues/issue99.jpeg
|
||||
rm src/test/resources/reader/unicode-16be.txt
|
||||
rm src/test/resources/reader/unicode-16le.txt
|
||||
rm src/test/resources/pyyaml/spec-05-01-utf16be.data
|
||||
rm src/test/resources/pyyaml/spec-05-01-utf16le.data
|
||||
rm src/test/resources/pyyaml/spec-05-02-utf16le.data
|
||||
rm src/test/resources/pyyaml/odd-utf16.stream-error
|
||||
rm src/test/resources/pyyaml/invalid-character.loader-error
|
||||
rm src/test/resources/pyyaml/invalid-character.stream-error
|
||||
rm src/test/resources/pyyaml/invalid-utf8-byte.loader-error
|
||||
rm src/test/resources/pyyaml/invalid-utf8-byte.stream-error
|
||||
rm src/test/resources/pyyaml/empty-document-bug.data
|
||||
rm src/test/resources/pyyaml/spec-05-02-utf16be.data
|
||||
rm -rf src/test/resources/fuzzer/
|
||||
# Test using the jpeg data removed above
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||
|
||||
# convert CR+LF to LF
|
||||
sed -i 's/\r//g' LICENSE.txt
|
||||
%pom_change_dep joda-time:joda-time :::test
|
||||
%pom_change_dep org.projectlombok:lombok :::test
|
||||
%pom_change_dep org.apache.velocity:velocity-engine-core :::test
|
||||
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib commons-codec
|
||||
%if %{with tests}
|
||||
build-jar-repository -s lib junit hamcrest/core velocity commons-collections commons-lang oro joda-time
|
||||
%endif
|
||||
%{ant} \
|
||||
%if %{without tests}
|
||||
-Dtest.skip=true \
|
||||
%endif
|
||||
clean package javadoc
|
||||
|
||||
%install
|
||||
|
|
@ -158,7 +82,7 @@ install -dm 0755 %{buildroot}%{_javadir}
|
|||
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
# pom
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user