diff --git a/.gitignore b/.gitignore index c2e068d..0101ffe 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /snakeyaml-1.13.zip /snakeyaml-1.16.tar.bz2 /snakeyaml-1.17.tar.bz2 +/snakeyaml-1.25.tar.gz diff --git a/0001-Replace-bundled-base64-implementation.patch b/0001-Replace-bundled-base64-implementation.patch index e59fca6..cde7cac 100644 --- a/0001-Replace-bundled-base64-implementation.patch +++ b/0001-Replace-bundled-base64-implementation.patch @@ -4,17 +4,17 @@ Date: Wed, 24 Apr 2013 11:25:52 +0200 Subject: [PATCH 1/2] Replace bundled base64 implementation --- - .../snakeyaml/constructor/SafeConstructor.java | 2 +- - .../external/biz/base64Coder/Base64Coder.java | 305 --------------------- - .../snakeyaml/representer/SafeRepresenter.java | 2 +- - .../source_code/base64Coder/Base64CoderTest.java | 73 ----- - .../snakeyaml/issues/issue99/YamlBase64Test.java | 2 +- + .../constructor/SafeConstructor.java | 2 +- + .../external/biz/base64Coder/Base64Coder.java | 305 ------------------ + .../representer/SafeRepresenter.java | 2 +- + .../base64Coder/Base64CoderTest.java | 73 ----- + .../issues/issue99/YamlBase64Test.java | 2 +- 5 files changed, 3 insertions(+), 381 deletions(-) delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java delete mode 100644 src/test/java/biz/source_code/base64Coder/Base64CoderTest.java diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java -index b5572ea..190384e 100644 +index a9c0f68..9b5eab1 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 @@ @@ -23,9 +23,9 @@ index b5572ea..190384e 100644 +import biz.source_code.base64Coder.Base64Coder; import java.math.BigInteger; - import java.text.NumberFormat; - import java.text.ParseException; -@@ -32,7 +33,6 @@ import java.util.regex.Matcher; + import java.util.ArrayList; + import java.util.Calendar; +@@ -30,7 +31,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.yaml.snakeyaml.error.YAMLException; @@ -345,7 +345,7 @@ index 65923b6..0000000 - -} // 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 147e3af..b8dd4e0 100644 +index 6f0c96c..5eff120 100644 --- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java +++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java @@ -15,6 +15,7 @@ @@ -356,9 +356,9 @@ index 147e3af..b8dd4e0 100644 import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.util.ArrayList; -@@ -32,7 +33,6 @@ import java.util.UUID; - import java.util.regex.Pattern; +@@ -33,7 +34,6 @@ import java.util.regex.Pattern; + import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.error.YAMLException; -import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; import org.yaml.snakeyaml.nodes.Node; @@ -444,7 +444,7 @@ index 60f6d84..0000000 - } -} 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 32e7eef..3275c7e 100644 +index e425f25..04909ab 100644 --- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java +++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java @@ -15,6 +15,7 @@ @@ -464,5 +464,5 @@ index 32e7eef..3275c7e 100644 import org.yaml.snakeyaml.nodes.ScalarNode; import org.yaml.snakeyaml.nodes.Tag; -- -2.7.4 +2.20.1 diff --git a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch b/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch index d214f56..08d1e68 100644 --- a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch +++ b/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch @@ -5,11 +5,11 @@ Subject: [PATCH 2/2] Replace bundled gdata-java-client classes with commons-codec --- - .../com/google/gdata/util/common/base/Escaper.java | 97 ---- - .../gdata/util/common/base/PercentEscaper.java | 281 ------------ - .../gdata/util/common/base/UnicodeEscaper.java | 506 --------------------- - .../java/org/yaml/snakeyaml/util/UriEncoder.java | 37 +- - 4 files changed, 29 insertions(+), 892 deletions(-) + .../gdata/util/common/base/Escaper.java | 97 ---- + .../util/common/base/PercentEscaper.java | 281 ---------- + .../util/common/base/UnicodeEscaper.java | 506 ------------------ + .../org/yaml/snakeyaml/util/UriEncoder.java | 37 +- + 4 files changed, 28 insertions(+), 893 deletions(-) delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java @@ -917,20 +917,20 @@ index 5403185..0000000 - }; -} diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java -index e23904f..f266387 100644 +index 4cc18b4..b6a1992 100644 --- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java +++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java -@@ -23,25 +23,46 @@ import java.nio.charset.CharacterCodingException; +@@ -23,27 +23,46 @@ import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; +- +import java.util.BitSet; - ++ +import org.apache.commons.codec.net.URLCodec; import org.yaml.snakeyaml.error.YAMLException; -import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.Escaper; -import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper; -+ public abstract class UriEncoder { private static final CharsetDecoder UTF8Decoder = Charset.forName("UTF-8").newDecoder() @@ -940,8 +940,8 @@ index e23904f..f266387 100644 - // http://yaml.org/spec/1.1/#escaping%20in%20URI/ - private static final String SAFE_CHARS = PercentEscaper.SAFEPATHCHARS_URLENCODER + "[]/"; - private static final Escaper escaper = new PercentEscaper(SAFE_CHARS, false); -+ -+ // default safe characters which can appear within URI and shouldn't be escaped + ++ // default safe characters which can appear within URI and shouldn't be escaped + private static final BitSet allowedCharacters = new BitSet(256); + + static { @@ -959,9 +959,10 @@ index e23904f..f266387 100644 + allowedCharacters.set(c); + } + } - /** * Escape special characters with '%' + * @param uri URI to be escaped + * @return encoded URI */ public static String encode(String uri) { - return escaper.escape(uri); @@ -976,5 +977,5 @@ index e23904f..f266387 100644 /** -- -2.7.4 +2.20.1 diff --git a/snakeyaml.spec b/snakeyaml.spec index 9972f4e..a738f16 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -1,15 +1,15 @@ -%global vertag 70abb5efa4c0 +%global vertag 8450addf3473 %bcond_with spring Name: snakeyaml Summary: YAML parser and emitter for Java -Version: 1.17 -Release: 9%{?dist} +Version: 1.25 +Release: 1%{?dist} License: ASL 2.0 -URL: https://bitbucket.org/asomov/%{name}/ -Source0: https://bitbucket.org/asomov/snakeyaml/get/v%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 +URL: https://bitbucket.org/asomov/%{name} +Source0: %{url}/get/%{name}-%{version}.tar.gz # Upstream has forked gdata-java and base64 and refuses [1] to # consider replacing them by external dependencies. Bundled libraries @@ -26,13 +26,17 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(biz.source_code:base64coder) BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.velocity:velocity) %if %{with spring} BuildRequires: mvn(org.springframework:spring-core) +BuildRequires: mvn(org.springframework:spring-beans) +BuildRequires: mvn(org.springframework:spring-context-support) %endif %description @@ -62,9 +66,11 @@ This package contains %{summary}. %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-changes-plugin +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-license-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :nexus-staging-maven-plugin sed -i "/spring - 1.25-1 +- Update to version 1.25. + * Sun Jul 28 2019 Fabio Valentini - 1.17-9 - Disable support for spring. diff --git a/sources b/sources index d78f062..6ff9489 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -741c45bd4bb4fd98b674684a2f992ee0 snakeyaml-1.17.tar.bz2 +SHA512 (snakeyaml-1.25.tar.gz) = 39c4254e368bdfe5dda1207443e86b2bb81a3c7d3f37d54c63aac6fcc8c74914a5e4f34fe4cbf7748556d54d81491170dbb3c51459ba2f7cc51efc2eb987a530