diff --git a/snakeyaml-spring-removal-workaround.patch b/snakeyaml-spring-removal-workaround.patch deleted file mode 100644 index e2867c5..0000000 --- a/snakeyaml-spring-removal-workaround.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -Naur snakeyaml.orig/pom.xml snakeyaml/pom.xml ---- snakeyaml.orig/pom.xml 2011-05-27 19:26:23.000000000 +0200 -+++ snakeyaml/pom.xml 2011-05-27 19:32:07.000000000 +0200 -@@ -61,12 +61,12 @@ - 4.7 - test - -- -+ - - org.apache.velocity - velocity -diff -Naur snakeyaml.orig/src/test/java/examples/SpringTest.java snakeyaml/src/test/java/examples/SpringTest.java ---- snakeyaml.orig/src/test/java/examples/SpringTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/examples/SpringTest.java 2011-05-27 19:34:14.000000000 +0200 -@@ -18,12 +18,15 @@ - - import junit.framework.TestCase; - -+/* WORKAROUND FOR : springframework dependency removal - import org.springframework.context.ApplicationContext; - import org.springframework.context.support.ClassPathXmlApplicationContext; -+*/ - import org.yaml.snakeyaml.Yaml; - - public class SpringTest extends TestCase { - public void testSimple() { -+/* WORKAROUND FOR : springframework dependency removal - ApplicationContext context = new ClassPathXmlApplicationContext("examples/spring.xml"); - Yaml yaml = (Yaml) context.getBean("standardYaml"); - assertNotNull(yaml); -@@ -33,5 +36,6 @@ - // - yaml = (Yaml) context.getBean("snakeYaml"); - assertNotNull(yaml); -+*/ - } - } -\ Chybí znak konce řádku na konci souboru -diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java ---- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/BeanHolder.java 2011-05-27 19:48:24.012406769 +0200 -@@ -16,7 +16,9 @@ - - package org.yaml.snakeyaml.issues.issue9; - -+/* WORKAROUND FOR : springframework dependency removal - import org.springframework.core.style.ToStringCreator; -+*/ - - public class BeanHolder { - -@@ -41,8 +43,11 @@ - - @Override - public String toString() { -+/* WORKAROUND FOR : springframework dependency removal - ToStringCreator builder = new ToStringCreator(this); - builder.append(this.bean); - return builder.toString(); -+*/ -+ return ""; - } - } -diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java ---- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean1.java 2011-05-27 19:48:19.260945240 +0200 -@@ -16,7 +16,9 @@ - - package org.yaml.snakeyaml.issues.issue9; - -+/* WORKAROUND FOR : springframework dependency removal - import org.springframework.core.style.ToStringCreator; -+*/ - - public class Bean1 implements IBean { - -@@ -50,10 +52,13 @@ - - @Override - public String toString() { -+/* WORKAROUND FOR : springframework dependency removal - ToStringCreator builder = new ToStringCreator(this); - builder.append(this.strVal); - builder.append(this.intVal); - return builder.toString(); -+*/ -+ return ""; - } - - } -diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java ---- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue9/Bean2.java 2011-05-27 19:48:49.388530893 +0200 -@@ -16,7 +16,9 @@ - - package org.yaml.snakeyaml.issues.issue9; - -+/* WORKAROUND FOR : springframework dependency removal - import org.springframework.core.style.ToStringCreator; -+*/ - - public class Bean2 implements IBean { - -@@ -46,10 +48,13 @@ - - @Override - public String toString() { -+/* WORKAROUND FOR : springframework dependency removal - ToStringCreator builder = new ToStringCreator(this); - builder.append(this.strVal); - builder.append(this.intVal); - return builder.toString(); -+*/ -+ return ""; - } - - } diff --git a/snakeyaml.spec b/snakeyaml.spec index 5b74aba..be3a912 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -2,8 +2,8 @@ %global group_id org.yaml Name: snakeyaml -Version: 1.9 -Release: 3%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: YAML parser and emitter for the Java programming language License: ASL 2.0 Group: Development/Libraries @@ -12,17 +12,16 @@ URL: http://code.google.com/p/%{name} # http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip -Patch0: %{name}-spring-removal-workaround.patch - BuildArch: noarch BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: maven -BuildRequires: maven-plugin-cobertura BuildRequires: maven-surefire-provider-junit4 +BuildRequires: cobertura BuildRequires: joda-time BuildRequires: gnu-getopt +BuildRequires: springframework Requires: java Requires: jpackage-utils @@ -49,8 +48,10 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name} -%patch0 -p1 -%pom_add_dep org.codehaus.mojo:cobertura-maven-plugin:any:test +%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin +%pom_add_dep net.sourceforge.cobertura:cobertura:any:test +sed -i "/spring - 1.11-1 +- Update to upstream version 1.11 + * Mon Oct 15 2012 Mikolaj Izdebski - 1.9-3 - Remove unneeded dependencies: base64coder, gdata-java - Convert pom.xml patch to POM macro diff --git a/sources b/sources index b8eb631..856e15e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78a82f2b24d6c4271c079756b5784f99 SnakeYAML-all-1.9.zip +2a11deea0650701720b474c110693df4 SnakeYAML-all-1.11.zip