commit bfb2d4dcc9b8a112c1f4077b51d6207d5606b837
Author: Marek Goldmann <marek.goldmann(a)gmail.com>
Date: Tue Nov 12 10:58:22 2013 +0100
Hibernate support changes
- Enable Hibernate 4.3 support
- Disable Hibernate 4.1 support
jipijapa.spec | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/jipijapa.spec b/jipijapa.spec
index d2e099c..876dd2e 100644
--- a/jipijapa.spec
+++ b/jipijapa.spec
@@ -2,7 +2,7 @@
%global namedversion %{version}%{?namedreltag}
Name: jipijapa
Version: 1.0.0
-Release: 0.3%{namedreltag}%{?dist}
+Release: 0.4%{namedreltag}%{?dist}
Summary: Improve application platform integration with JPA persistence providers
License: ASL 2.0 and LGPLv2+
URL:
http://www.jboss.org
@@ -30,17 +30,11 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: hibernate3
BuildRequires: hibernate3-entitymanager
BuildRequires: hibernate3-infinispan
-# hibernate 4.2.0.CR1
-BuildRequires: mvn(org.hibernate:hibernate-core)
-BuildRequires: mvn(org.hibernate:hibernate-entitymanager)
-BuildRequires: mvn(org.hibernate:hibernate-infinispan)
# hibernate-validator >= 4.3.1.Final
BuildRequires: mvn(org.hibernate:hibernate-validator)
BuildRequires: mvn(org.hibernate.common:hibernate-commons-annotations) >= 4.0.1
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api)
BuildRequires: mvn(org.jboss:jboss-vfs) >= 3.1.0
-# HIBERNATE 4_3 module
-%if 0
BuildRequires: mvn(org.hibernate:hibernate-core) >= 4.3.0.Beta2
BuildRequires: mvn(org.hibernate:hibernate-entitymanager) >= 4.3.0.Beta2
BuildRequires: mvn(org.hibernate:hibernate-infinispan) >= 4.3.0.Beta2
@@ -48,7 +42,6 @@ BuildRequires: mvn(org.hibernate:hibernate-infinispan) >=
4.3.0.Beta2
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-api) >= 1.0.0-beta-6
BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) >= 1.0.0-beta-6
-%endif
# OPENJPA module
BuildRequires: mvn(org.apache.openjpa:openjpa-kernel) >= 2.1.1
BuildRequires: mvn(org.apache.openjpa:openjpa-lib) >= 2.1.1
@@ -83,8 +76,8 @@ This package contains javadoc for %{name}.
%pom_remove_dep "org.hibernate:hibernate-commons-annotations"
hibernate3/pom.xml
%pom_add_dep "org.hibernate.common:hibernate-commons-annotations"
hibernate3/pom.xml
-# requires: hibernate4_3>4.3.0.Beta2
-%pom_disable_module hibernate4_3
+# Hibernate 4.1 not available anymore
+%pom_disable_module hibernate4_1
%pom_xpath_set "pom:project/pom:properties/pom:version.org.hibernate3" 3
@@ -92,7 +85,6 @@ cp -p %{SOURCE1} .
sed -i 's/\r//' LICENSE-2.0.txt
%build
-
%mvn_build
%install
@@ -106,6 +98,10 @@ sed -i 's/\r//' LICENSE-2.0.txt
%doc LICENSE-2.0.txt
%changelog
+* Tue Nov 12 2013 Marek Goldmann <mgoldman(a)redhat.com> - 1.0.0-0.4.Beta1
+- Enable Hibernate 4.3 support
+- Disable Hibernate 4.1 support
+
* Tue Oct 22 2013 Marek Goldmann <mgoldman(a)redhat.com> - 1.0.0-0.3.Beta1
- Upstream release 1.0.0.Beta1