[hibernate3] - Removing test deps from poms - Added geronimo-jta to R for hibernate-core

[Marek Goldmann]

commit e54c7c2bca987891260c46190ceceb3883347be2
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Thu Jul 11 15:42:06 2013 +0200

    - Removing test deps from poms
    - Added geronimo-jta to R for hibernate-core

 hibernate3.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/hibernate3.spec b/hibernate3.spec
index 53b8b04..31527f4 100644
--- a/hibernate3.spec
+++ b/hibernate3.spec
@@ -5,7 +5,7 @@
 
 Name: hibernate3
 Version: 3.6.10
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Relational persistence and query service
 
 Group: Development/Libraries
@@ -38,6 +38,7 @@ BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: geronimo-validation
+BuildRequires: geronimo-jta
 BuildRequires: maven-injection-plugin
 BuildRequires: antlr-maven-plugin
 BuildRequires: hibernate-validator
@@ -52,6 +53,10 @@ BuildRequires: jbosscache-core
 BuildRequires: jbosscache-common-parent
 BuildRequires: infinispan
 BuildRequires: rhq-plugin-annotations
+BuildRequires: h2
+BuildRequires: hsqldb1
+BuildRequires: glassfish-jaxb
+BuildRequires: shrinkwrap
 
 Requires: java
 Requires: jpackage-utils
@@ -62,6 +67,7 @@ Requires: geronimo-validation
 Requires: hibernate-commons-annotations
 Requires: hibernate-jpa-2.0-api
 Requires: jboss-servlet-3.0-api
+Requires: geronimo-jta
 
 %description
 Hibernate is a powerful, ultra-high performance
@@ -158,6 +164,14 @@ Requires: junit
 %pom_disable_module hibernate-jdbc3-testing
 %pom_disable_module hibernate-jdbc4-testing
 
+# Remove test deps
+for m in envers infinispan entitymanager jbosscache ehcache; do
+%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" hibernate-${m}/pom.xml
+done
+
+# We don't need it
+%pom_xpath_remove pom:build/pom:extensions hibernate-parent/pom.xml
+
 # disable hibernate-tools support
 %pom_remove_dep org.hibernate:hibernate-tools hibernate-envers
 %pom_remove_dep ant:ant hibernate-envers
@@ -167,6 +181,9 @@ rm -r hibernate-envers/src/main/java/org/hibernate/tool/ant/*.java \
 # Make hibernate-testing back a test dependency...
 sed -i "s|<!-- <scope>test</scope> TODO fix this -->|<scope>test</scope>|" hibernate-infinispan/pom.xml
 
+# Fix the c3p0 gid
+sed -i "s|groupId>c3p0</groupId|groupId>com.mchange</groupId|" hibernate-c3p0/pom.xml
+
 %build
 
 # Currently 4 tests fail with this error:
@@ -300,6 +317,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}-testing
 
 %changelog
+* Wed Jul 10 2013 Marek Goldmann <mgoldman at redhat.com> - 3.6.10-10
+- Removing test deps from poms
+- Added geronimo-jta to R for hibernate-core
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild