[springframework] - Update to 3.1.4 - Add BR xmlunit - Change wstx-asl to woodstox-core-asl
Orion Poplawski
orion at fedoraproject.org
Fri Dec 6 03:47:46 UTC 2013
commit bb9933fb1fa76176edd3c45f93f4afe586dfe90b
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Dec 5 20:47:39 2013 -0700
- Update to 3.1.4
- Add BR xmlunit
- Change wstx-asl to woodstox-core-asl
.gitignore | 1 +
sources | 2 +-
...3.1.1-pom.xml => spring-framework-3.1.4-pom.xml | 2 +-
springframework-dont-rebundle-asm.patch | 7 -------
springframework-woodstox.patch | 12 ++++++++++++
springframework.spec | 18 +++++++++++++-----
6 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 748caed..f2afc30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/springframework-3.1.1.tar.gz
+/v3.1.4.RELEASE.tar.gz
diff --git a/sources b/sources
index c308ea2..26a9af6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e7385308c93cf5c0c03cdca048c8272 springframework-3.1.1.tar.gz
+389cc3ac648090f3c34c1252d58b161c v3.1.4.RELEASE.tar.gz
diff --git a/spring-framework-3.1.1-pom.xml b/spring-framework-3.1.4-pom.xml
similarity index 97%
rename from spring-framework-3.1.1-pom.xml
rename to spring-framework-3.1.4-pom.xml
index 913034a..3177223 100644
--- a/spring-framework-3.1.1-pom.xml
+++ b/spring-framework-3.1.4-pom.xml
@@ -11,7 +11,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-project</artifactId>
<packaging>pom</packaging>
- <version>3.1.1.RELEASE</version>
+ <version>3.1.4.RELEASE</version>
<modules>
<!-- These are not all the modules, only those that we can currently build: -->
diff --git a/springframework-dont-rebundle-asm.patch b/springframework-dont-rebundle-asm.patch
index 9514f9d..1d87861 100644
--- a/springframework-dont-rebundle-asm.patch
+++ b/springframework-dont-rebundle-asm.patch
@@ -208,13 +208,6 @@ index 428258c..e2f2d62 100644
this.annotationMetadata = visitor;
// (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
-@@ -70,4 +70,4 @@ final class SimpleMetadataReader implements MetadataReader {
- public AnnotationMetadata getAnnotationMetadata() {
- return this.annotationMetadata;
- }
--}
-\ No newline at end of file
-+}
diff --git a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java b/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
index 2d8b40b..c65ba95 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
diff --git a/springframework-woodstox.patch b/springframework-woodstox.patch
new file mode 100644
index 0000000..4296647
--- /dev/null
+++ b/springframework-woodstox.patch
@@ -0,0 +1,12 @@
+diff -up SpringSource-spring-framework-79c9ca1/org.springframework.core/pom.xml.woodstox SpringSource-spring-framework-79c9ca1/org.springframework.core/pom.xml
+--- SpringSource-spring-framework-79c9ca1/org.springframework.core/pom.xml.woodstox 2013-12-05 20:10:15.491226505 -0700
++++ SpringSource-spring-framework-79c9ca1/org.springframework.core/pom.xml 2013-12-05 20:28:04.956891653 -0700
+@@ -81,7 +81,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+- <artifactId>wstx-asl</artifactId>
++ <artifactId>woodstox-core-asl</artifactId>
+ <version>3.2.7</version>
+ <scope>test</scope>
+ </dependency>
diff --git a/springframework.spec b/springframework.spec
index 0dbfe6e..6506973 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -1,15 +1,14 @@
Name: springframework
Summary: Spring Java Application Framework
-Version: 3.1.1
-Release: 15%{?dist}
+Version: 3.1.4
+Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
Group: Development/Libraries
URL: http://www.springframework.org
BuildArch: noarch
-# curl https://nodeload.github.com/SpringSource/spring-framework/tarball/v3.1.1.RELEASE > spring-framework-3.1.1.tar.gz
-Source0: %{name}-%{version}.tar.gz
+Source0: https://github.com/spring-projects/spring-framework/archive/v%{version}.RELEASE.tar.gz
Source1: spring-framework-%{version}-pom.xml
# force use tomcat 7.x apis
Source2: spring-framework-%{version}-depmap
@@ -87,6 +86,8 @@ Patch23: springframework-3.1.1-web_servlet-pom.patch
Patch24: springframework-3.1.1-struts-pom.patch
# Build with Quartz 2.x only
Patch25: springframework-3.1.1-no-quartz1.patch
+# Rename wstx-asl to woodstox-core-asl
+Patch26: springframework-woodstox.patch
# Build requirements (alphabetical):
BuildRequires: aopalliance
@@ -174,6 +175,7 @@ BuildRequires: tomcat-servlet-3.0-api
BuildRequires: velocity
BuildRequires: velocity-tools
BuildRequires: xmlbeans
+BuildRequires: xmlunit
BuildRequires: xstream
# Runtime requirements (only for the main package, other requirements go in the
@@ -511,7 +513,7 @@ This package provide support development of Portlet
applications with Spring.
%prep
-%setup -q -n SpringSource-spring-framework-79c9ca1
+%setup -q -n spring-framework-%{version}.RELEASE
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -537,6 +539,7 @@ applications with Spring.
%patch23 -p0
%patch24 -p0
%patch25 -p1
+%patch26 -p1
# ERROR: XThis is not public in Bsh
rm org.springframework.context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
@@ -739,6 +742,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
%changelog
+* Thu Dec 5 2013 Orion Poplawski <orion at cora.nwra.com> - 0:3.1.4-1
+- Update to 3.1.4
+- Add BR xmlunit
+- Change wstx-asl to woodstox-core-asl
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.1.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list