[springframework] Update to 3.2.6
Michal Srb
msrb at fedoraproject.org
Mon Jan 20 09:27:07 UTC 2014
commit 3aa91a62671716ce7818cf20e49345135ba4cfe9
Author: Michal Srb <msrb at redhat.com>
Date: Mon Jan 20 10:22:01 2014 +0100
Update to 3.2.6
- Fix BR
.gitignore | 20 ++++++++++
sources | 40 ++++++++++----------
...3.2.6-java.io.IOException-is-never-thrown.patch | 0
....6-port-spring-jms-to-javax.resources-1.7.patch | 0
...-port-spring-orm-to-javax.persistence-2.0.patch | 0
...ork-3.2.6-port-spring-test-to-servlet-3.0.patch | 0
...2.6-port-spring-tx-to-javax.resources-1.7.patch | 0
...ework-3.2.6-port-to-hibernate-validator-5.patch | 0
springframework.spec | 40 ++++++++-----------
9 files changed, 57 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1fa206a..825a305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,23 @@
/spring-webmvc-3.2.5.RELEASE.pom
/spring-webmvc-portlet-3.2.5.RELEASE.pom
/springframework-3.2.5.RELEASE.pom
+/v3.2.6.RELEASE.tar.gz
+/springframework-3.2.6.RELEASE.pom
+/spring-aop-3.2.6.RELEASE.pom
+/spring-beans-3.2.6.RELEASE.pom
+/spring-context-3.2.6.RELEASE.pom
+/spring-context-support-3.2.6.RELEASE.pom
+/spring-core-3.2.6.RELEASE.pom
+/spring-expression-3.2.6.RELEASE.pom
+/spring-instrument-3.2.6.RELEASE.pom
+/spring-instrument-tomcat-3.2.6.RELEASE.pom
+/spring-jdbc-3.2.6.RELEASE.pom
+/spring-jms-3.2.6.RELEASE.pom
+/spring-orm-3.2.6.RELEASE.pom
+/spring-oxm-3.2.6.RELEASE.pom
+/spring-struts-3.2.6.RELEASE.pom
+/spring-test-3.2.6.RELEASE.pom
+/spring-tx-3.2.6.RELEASE.pom
+/spring-web-3.2.6.RELEASE.pom
+/spring-webmvc-3.2.6.RELEASE.pom
+/spring-webmvc-portlet-3.2.6.RELEASE.pom
diff --git a/sources b/sources
index cef1edf..b789cdb 100644
--- a/sources
+++ b/sources
@@ -1,20 +1,20 @@
-de98f9c198f1c0fb0c1c1d3559d4ca39 v3.2.5.RELEASE.tar.gz
-54037505b2c0fbd1387acf001e0f5a5c spring-aop-3.2.5.RELEASE.pom
-b0bf4c173bad21e166840d7992b35896 spring-beans-3.2.5.RELEASE.pom
-cebf9601213ae52ac35b361864faf716 spring-context-3.2.5.RELEASE.pom
-e27002a9ef4684330310a8b96f6a6d30 spring-context-support-3.2.5.RELEASE.pom
-03ccf6229cd0d43a6d28feb824df3b91 spring-core-3.2.5.RELEASE.pom
-299222c0b10ebb6bb018847a76796594 spring-expression-3.2.5.RELEASE.pom
-aa5f4ecba0697c81ff2e7d2eef4d8a81 spring-instrument-3.2.5.RELEASE.pom
-e43e98f4f97c5cec74fbd6f32ad86ad5 spring-instrument-tomcat-3.2.5.RELEASE.pom
-9b5e924cbcc531133cb5df697b51ee0a spring-jdbc-3.2.5.RELEASE.pom
-79361c15918d53544933360f28098ce3 spring-jms-3.2.5.RELEASE.pom
-c4d14ce6a7fb5110a136d9dd639ce84e spring-orm-3.2.5.RELEASE.pom
-70205a53109c2d8442480d5ab6f47ca3 spring-oxm-3.2.5.RELEASE.pom
-fe6c040cf2edf154ccfca7e401a56af2 spring-struts-3.2.5.RELEASE.pom
-ca9752be0ddd0c42772829ceb629cee2 spring-test-3.2.5.RELEASE.pom
-7383dcb7bdd160596cfddf892270d3f6 spring-tx-3.2.5.RELEASE.pom
-a0634f5178859c6dba81d0ae5b4d91a6 spring-web-3.2.5.RELEASE.pom
-21c0c6e563b37d1ee44eaaf27fe64796 spring-webmvc-3.2.5.RELEASE.pom
-96f07ed184da5b5553d96093e746749d spring-webmvc-portlet-3.2.5.RELEASE.pom
-33d356ae43a8d8e4c46682db79025e1f springframework-3.2.5.RELEASE.pom
+a845dd5fa6163125d7d195222fc40fc8 v3.2.6.RELEASE.tar.gz
+33d356ae43a8d8e4c46682db79025e1f springframework-3.2.6.RELEASE.pom
+6f43f3665b65ea8bcc0920ed9d78b272 spring-aop-3.2.6.RELEASE.pom
+6642cfc2b26e8f1ecd95b8ae2d53a7d7 spring-beans-3.2.6.RELEASE.pom
+e39d1b89c57a9db975bcd539268feac9 spring-context-3.2.6.RELEASE.pom
+ae480892fdefa70b8f0680dc29a7d295 spring-context-support-3.2.6.RELEASE.pom
+4de292a058e3c37baca8551397199899 spring-core-3.2.6.RELEASE.pom
+2f671e92424beb4ea29a0f7b6c997185 spring-expression-3.2.6.RELEASE.pom
+f540811366449eedb03e64d8b9b8cc42 spring-instrument-3.2.6.RELEASE.pom
+ed82f1f08849268b14cb0fcf005d7e30 spring-instrument-tomcat-3.2.6.RELEASE.pom
+f05a133eb13fb64750a00747851bdc12 spring-jdbc-3.2.6.RELEASE.pom
+efcd9bcc6aa5093d545216ac347c41b8 spring-jms-3.2.6.RELEASE.pom
+a5caefb611d538cd3ed93244c3f43282 spring-orm-3.2.6.RELEASE.pom
+c6b6e92e21fd362b73abf706d7b8d727 spring-oxm-3.2.6.RELEASE.pom
+376432908905a1de20c8db22058b680a spring-struts-3.2.6.RELEASE.pom
+1d6b1c08a909eeced58e9202d33048de spring-test-3.2.6.RELEASE.pom
+6d4ba2acca8e84a788c71a462015fd85 spring-tx-3.2.6.RELEASE.pom
+4050401b85f9ff999c5c7fead69a7309 spring-web-3.2.6.RELEASE.pom
+8eec41a068367ee388aeff6e5f1a9bb5 spring-webmvc-3.2.6.RELEASE.pom
+b28a9a4fce4d59b4dcf2316eb437b5a1 spring-webmvc-portlet-3.2.6.RELEASE.pom
diff --git a/0001-Fix-exception-java.io.IOException-is-never-thrown-er.patch b/springframework-3.2.6-java.io.IOException-is-never-thrown.patch
similarity index 100%
rename from 0001-Fix-exception-java.io.IOException-is-never-thrown-er.patch
rename to springframework-3.2.6-java.io.IOException-is-never-thrown.patch
diff --git a/0001-Port-spring-jms-to-javax.resources-1.7.patch b/springframework-3.2.6-port-spring-jms-to-javax.resources-1.7.patch
similarity index 100%
rename from 0001-Port-spring-jms-to-javax.resources-1.7.patch
rename to springframework-3.2.6-port-spring-jms-to-javax.resources-1.7.patch
diff --git a/0001-Port-spring-orm-to-javax.persistence-2.0.patch b/springframework-3.2.6-port-spring-orm-to-javax.persistence-2.0.patch
similarity index 100%
rename from 0001-Port-spring-orm-to-javax.persistence-2.0.patch
rename to springframework-3.2.6-port-spring-orm-to-javax.persistence-2.0.patch
diff --git a/0001-Port-spring-test-to-servlet-3.0.patch b/springframework-3.2.6-port-spring-test-to-servlet-3.0.patch
similarity index 100%
rename from 0001-Port-spring-test-to-servlet-3.0.patch
rename to springframework-3.2.6-port-spring-test-to-servlet-3.0.patch
diff --git a/0001-Port-spring-tx-to-javax.resources-1.7.patch b/springframework-3.2.6-port-spring-tx-to-javax.resources-1.7.patch
similarity index 100%
rename from 0001-Port-spring-tx-to-javax.resources-1.7.patch
rename to springframework-3.2.6-port-spring-tx-to-javax.resources-1.7.patch
diff --git a/0001-Port-to-hibernate-validator-5.patch b/springframework-3.2.6-port-to-hibernate-validator-5.patch
similarity index 100%
rename from 0001-Port-to-hibernate-validator-5.patch
rename to springframework-3.2.6-port-to-hibernate-validator-5.patch
diff --git a/springframework.spec b/springframework.spec
index 36a50c2..d0b0c53 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -2,8 +2,8 @@
%global namedversion %{version}%{?namedreltag}
Name: springframework
-Version: 3.2.5
-Release: 1%{?dist}
+Version: 3.2.6
+Release: 2%{?dist}
Summary: Spring Java Application Framework
Epoch: 0
License: ASL 2.0
@@ -31,12 +31,12 @@ Source117: http://repo1.maven.org/maven2/org/%{name}/spring-struts/%{namedve
Source118: http://repo1.maven.org/maven2/org/%{name}/spring-webmvc/%{namedversion}/spring-webmvc-%{namedversion}.pom
Source119: http://repo1.maven.org/maven2/org/%{name}/spring-webmvc-portlet/%{namedversion}/spring-webmvc-portlet-%{namedversion}.pom
-Patch0: 0001-Port-to-hibernate-validator-5.patch
-Patch1: 0001-Fix-exception-java.io.IOException-is-never-thrown-er.patch
-Patch2: 0001-Port-spring-tx-to-javax.resources-1.7.patch
-Patch3: 0001-Port-spring-orm-to-javax.persistence-2.0.patch
-Patch4: 0001-Port-spring-test-to-servlet-3.0.patch
-Patch5: 0001-Port-spring-jms-to-javax.resources-1.7.patch
+Patch0: springframework-3.2.6-java.io.IOException-is-never-thrown.patch
+Patch1: springframework-3.2.6-port-spring-jms-to-javax.resources-1.7.patch
+Patch2: springframework-3.2.6-port-spring-orm-to-javax.persistence-2.0.patch
+Patch3: springframework-3.2.6-port-spring-test-to-servlet-3.0.patch
+Patch4: springframework-3.2.6-port-spring-tx-to-javax.resources-1.7.patch
+Patch5: springframework-3.2.6-port-to-hibernate-validator-5.patch
# TODO: rebase the patch for 3.2.x
#Patch6: springframework-3.1.4-osgi-support.patch
@@ -110,7 +110,7 @@ BuildRequires: mvn(org.eclipse.persistence:org.eclipse.persistence.core)
BuildRequires: mvn(org.freemarker:freemarker)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.hibernate:hibernate-core:3)
-BuildRequires: mvn(org.hibernate:hibernate-entitymanager)
+BuildRequires: mvn(org.hibernate:hibernate-entitymanager:3)
BuildRequires: mvn(org.hibernate:hibernate-validator)
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api)
BuildRequires: mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.7_spec)
@@ -120,20 +120,6 @@ BuildRequires: mvn(org.jruby:jruby)
BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.quartz-scheduler:quartz-backward-compat)
BuildRequires: mvn(org.slf4j:slf4j-api)
-BuildRequires: mvn(org.springframework:spring-aop)
-BuildRequires: mvn(org.springframework:spring-beans)
-BuildRequires: mvn(org.springframework:spring-context)
-BuildRequires: mvn(org.springframework:spring-context-support)
-BuildRequires: mvn(org.springframework:spring-core)
-BuildRequires: mvn(org.springframework:spring-expression)
-BuildRequires: mvn(org.springframework:spring-instrument)
-BuildRequires: mvn(org.springframework:spring-jdbc)
-BuildRequires: mvn(org.springframework:spring-orm)
-BuildRequires: mvn(org.springframework:spring-oxm)
-BuildRequires: mvn(org.springframework:spring-tx)
-BuildRequires: mvn(org.springframework:spring-web)
-BuildRequires: mvn(org.springframework:spring-webmvc)
-BuildRequires: mvn(org.springframework:spring-webmvc-portlet)
BuildRequires: mvn(org.testng:testng)
BuildRequires: mvn(rome:rome)
BuildRequires: mvn(taglibs:standard)
@@ -314,6 +300,10 @@ cp %{SOURCE118} spring-webmvc/pom.xml
cp %{SOURCE119} spring-webmvc-portlet/pom.xml
+# do not generate R on hiberante4, we use version 3
+%pom_remove_dep :hibernate-entitymanager spring-orm
+%pom_add_dep org.hibernate:hibernate-entitymanager:3 spring-orm
+
# missing dep
%pom_remove_dep com.jayway.jsonpath:json-path spring-test
@@ -472,6 +462,10 @@ cp -p src/dist/* .
%changelog
+* Mon Jan 20 2014 Michal Srb <msrb at redhat.com> - 0:3.2.6-2
+- Update to 3.2.6
+- Fix BR
+
* Fri Jan 17 2014 Michal Srb <msrb at redhat.com> - 0:3.2.5-1
- Update to 3.2.5
More information about the scm-commits
mailing list