Update to upstream version 1.11
This commit is contained in:
Mikolaj Izdebski
parent
95454af09b
commit
f8451d0c35
@ -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 @@
|
||||
<version>4.7</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
+ <!--dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring</artifactId>
|
||||
<version>2.5.6</version>
|
||||
<scope>test</scope>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
<dependency>
|
||||
<groupId>org.apache.velocity</groupId>
|
||||
<artifactId>velocity</artifactId>
|
||||
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 "";
|
||||
}
|
||||
|
||||
}
|
||||
@ -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 "/<artifactId>spring</s/spring/&-core/" pom.xml
|
||||
rm -f src/test/java/examples/SpringTest.java
|
||||
|
||||
# remove bundled stuff
|
||||
rm -rf target
|
||||
@ -88,6 +89,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-1
|
||||
- Update to upstream version 1.11
|
||||
|
||||
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-3
|
||||
- Remove unneeded dependencies: base64coder, gdata-java
|
||||
- Convert pom.xml patch to POM macro
|
||||
|
||||
Loading…
Reference in New Issue
Block a user