diff --git a/.gitignore b/.gitignore index 3c112b0..a1f80f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /SnakeYAML-all-1.8.zip /SnakeYAML-all-1.9.zip /snakeyaml-1.13.zip +/snakeyaml-1.16.tar.bz2 diff --git a/0001-Replace-bundled-base64-implementation.patch b/0001-Replace-bundled-base64-implementation.patch index 891616b..b1d0d6b 100644 --- a/0001-Replace-bundled-base64-implementation.patch +++ b/0001-Replace-bundled-base64-implementation.patch @@ -1,7 +1,7 @@ -From a524758e35ce71a1839bb8594e9c3af93f335f1d Mon Sep 17 00:00:00 2001 +From eb36499dacbbe4d10979177c696dc81187c445fe Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 24 Apr 2013 11:25:52 +0200 -Subject: [PATCH] Replace bundled base64 implementation +Subject: [PATCH 1/2] Replace bundled base64 implementation --- pom.xml | 5 + @@ -14,10 +14,10 @@ Subject: [PATCH] Replace bundled base64 implementation delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java diff --git a/pom.xml b/pom.xml -index 013e07e..629a49c 100644 +index e02d181..ece4e91 100644 --- a/pom.xml +++ b/pom.xml -@@ -78,6 +78,11 @@ +@@ -83,6 +83,11 @@ 1.6 test @@ -30,10 +30,10 @@ index 013e07e..629a49c 100644 diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java -index e8f4214..651a497 100644 +index b5572ea..b472be7 100644 --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java +++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java -@@ -29,8 +29,9 @@ import java.util.TimeZone; +@@ -31,8 +31,9 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -356,7 +356,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 b4b618f..93b5dcd 100644 +index 9927fa6..52ef4b3 100644 --- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java +++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java @@ -30,8 +30,9 @@ import java.util.Set; @@ -371,7 +371,7 @@ index b4b618f..93b5dcd 100644 import org.yaml.snakeyaml.nodes.Tag; import org.yaml.snakeyaml.reader.StreamReader; diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java -index 397fb7c..002f4c7 100644 +index 60f6d84..8ca54e8 100644 --- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java +++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java @@ -19,7 +19,7 @@ import java.io.UnsupportedEncodingException; @@ -384,7 +384,7 @@ index 397fb7c..002f4c7 100644 public class Base64CoderTest extends TestCase { 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 f04ffe8..9a105b9 100644 +index ddffdc3..2a26bfb 100644 --- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java +++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java @@ -22,12 +22,13 @@ import java.util.Map; @@ -403,5 +403,5 @@ index f04ffe8..9a105b9 100644 import org.yaml.snakeyaml.nodes.ScalarNode; import org.yaml.snakeyaml.nodes.Tag; -- -1.8.1.4 +2.4.3 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 39bb51c..aa8e324 100644 --- a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch +++ b/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch @@ -1,7 +1,8 @@ -From 9104006de9e3e601d2ac6c733b38e6c29728b2ce Mon Sep 17 00:00:00 2001 +From 4a8a85e1f1a9974cdb416c895280943ac51561ca Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 26 Apr 2013 07:32:04 +0200 -Subject: [PATCH] Replace bundled gdata-java-client classes with commons-codec +Subject: [PATCH 2/2] Replace bundled gdata-java-client classes with + commons-codec --- .../com/google/gdata/util/common/base/Escaper.java | 97 ---- @@ -916,7 +917,7 @@ 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 af30dea..d0fe032 100644 +index e23904f..f266387 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; @@ -975,5 +976,5 @@ index af30dea..d0fe032 100644 /** -- -1.8.1.4 +2.4.3 diff --git a/java8-use-linked-hashmap.patch b/java8-use-linked-hashmap.patch deleted file mode 100644 index 5e43d07..0000000 --- a/java8-use-linked-hashmap.patch +++ /dev/null @@ -1,57 +0,0 @@ -changeset: 1493:0ecfebcf845d -user: maslovalex -date: Thu May 22 09:24:53 2014 +0300 -summary: Using LinkedHashMap in some tests to be sure about keys order in dumped yaml. - -diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java ---- a/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Wed May 21 16:06:58 2014 +0300 -+++ b/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Thu May 22 09:24:53 2014 +0300 -@@ -16,6 +16,7 @@ - package org.yaml.snakeyaml.constructor; - - import java.util.HashMap; -+import java.util.LinkedHashMap; - import java.util.List; - import java.util.Map; - -@@ -69,14 +70,16 @@ - - @SuppressWarnings("unchecked") - public void testRootMap() { -- Map car1 = new HashMap(); -- car1.put("plate", "12-XP-F4"); -+ Map car1 = new LinkedHashMap(); - Wheel wheel = new Wheel(); - wheel.setId(2); -- car1.put("wheel", wheel); - Map map = new HashMap(); - map.put("id", 3); -+ -+ car1.put("wheel", wheel); - car1.put("map", map); -+ car1.put("plate", "12-XP-F4"); -+ - String carYaml1 = new Yaml().dump(car1); - assertEquals(Util.getLocalResource("constructor/carwheel-root-map.yaml"), carYaml1); - Map car2 = (Map) new Yaml().load(carYaml1); -diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java ---- a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Wed May 21 16:06:58 2014 +0300 -+++ b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Thu May 22 09:24:53 2014 +0300 -@@ -16,6 +16,7 @@ - package org.yaml.snakeyaml.issues.issue61; - - import java.util.HashMap; -+import java.util.LinkedHashMap; - import java.util.Map; - - import junit.framework.TestCase; -@@ -68,7 +69,7 @@ - } - - public static class MapProvider { -- private Map map = new HashMap(); -+ private Map map = new LinkedHashMap(); - - public Map getMap() { - return map; - diff --git a/snakeyaml.spec b/snakeyaml.spec index 2b8bc9b..d2ead46 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -1,13 +1,12 @@ -%global vertag 3f1ee79d50cf +%global vertag 106418cae0ba Name: snakeyaml -Version: 1.13 -Release: 9%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: YAML parser and emitter for the Java programming language License: ASL 2.0 -# http://code.google.com/p/snakeyaml -URL: http://code.google.com/p/%{name} -Source0: https://snakeyaml.googlecode.com/archive/v%{version}.zip#/%{name}-%{version}.zip +URL: https://bitbucket.org/asomov/%{name}/ +Source0: https://bitbucket.org/asomov/snakeyaml/get/v%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 # Upstream has forked gdata-java and base64 and refuses [1] to # consider replacing them by external dependencies. Bundled libraries @@ -18,8 +17,6 @@ Source0: https://snakeyaml.googlecode.com/archive/v%{version}.zip#/%{na Patch0: 0001-Replace-bundled-base64-implementation.patch # We don't have gdata-java in Fedora any longer, use commons-codec instead Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch -# Fix tests on Java 8 (can be removed if version > 1.13) -Patch2: java8-use-linked-hashmap.patch BuildArch: noarch @@ -54,10 +51,9 @@ Summary: API documentation for %{name} This package contains %{summary}. %prep -%setup -q -n %{name}-%{vertag} +%setup -q -n asomov-%{name}-%{vertag} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %mvn_file : %{name} @@ -92,6 +88,9 @@ sed -i 's/\r//g' LICENSE.txt %doc LICENSE.txt %changelog +* Mon Sep 28 2015 Mikolaj Izdebski - 1.16-1 +- Update to upstream version 1.16 + * Fri Jun 19 2015 Fedora Release Engineering - 1.13-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 0e59001..1e9997f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c636f28d1da335bd125457dbf739ff12 snakeyaml-1.13.zip +e84e1fa9de484eca84155e1751f85cdd snakeyaml-1.16.tar.bz2