[springframework] Add support for new Maven compat version resolver (hibernate3)
Marek Goldmann
goldmann at fedoraproject.org
Thu Nov 8 12:27:09 UTC 2012
commit 73c8d58388f8d7f1c82eeceed7d774e7c6e62998
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Wed Nov 7 12:49:13 2012 +0100
Add support for new Maven compat version resolver (hibernate3)
springframework.spec | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/springframework.spec b/springframework.spec
index b0468c7..501ed54 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -1,7 +1,7 @@
Name: springframework
Summary: Spring Java Application Framework
Version: 3.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 0
License: ASL 2.0
Group: Development/Libraries
@@ -109,8 +109,8 @@ BuildRequires: geronimo-validation
BuildRequires: groovy
BuildRequires: h2
BuildRequires: hamcrest
-BuildRequires: hibernate3
-BuildRequires: hibernate3-entitymanager
+BuildRequires: hibernate3 >= 3.6.10-7
+BuildRequires: hibernate3-entitymanager >= 3.6.10-7
BuildRequires: hibernate-jpa-2.0-api
BuildRequires: hibernate-validator
BuildRequires: hsqldb
@@ -143,7 +143,7 @@ BuildRequires: apache-commons-lang
BuildRequires: apache-commons-pool
BuildRequires: axis
BuildRequires: eclipselink
-BuildRequires: eclipse-jdt
+BuildRequires: ecj
BuildRequires: freemarker >= 2.3.19
BuildRequires: geronimo-commonj
BuildRequires: geronimo-jaxrpc
@@ -359,7 +359,7 @@ Requires: aopalliance
Requires: eclipselink
Requires: geronimo-jta
Requires: glassfish-toplink-essentials
-Requires: hibernate3
+Requires: hibernate3 >= 3.6.10-7
Requires: hibernate-jpa-2.0-api
Requires: jdo2-api
Requires: openjpa
@@ -563,6 +563,18 @@ rm -rf org.springframework.orm/src/main/java/org/springframework/orm/ibatis/*
# Put the dummy root POM in place:
cp %{SOURCE1} pom.xml
+# Make sure we require version '3' of Hibernate
+while read f
+do
+
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:version" ${f}
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']" "<version>3</version>" ${f}
+
+done << EOF
+org.springframework.test/pom.xml
+org.springframework.integration-tests/pom.xml
+org.springframework.orm/pom.xml
+EOF
%build
@@ -724,6 +736,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
%changelog
+* Wed Nov 07 2012 Marek Goldmann <mgoldman at redhat.com> - 0:3.1.1-11
+- Add support for new Maven compat version resolver (hibernate3)
+
* Thu Aug 9 2012 Andy Grimm <agrimm at gmail.com> 0:3.1.1-10
- Enable ehcache and quartz in context-support module
More information about the scm-commits
mailing list