rpms/snakeyaml
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS

Browse Source
This commit is contained in:
Michal Srb 2014-06-16 07:22:06 +02:00
parent 56d9f2e16b
commit fee209de86
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
java8-use-linked-hashmap.patch Normal file
View File

@ -0,0 +1,57 @@
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<Object, Object> car1 = new HashMap<Object, Object>();
- car1.put("plate", "12-XP-F4");
+ Map<Object, Object> car1 = new LinkedHashMap<Object, Object>();
Wheel wheel = new Wheel();
wheel.setId(2);
- car1.put("wheel", wheel);
Map<String, Integer> map = new HashMap<String, Integer>();
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<Object, Object> car2 = (Map<Object, Object>) 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<K, V> {
- private Map<K, V> map = new HashMap<K, V>();
+ private Map<K, V> map = new LinkedHashMap<K, V>();
public Map<K, V> getMap() {
return map;

8
snakeyaml.spec
View File

@ -2,7 +2,7 @@
Name: snakeyaml
Version: 1.13
Release: 2%{?dist}
Release: 3%{?dist}
Summary: YAML parser and emitter for the Java programming language
License: ASL 2.0
# http://code.google.com/p/snakeyaml
@ -18,6 +18,8 @@ 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
@ -56,6 +58,7 @@ This package contains %{summary}.
%setup -q -n %{name}-%{vertag}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%mvn_file : %{name}
@ -87,6 +90,9 @@ sed -i 's/\r//g' LICENSE.txt
%doc LICENSE.txt
%changelog
* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 1.13-3
- Fix FTBFS
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild