[wildfly] Hibernate support changes
Marek Goldmann
goldmann at fedoraproject.org
Tue Nov 12 14:02:25 UTC 2013
commit aaca11a302161ca08248a7ee5b4ea6a1f9bc8c5d
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Tue Nov 12 14:41:07 2013 +0100
Hibernate support changes
- Hibernate 4.3 support added
- Hibernate 4.1 support dropped
...jtype-dependency-to-hibernate-validator-t.patch | 2 +-
...ing-module-dependencies-in-mime4j-com.sun.patch | 2 +-
0003-fedora-Use-old-relaxngDatatype.patch | 2 +-
...a-Remove-jipijapa-hibernate4-3-depednency.patch | 43 ------------------
...-Use-ecj-instead-of-jasper-jdt-dependency.patch | 10 ++--
...ve-still-unavailable-in-Fedora-dependenci.patch | 14 +++---
...se-activation-classes-provided-by-the-JDK.patch | 8 ++--
...edora-Use-jws-classes-provided-by-the-JDK.patch | 8 ++--
...glassfish-el-and-jboss-el-3.0-api-togethe.patch | 8 ++--
...log4j-dependency-to-org.jboss.log4j.logma.patch | 6 +-
...ve-hornetq-native-extraction-we-re-linkin.patch | 6 +-
...ble-jipijapa-support-for-Hibernate-4.1-si.patch | 46 ++++++++++++++++++++
wildfly.spec | 28 ++++++------
13 files changed, 93 insertions(+), 90 deletions(-)
---
diff --git a/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch b/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
index 822bfe1..7b64cd6 100644
--- a/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
+++ b/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
@@ -121,5 +121,5 @@ index d199a24..db51dca 100644
<artifactId>jsf-impl</artifactId>
<version>${version.com.sun.faces}</version>
--
-1.8.3.1
+1.8.4.2
diff --git a/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch b/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
index 4ecc93f..68c635d 100644
--- a/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
+++ b/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
@@ -79,5 +79,5 @@ index 0e04923..65f3893 100644
</resources>
--
-1.8.3.1
+1.8.4.2
diff --git a/0003-fedora-Use-old-relaxngDatatype.patch b/0003-fedora-Use-old-relaxngDatatype.patch
index 31490bf..e5aaef3 100644
--- a/0003-fedora-Use-old-relaxngDatatype.patch
+++ b/0003-fedora-Use-old-relaxngDatatype.patch
@@ -49,5 +49,5 @@ index db51dca..88b8ed5 100644
<version>${version.com.github.relaxng}</version>
</dependency>
--
-1.8.3.1
+1.8.4.2
diff --git a/0005-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch b/0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
similarity index 89%
rename from 0005-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
rename to 0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
index 4a8141e..b3fc6de 100644
--- a/0005-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
+++ b/0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
@@ -1,4 +1,4 @@
-From 0c5684631937a7ae7a07072b6a289fa76038d889 Mon Sep 17 00:00:00 2001
+From a0f7394e8088c5fd7e1aace939f69917be5f3211 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Thu, 1 Aug 2013 14:34:53 +0200
Subject: [PATCH] [fedora] Use ecj instead of jasper-jdt dependency
@@ -9,7 +9,7 @@ Subject: [PATCH] [fedora] Use ecj instead of jasper-jdt dependency
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 98722cb..6c1e7e0 100755
+index 6d714ce..8308c26 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -1475,7 +1475,7 @@
@@ -22,10 +22,10 @@ index 98722cb..6c1e7e0 100755
<module-def name="io.undertow.websocket">
<maven-resource group="io.undertow" artifact="undertow-websockets-jsr"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 01a89c5..fe8032b 100644
+index f9f68f4..4b1bcc6 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1795,11 +1795,6 @@
+@@ -1793,11 +1793,6 @@
</dependency>
<dependency>
@@ -38,5 +38,5 @@ index 01a89c5..fe8032b 100644
<artifactId>jastow</artifactId>
</dependency>
--
-1.8.3.1
+1.8.4.2
diff --git a/0006-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
similarity index 94%
rename from 0006-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
rename to 0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
index a3a4348..de809e8 100644
--- a/0006-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+++ b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
@@ -1,4 +1,4 @@
-From a574e3aa35bdc81e287634c1e8d77f9034bcb98a Mon Sep 17 00:00:00 2001
+From 80b10c273ec1132f959fcc9298b4f62839fe7ea2 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Fri, 30 Nov 2012 14:01:30 +0100
Subject: [PATCH] [fedora] Remove still unavailable in Fedora dependencies
@@ -9,7 +9,7 @@ Subject: [PATCH] [fedora] Remove still unavailable in Fedora dependencies
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 6c1e7e0..ac31564 100755
+index 8308c26..4c2bcf0 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -99,7 +99,9 @@
@@ -53,7 +53,7 @@ index 6c1e7e0..ac31564 100755
<module-def name="org.picketbox">
<maven-resource group="org.picketbox" artifact="picketbox"/>
diff --git a/build/pom.xml b/build/pom.xml
-index fe8032b..fe075ee 100644
+index 4b1bcc6..4a3868e 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1030,11 +1030,13 @@
@@ -70,7 +70,7 @@ index fe8032b..fe075ee 100644
<dependency>
<groupId>org.wildfly</groupId>
-@@ -1594,10 +1596,12 @@
+@@ -1592,10 +1594,12 @@
<artifactId>jboss-sasl</artifactId>
</dependency>
@@ -83,7 +83,7 @@ index fe8032b..fe075ee 100644
<dependency>
<groupId>org.jboss.security</groupId>
-@@ -1916,6 +1920,7 @@
+@@ -1914,6 +1918,7 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
@@ -91,7 +91,7 @@ index fe8032b..fe075ee 100644
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-api</artifactId>
-@@ -1950,11 +1955,12 @@
+@@ -1948,11 +1953,12 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-impl</artifactId>
</dependency>
@@ -106,5 +106,5 @@ index fe8032b..fe075ee 100644
<dependency>
<groupId>org.scannotation</groupId>
--
-1.8.3.1
+1.8.4.2
diff --git a/0007-fedora-Use-activation-classes-provided-by-the-JDK.patch b/0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
similarity index 94%
rename from 0007-fedora-Use-activation-classes-provided-by-the-JDK.patch
rename to 0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
index 892ed50..9ce94f4 100644
--- a/0007-fedora-Use-activation-classes-provided-by-the-JDK.patch
+++ b/0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
@@ -1,4 +1,4 @@
-From d0c3412212341ed63c5be486ef9fa9be95a45ffb Mon Sep 17 00:00:00 2001
+From 58d92242bd465c758d5d72fca7ae5bdcbb4ece3c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Fri, 27 Sep 2013 12:31:34 +0200
Subject: [PATCH] [fedora] Use activation classes provided by the JDK
@@ -10,7 +10,7 @@ Subject: [PATCH] [fedora] Use activation classes provided by the JDK
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index ac31564..eb6614b 100755
+index 4c2bcf0..da190ed 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -479,9 +479,7 @@
@@ -25,7 +25,7 @@ index ac31564..eb6614b 100755
<module-def name="javax.annotation.api">
<maven-resource group="org.jboss.spec.javax.annotation" artifact="jboss-annotations-api_1.2_spec"/>
diff --git a/build/pom.xml b/build/pom.xml
-index fe075ee..9b21469 100644
+index 4a3868e..0e1eff4 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -406,11 +406,6 @@
@@ -57,5 +57,5 @@ index b2285d6..a503e6d 100644
<resources>
--
-1.8.3.1
+1.8.4.2
diff --git a/0008-fedora-Use-jws-classes-provided-by-the-JDK.patch b/0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
similarity index 94%
rename from 0008-fedora-Use-jws-classes-provided-by-the-JDK.patch
rename to 0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
index 4c2678f..986792f 100644
--- a/0008-fedora-Use-jws-classes-provided-by-the-JDK.patch
+++ b/0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
@@ -1,4 +1,4 @@
-From 8c2c8a19e2421e3f2e5d1a554884608f3b9bbcf8 Mon Sep 17 00:00:00 2001
+From fd34a339a7c3bcde28f012c48255e9b3d0f398ca Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed, 2 Oct 2013 12:52:37 +0200
Subject: [PATCH] [fedora] Use jws classes provided by the JDK
@@ -10,7 +10,7 @@ Subject: [PATCH] [fedora] Use jws classes provided by the JDK
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index eb6614b..a7d1b71 100755
+index da190ed..ad77bdf 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -523,9 +523,7 @@
@@ -25,7 +25,7 @@ index eb6614b..a7d1b71 100755
<module-def name="javax.management.j2ee.api">
<maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 9b21469..4f2d15c 100644
+index 0e1eff4..8b6021a 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -422,11 +422,6 @@
@@ -59,5 +59,5 @@ index 3332464..b2f5523 100644
<!-- Insert resources here -->
</resources>
--
-1.8.3.1
+1.8.4.2
diff --git a/0009-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch b/0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
similarity index 95%
rename from 0009-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
rename to 0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
index 1ad9e78..bf12a24 100644
--- a/0009-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
+++ b/0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
@@ -1,4 +1,4 @@
-From a1ac9744d8989611f85a25378effc3388464ef45 Mon Sep 17 00:00:00 2001
+From 08ad87e6aacecd97987788ceee78e6d3f771e39f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed, 2 Oct 2013 14:15:12 +0200
Subject: [PATCH] [fedora] Use glassfish-el and jboss-el-3.0-api together
@@ -14,7 +14,7 @@ Bug: https://bugzilla.redhat.com/show_bug.cgi?id=978306
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index a7d1b71..82c9801 100755
+index ad77bdf..a323631 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -758,7 +758,8 @@
@@ -28,7 +28,7 @@ index a7d1b71..82c9801 100755
<module-def name="org.glassfish.javax.enterprise.concurrent">
diff --git a/build/pom.xml b/build/pom.xml
-index 4f2d15c..e513ae1 100644
+index 8b6021a..f09d3bb 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -752,7 +752,7 @@
@@ -80,5 +80,5 @@ index 88b8ed5..d7a6a36 100644
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
--
-1.8.3.1
+1.8.4.2
diff --git a/0010-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch b/0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
similarity index 85%
rename from 0010-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
rename to 0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
index a6232e6..347d181 100644
--- a/0010-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
+++ b/0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
@@ -1,4 +1,4 @@
-From 6229ed5a23343e7740b24fd287e19d0be565e3a4 Mon Sep 17 00:00:00 2001
+From eded7239926a371d42ff5a96243d4baba7b31fe4 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed, 2 Oct 2013 14:20:19 +0200
Subject: [PATCH] [fedora] Add log4j dependency to org.jboss.log4j.logmanager
@@ -9,7 +9,7 @@ Subject: [PATCH] [fedora] Add log4j dependency to org.jboss.log4j.logmanager
1 file changed, 1 insertion(+)
diff --git a/build/build.xml b/build/build.xml
-index 82c9801..5c2ea17 100755
+index a323631..891f835 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -331,6 +331,7 @@
@@ -21,5 +21,5 @@ index 82c9801..5c2ea17 100755
</module-def>
--
-1.8.3.1
+1.8.4.2
diff --git a/0011-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch b/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
similarity index 88%
rename from 0011-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
rename to 0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
index fd43273..3e16f7b 100644
--- a/0011-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
+++ b/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
@@ -1,4 +1,4 @@
-From 42618e5f138c8b509f2690476a36c1ce7d2ff0e6 Mon Sep 17 00:00:00 2001
+From 1f65642a91fe6c6c37fbcb10daf6eb35ab56553f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Mon, 28 Oct 2013 15:32:57 +0100
Subject: [PATCH] [fedora] Remove hornetq-native extraction, we're linking it
@@ -9,7 +9,7 @@ Subject: [PATCH] [fedora] Remove hornetq-native extraction, we're linking it
1 file changed, 1 deletion(-)
diff --git a/build/build.xml b/build/build.xml
-index 5c2ea17..9883dd8 100755
+index 891f835..105c530 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -822,7 +822,6 @@
@@ -21,5 +21,5 @@ index 5c2ea17..9883dd8 100755
<module-def name="org.hornetq.protocol.amqp">
--
-1.8.3.1
+1.8.4.2
diff --git a/0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch b/0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
new file mode 100644
index 0000000..1189d7d
--- /dev/null
+++ b/0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
@@ -0,0 +1,46 @@
+From d74164256abbb77cde76e69e5abd3b8ae76c8188 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 12 Nov 2013 11:25:59 +0100
+Subject: [PATCH] [fedora] Disable jipijapa support for Hibernate 4.1 since
+ it's not available on Fedora
+
+---
+ build/build.xml | 5 -----
+ build/pom.xml | 5 -----
+ 2 files changed, 10 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 105c530..20ea321 100755
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -792,11 +792,6 @@
+ <maven-resource group="org.jipijapa" artifact="jipijapa-hibernate3"/>
+ </module-def>
+
+- <!-- create empty slot for Hibernate 4.1.x or 4.2.x jars -->
+- <module-def name="org.hibernate" slot="4.1">
+- <maven-resource group="org.jipijapa" artifact="jipijapa-hibernate4-1"/>
+- </module-def>
+-
+ <!-- create empty slot for OpenJPA jars -->
+ <module-def name="org.apache.openjpa">
+ <maven-resource group="org.jipijapa" artifact="jipijapa-openjpa"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index f09d3bb..bfbb355 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1341,11 +1341,6 @@
+
+ <dependency>
+ <groupId>org.jipijapa</groupId>
+- <artifactId>jipijapa-hibernate4-1</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jipijapa</groupId>
+ <artifactId>jipijapa-eclipselink</artifactId>
+ </dependency>
+
+--
+1.8.4.2
+
diff --git a/wildfly.spec b/wildfly.spec
index 3beb502..e69324e 100644
--- a/wildfly.spec
+++ b/wildfly.spec
@@ -19,7 +19,7 @@
Name: wildfly
Version: 8.0.0
-Release: 0.13%{namedreltag}%{?dist}
+Release: 0.14%{namedreltag}%{?dist}
Summary: WildFly Application Server
License: LGPLv2+ and ASL 2.0 and GPLv2 with exceptions
URL: http://wildfly.org/
@@ -48,14 +48,14 @@ Obsoletes: jboss-as < 7.1.1-22
Patch0: 0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
Patch1: 0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
Patch2: 0003-fedora-Use-old-relaxngDatatype.patch
-Patch3: 0004-fedora-Remove-jipijapa-hibernate4-3-depednency.patch
-Patch4: 0005-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
-Patch5: 0006-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
-Patch6: 0007-fedora-Use-activation-classes-provided-by-the-JDK.patch
-Patch7: 0008-fedora-Use-jws-classes-provided-by-the-JDK.patch
-Patch8: 0009-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
-Patch9: 0010-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
-Patch10: 0011-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
+Patch3: 0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
+Patch4: 0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+Patch5: 0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
+Patch6: 0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
+Patch7: 0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
+Patch8: 0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
+Patch9: 0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
+Patch10: 0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
BuildArch: noarch
@@ -204,7 +204,7 @@ BuildRequires: jcip-annotations
BuildRequires: jdom
BuildRequires: jul-to-slf4j-stub
BuildRequires: joda-time
-BuildRequires: jipijapa >= 1.0.0-0.3
+BuildRequires: jipijapa >= 1.0.0-0.4
BuildRequires: jsonp
BuildRequires: jsoup
BuildRequires: jtype
@@ -546,10 +546,6 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath xml-commons-apis) org/apache/xerces/main/xml-commons-apis.jar
ln -s $(build-classpath xml-commons-resolver) org/apache/xml-resolver/main/xml-commons-resolver-1.2.jar
ln -s $(build-classpath jbossws-cxf/jbossws-cxf-resources) org/jboss/as/webservices/main/jbossws-cxf-resources.jar
- ln -s $(build-classpath hibernate/hibernate-core) org/hibernate/main/hibernate-core.jar
- ln -s $(build-classpath hibernate/hibernate-entitymanager) org/hibernate/main/hibernate-entitymanager.jar
- ln -s $(build-classpath hibernate/hibernate-infinispan) org/hibernate/main/hibernate-infinispan.jar
- ln -s $(build-classpath hibernate/hibernate-envers) org/hibernate/main/hibernate-envers.jar
# Incorrect symlinks made by xmvn
# https://bugzilla.redhat.com/show_bug.cgi?id=1007687
@@ -676,6 +672,10 @@ done
%doc tools/maven/LICENSE.txt
%changelog
+* Tue Nov 12 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.14.Beta1
+- Hibernate 4.3 support added
+- Hibernate 4.1 support dropped
+
* Wed Oct 30 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.13.Beta1
- Removed jline BR, RHBZ#1023006
More information about the scm-commits
mailing list