[wildfly] Upstream release 8.0.0.CR1
Marek Goldmann
goldmann at fedoraproject.org
Wed Jan 22 15:23:16 UTC 2014
commit 81a32f5e731119eb4d65e19d283263747e4d5974
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Jan 22 16:23:26 2014 +0100
Upstream release 8.0.0.CR1
.gitignore | 1 +
...jtype-dependency-to-hibernate-validator-t.patch | 18 ++--
...ing-module-dependencies-in-mime4j-com.sun.patch | 12 ++--
0003-fedora-Use-old-relaxngDatatype.patch | 14 ++--
...-Use-ecj-instead-of-jasper-jdt-dependency.patch | 12 ++--
...ve-still-unavailable-in-Fedora-dependenci.patch | 46 +++++------
...se-activation-classes-provided-by-the-JDK.patch | 10 +-
...edora-Use-jws-classes-provided-by-the-JDK.patch | 14 ++--
...glassfish-el-and-jboss-el-3.0-api-togethe.patch | 18 ++--
...log4j-dependency-to-org.jboss.log4j.logma.patch | 6 +-
...ve-hornetq-native-extraction-we-re-linkin.patch | 20 +++--
...ble-jipijapa-support-for-Hibernate-4.1-si.patch | 10 +-
0012-fedora-Use-Netty-4-only.patch | 80 ++++++++++++++++++
sources | 2 +-
wildfly.spec | 86 +++++++++++---------
15 files changed, 216 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6ae445..4fbea06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/wildfly-8.0.0.Alpha3-CLEAN.tar.xz
/wildfly-8.0.0.Alpha4-CLEAN.tar.xz
/wildfly-8.0.0.Beta1-CLEAN.tar.xz
+/wildfly-8.0.0.CR1-CLEAN.tar.xz
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 7b64cd6..894ba2c 100644
--- a/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
+++ b/0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
@@ -1,4 +1,4 @@
-From 203002a1a9185fb87e651e610bb8cc7714fcc11f Mon Sep 17 00:00:00 2001
+From 3d14f31ce995ea9a4702074d4aa4ed160ea1b6ab Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 22 Aug 2012 11:23:43 +0200
Subject: [PATCH] [fedora] Add jtype dependency to hibernate-validator to fix
@@ -14,10 +14,10 @@ Subject: [PATCH] [fedora] Add jtype dependency to hibernate-validator to fix
create mode 100644 build/src/main/resources/modules/system/layers/base/com/googlecode/jtype/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index d5b7e13..05ce86b 100755
+index 5dfe99e..14e7b33 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -425,6 +425,10 @@
+@@ -426,6 +426,10 @@
<maven-resource group="com.google.protobuf" artifact="protobuf-java" />
</module-def>
@@ -29,10 +29,10 @@ index d5b7e13..05ce86b 100755
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 3ecada9..68240b8 100644
+index 886c315..1efc8f5 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -301,6 +301,11 @@
+@@ -246,6 +246,11 @@
</dependency>
<dependency>
@@ -96,18 +96,18 @@ index 9260d48..76913ef 100644
<module name="javax.validation.api"/>
<module name="javax.xml.bind.api"/>
diff --git a/pom.xml b/pom.xml
-index d199a24..db51dca 100644
+index 60bae93..37032c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
- <version.com.google.guava>13.0.1</version.com.google.guava>
+ <version.com.google.guava>15.0</version.com.google.guava>
<version.com.google.protobuf>2.5.0</version.com.google.protobuf>
<version.com.h2database>1.3.173</version.com.h2database>
+ <version.com.googlecode.jtype>0.1.1</version.com.googlecode.jtype>
<version.com.sun.codemodel>2.6</version.com.sun.codemodel>
- <version.com.sun.faces>2.2.3-jbossorg-1</version.com.sun.faces>
+ <version.com.sun.faces>2.2.4-jbossorg-1</version.com.sun.faces>
<version.com.sun.istack>2.6.1</version.com.sun.istack>
-@@ -1456,6 +1457,12 @@
+@@ -1509,6 +1510,12 @@
</dependency>
<dependency>
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 68c635d..dcb0ddd 100644
--- a/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
+++ b/0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
@@ -1,4 +1,4 @@
-From 0bf2332734e2a22bc68ff7792ccc99e617411670 Mon Sep 17 00:00:00 2001
+From 105853b12d21cd3bfea7779a72228050c8196a96 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Fri, 30 Nov 2012 13:24:53 +0100
Subject: [PATCH] [fedora] Missing module dependencies in mime4j,
@@ -12,10 +12,10 @@ Subject: [PATCH] [fedora] Missing module dependencies in mime4j,
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 05ce86b..036c0aa 100755
+index 14e7b33..48ba559 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -685,7 +685,9 @@
+@@ -698,7 +698,9 @@
</module-def>
<module-def name="org.apache.james.mime4j">
@@ -25,12 +25,12 @@ index 05ce86b..036c0aa 100755
+ <maven-resource group="org.apache.james" artifact="apache-mime4j-storage"/>
</module-def>
- <module-def name="org.apache.neethi">
+ <module-def name="org.apache.lucene">
diff --git a/build/pom.xml b/build/pom.xml
-index 68240b8..afa2c2c 100644
+index 1efc8f5..e5734ce 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -658,7 +658,17 @@
+@@ -608,7 +608,17 @@
<dependency>
<groupId>org.apache.james</groupId>
diff --git a/0003-fedora-Use-old-relaxngDatatype.patch b/0003-fedora-Use-old-relaxngDatatype.patch
index e5aaef3..d2a537b 100644
--- a/0003-fedora-Use-old-relaxngDatatype.patch
+++ b/0003-fedora-Use-old-relaxngDatatype.patch
@@ -1,4 +1,4 @@
-From 5855fd513f8e70f05fabc9041d6e5e927321cd15 Mon Sep 17 00:00:00 2001
+From 8c2b858be337456c74b681699d93d3df7034ad83 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann at gmail.com>
Date: Thu, 1 Aug 2013 14:11:47 +0200
Subject: [PATCH] [fedora] Use old relaxngDatatype.
@@ -10,10 +10,10 @@ Subject: [PATCH] [fedora] Use old relaxngDatatype.
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 036c0aa..6d714ce 100755
+index 48ba559..cb7fd16 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -414,7 +414,7 @@
+@@ -415,7 +415,7 @@
</module-def>
<module-def name="com.github.relaxng">
@@ -23,10 +23,10 @@ index 036c0aa..6d714ce 100755
<module-def name="com.google.guava">
diff --git a/build/pom.xml b/build/pom.xml
-index afa2c2c..f9f68f4 100644
+index e5734ce..75cfbfc 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -276,7 +276,7 @@
+@@ -221,7 +221,7 @@
</dependency>
<dependency>
@@ -36,10 +36,10 @@ index afa2c2c..f9f68f4 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index db51dca..88b8ed5 100644
+index 37032c9..adc22ed 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -1413,7 +1413,7 @@
+@@ -1474,7 +1474,7 @@
</dependency>
<dependency>
diff --git a/0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch b/0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
index b3fc6de..4f5fed6 100644
--- a/0004-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 a0f7394e8088c5fd7e1aace939f69917be5f3211 Mon Sep 17 00:00:00 2001
+From 355c7158ef1fce2b6abed2ec4d0236d48de6b988 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,10 +9,10 @@ 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 6d714ce..8308c26 100755
+index cb7fd16..cfec22e 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -1475,7 +1475,7 @@
+@@ -1531,7 +1531,7 @@
<maven-resource group="io.undertow.jastow" artifact="jastow"/>
</module-def>
<module-def name="io.undertow.jasper-jdt">
@@ -20,12 +20,12 @@ index 6d714ce..8308c26 100755
+ <maven-resource group="org.eclipse.jdt.core.compiler" artifact="ecj"/>
</module-def>
<module-def name="io.undertow.websocket">
- <maven-resource group="io.undertow" artifact="undertow-websockets-jsr"/>
+ <maven-resource group="io.undertow" artifact="undertow-websockets-jsr"/>
diff --git a/build/pom.xml b/build/pom.xml
-index f9f68f4..4b1bcc6 100644
+index 75cfbfc..a1133bf 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1793,11 +1793,6 @@
+@@ -1833,11 +1833,6 @@
</dependency>
<dependency>
diff --git a/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
index de809e8..f685c32 100644
--- a/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+++ b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
@@ -1,18 +1,18 @@
-From 80b10c273ec1132f959fcc9298b4f62839fe7ea2 Mon Sep 17 00:00:00 2001
+From 62ba9571567631a03e3accbbc1864775e142fcd4 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
---
build/build.xml | 8 ++++++--
- build/pom.xml | 8 +++++++-
- 2 files changed, 13 insertions(+), 3 deletions(-)
+ build/pom.xml | 6 ++++++
+ 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 8308c26..4c2bcf0 100755
+index cfec22e..6a482e1 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -99,7 +99,9 @@
+@@ -100,7 +100,9 @@
<target name="create-ext-content">
<mkdir dir="${output.dir}/modules/system/layers/base/org/jboss/integration/ext-content/main/bundled"/>
@@ -22,7 +22,7 @@ index 8308c26..4c2bcf0 100755
<!-- Copy the EJB specific schemas to the JBOSS_HOME/docs/schema folder -->
<unzip src="${org.jboss.metadata:jboss-metadata-ejb:jar}" dest="${output.dir}/docs/schema/">
-@@ -886,9 +888,11 @@
+@@ -935,9 +937,11 @@
<maven-resource group="org.wildfly" artifact="wildfly-appclient"/>
</module-def>
@@ -34,7 +34,7 @@ index 8308c26..4c2bcf0 100755
<module-def name="org.jboss.as.cli">
<maven-resource group="org.wildfly" artifact="wildfly-cli"/>
-@@ -1387,8 +1391,7 @@
+@@ -1444,8 +1448,7 @@
<maven-resource group="org.osgi" artifact="org.osgi.core"/>
</module-def>
@@ -44,33 +44,33 @@ index 8308c26..4c2bcf0 100755
<module-def name="org.picketlink.common">
<maven-resource group="org.picketlink" artifact="picketlink-common"/>
-@@ -1421,6 +1424,7 @@
- <module-def name="org.picketlink.idm">
+@@ -1478,6 +1481,7 @@
+ <module-def name="org.picketlink.idm">
<maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
</module-def>
+ -->
- <module-def name="org.picketbox">
+ <module-def name="org.picketbox">
<maven-resource group="org.picketbox" artifact="picketbox"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 4b1bcc6..4a3868e 100644
+index a1133bf..e3f1ce8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1030,11 +1030,13 @@
+@@ -1037,11 +1037,13 @@
<artifactId>wildfly-configadmin</artifactId>
</dependency>
+ <!--
<dependency>
- <groupId>org.jboss.hal</groupId>
+ <groupId>org.jboss.hal</groupId>
<artifactId>release-stream</artifactId>
- <classifier>resources</classifier>
+ <classifier>resources</classifier>
</dependency>
+ -->
<dependency>
<groupId>org.wildfly</groupId>
-@@ -1592,10 +1594,12 @@
+@@ -1637,10 +1639,12 @@
<artifactId>jboss-sasl</artifactId>
</dependency>
@@ -83,21 +83,15 @@ index 4b1bcc6..4a3868e 100644
<dependency>
<groupId>org.jboss.security</groupId>
-@@ -1914,6 +1918,7 @@
+@@ -1948,6 +1952,7 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
-+ <!--
- <dependency>
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-api</artifactId>
-@@ -1948,11 +1953,12 @@
- <groupId>org.picketlink</groupId>
- <artifactId>picketlink-idm-impl</artifactId>
- </dependency>
--
-+
++ <!--
<dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-api</artifactId>
+@@ -1987,6 +1992,7 @@
<groupId>org.picketlink.distribution</groupId>
<artifactId>picketlink-jbas7</artifactId>
</dependency>
diff --git a/0006-fedora-Use-activation-classes-provided-by-the-JDK.patch b/0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
index 9ce94f4..25fba94 100644
--- a/0006-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 58d92242bd465c758d5d72fca7ae5bdcbb4ece3c Mon Sep 17 00:00:00 2001
+From bd65aaf057d9ce9250e462ef64b80c144ab101a6 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,10 +10,10 @@ 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 4c2bcf0..da190ed 100755
+index 6a482e1..6a7127a 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -479,9 +479,7 @@
+@@ -488,9 +488,7 @@
<module-def name="javaee.api"/>
@@ -25,10 +25,10 @@ index 4c2bcf0..da190ed 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 4a3868e..0e1eff4 100644
+index e3f1ce8..d6f1771 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -406,11 +406,6 @@
+@@ -351,11 +351,6 @@
</dependency>
<dependency>
diff --git a/0007-fedora-Use-jws-classes-provided-by-the-JDK.patch b/0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
index 986792f..58f4a6b 100644
--- a/0007-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 fd34a339a7c3bcde28f012c48255e9b3d0f398ca Mon Sep 17 00:00:00 2001
+From 047cc51f214426ee51e4b7f57487f1c4ecebf418 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,10 +10,10 @@ 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 da190ed..ad77bdf 100755
+index 6a7127a..e2392b7 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -523,9 +523,7 @@
+@@ -532,9 +532,7 @@
<maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_2.0_spec"/>
</module-def>
@@ -25,10 +25,10 @@ index da190ed..ad77bdf 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 0e1eff4..8b6021a 100644
+index d6f1771..7593ff9 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -422,11 +422,6 @@
+@@ -367,11 +367,6 @@
</dependency>
<dependency>
@@ -37,8 +37,8 @@ index 0e1eff4..8b6021a 100644
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
diff --git a/build/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml b/build/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml
index 3332464..b2f5523 100644
diff --git a/0008-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
index bf12a24..e659559 100644
--- a/0008-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 08ad87e6aacecd97987788ceee78e6d3f771e39f Mon Sep 17 00:00:00 2001
+From 71a84fffb603064e8ad92c3fd7ceba941f14a054 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,10 +14,10 @@ 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 ad77bdf..a323631 100755
+index e2392b7..36a8d7e 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -758,7 +758,8 @@
+@@ -778,7 +778,8 @@
</module-def>
<module-def name="org.glassfish.javax.el">
@@ -28,10 +28,10 @@ index ad77bdf..a323631 100755
<module-def name="org.glassfish.javax.enterprise.concurrent">
diff --git a/build/pom.xml b/build/pom.xml
-index 8b6021a..f09d3bb 100644
+index 7593ff9..8b7373e 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -752,7 +752,7 @@
+@@ -719,7 +719,7 @@
</dependency>
<dependency>
@@ -40,7 +40,7 @@ index 8b6021a..f09d3bb 100644
<artifactId>javax.el</artifactId>
</dependency>
-@@ -763,6 +763,11 @@
+@@ -730,6 +730,11 @@
</dependency>
<dependency>
@@ -53,10 +53,10 @@ index 8b6021a..f09d3bb 100644
<artifactId>hibernate-core</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
-index 88b8ed5..d7a6a36 100644
+index adc22ed..91fc6d6 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -3463,7 +3463,7 @@
+@@ -3569,7 +3569,7 @@
<!-- EL3 RI implementation -->
<dependency>
@@ -65,7 +65,7 @@ index 88b8ed5..d7a6a36 100644
<artifactId>javax.el</artifactId>
<version>${version.org.glassfish.javax.el}</version>
</dependency>
-@@ -3482,6 +3482,13 @@
+@@ -3588,6 +3588,13 @@
</dependency>
<dependency>
diff --git a/0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch b/0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
index 347d181..8073277 100644
--- a/0009-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 eded7239926a371d42ff5a96243d4baba7b31fe4 Mon Sep 17 00:00:00 2001
+From 7ac997f50bfb326873276c61125227edaa3ce06c 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,10 +9,10 @@ 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 a323631..891f835 100755
+index 36a8d7e..0ee17f8 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -331,6 +331,7 @@
+@@ -332,6 +332,7 @@
</module-def>
<module-def name="org.jboss.log4j.logmanager">
diff --git a/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch b/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
index 3e16f7b..d616831 100644
--- a/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
+++ b/0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
@@ -1,22 +1,24 @@
-From 1f65642a91fe6c6c37fbcb10daf6eb35ab56553f Mon Sep 17 00:00:00 2001
+From e4cf1fd0fa569acab036f1744350d72e4da7d473 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
in the spec file instead
---
- build/build.xml | 1 -
- 1 file changed, 1 deletion(-)
+ build/build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/build/build.xml b/build/build.xml
-index 891f835..105c530 100755
+index 0ee17f8..706af91 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -822,7 +822,6 @@
- <maven-resource group="org.hornetq" artifact="hornetq-journal"/>
- <maven-resource group="org.hornetq" artifact="hornetq-jms-client"/>
- <maven-resource group="org.hornetq" artifact="hornetq-jms-server"/>
-- <extract-native-jar group="org.hornetq" artifact="hornetq-native"/>
+@@ -857,7 +857,9 @@
+ and contains native libraries that are extracted
+ -->
+ <maven-resource group="org.hornetq" artifact="hornetq-native"/>
++ <!-- Do not extract the jar files in Fedora, we'll symlink them
+ <extract-native-jar group="org.hornetq" artifact="hornetq-native"/>
++ -->
</module-def>
<module-def name="org.hornetq.protocol.amqp">
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
index 1189d7d..3920f7f 100644
--- a/0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
+++ b/0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
@@ -1,4 +1,4 @@
-From d74164256abbb77cde76e69e5abd3b8ae76c8188 Mon Sep 17 00:00:00 2001
+From 18eaac7af7c2e3fd1e87de17f22c6155e30f5690 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
@@ -10,10 +10,10 @@ Subject: [PATCH] [fedora] Disable jipijapa support for Hibernate 4.1 since
2 files changed, 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 105c530..20ea321 100755
+index 706af91..3cb8ecd 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -792,11 +792,6 @@
+@@ -822,11 +822,6 @@
<maven-resource group="org.jipijapa" artifact="jipijapa-hibernate3"/>
</module-def>
@@ -26,10 +26,10 @@ index 105c530..20ea321 100755
<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
+index 8b7373e..e85643f 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1341,11 +1341,6 @@
+@@ -1348,11 +1348,6 @@
<dependency>
<groupId>org.jipijapa</groupId>
diff --git a/0012-fedora-Use-Netty-4-only.patch b/0012-fedora-Use-Netty-4-only.patch
new file mode 100644
index 0000000..e3bcf7c
--- /dev/null
+++ b/0012-fedora-Use-Netty-4-only.patch
@@ -0,0 +1,80 @@
+From a24189f824bd552d9f32f702eb2dd78877f585c8 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Fri, 10 Jan 2014 14:02:17 +0100
+Subject: [PATCH] [fedora] Use Netty 4 only
+
+---
+ build/build.xml | 8 --------
+ build/pom.xml | 9 ---------
+ pom.xml | 9 +--------
+ 3 files changed, 1 insertion(+), 25 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 3cb8ecd..bef04b2 100755
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -1235,14 +1235,6 @@
+ <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-core"/>
+ </module-def>
+
+- <!--
+- Starting with 3.4.x Netty has changed its groupId to io.netty but packages
+- remained with org.jboss.netty
+- -->
+- <module-def name="org.jboss.netty">
+- <maven-resource group="io.netty" artifact="netty"/>
+- </module-def>
+-
+ <module-def name="org.jboss.remote-naming">
+ <maven-resource group="org.jboss" artifact="jboss-remote-naming"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index e85643f..8ab876e 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1502,15 +1502,6 @@
+ </dependency>
+
+ <!--
+- Netty 3
+- io.netty:netty is for Netty 3.x versions
+- -->
+- <dependency>
+- <groupId>io.netty</groupId>
+- <artifactId>netty</artifactId>
+- </dependency>
+-
+- <!--
+ Netty 4
+ io.netty:netty-all is for Netty 4.x versions
+ -->
+diff --git a/pom.xml b/pom.xml
+index 91fc6d6..5f22f0c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -105,8 +105,7 @@
+ <version.dom4j>1.6.1</version.dom4j>
+ <version.gnu.getopt>1.0.13</version.gnu.getopt>
+ <version.groovy-all>2.1.8</version.groovy-all>
+- <version.io.netty3>3.6.6.Final</version.io.netty3>
+- <version.io.netty>4.0.13.Final</version.io.netty>
++ <version.io.netty>4</version.io.netty>
+ <version.io.undertow>1.0.0.Beta30</version.io.undertow>
+ <version.io.undertow.jastow>1.0.0.CR1</version.io.undertow.jastow>
+ <version.javax.activation>1.1.1</version.javax.activation>
+@@ -4897,12 +4896,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>io.netty</groupId>
+- <artifactId>netty</artifactId>
+- <version>${version.io.netty3}</version>
+- </dependency>
+-
+- <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ <version>${version.io.undertow}</version>
+--
+1.8.4.2
+
diff --git a/sources b/sources
index 15ac0d9..1092831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9528d98183cfbdd2a7ec2331b8a4b325 wildfly-8.0.0.Beta1-CLEAN.tar.xz
+c640cd4e0d0cfdeaa741274ea41e6b1b wildfly-8.0.0.CR1-CLEAN.tar.xz
diff --git a/wildfly.spec b/wildfly.spec
index e69324e..7b52040 100644
--- a/wildfly.spec
+++ b/wildfly.spec
@@ -1,4 +1,4 @@
-%global namedreltag .Beta1
+%global namedreltag .CR1
%global namedversion %{version}%{?namedreltag}
%global cachedir %{_var}/cache/%{name}
@@ -19,15 +19,15 @@
Name: wildfly
Version: 8.0.0
-Release: 0.14%{namedreltag}%{?dist}
+Release: 0.16%{namedreltag}%{?dist}
Summary: WildFly Application Server
License: LGPLv2+ and ASL 2.0 and GPLv2 with exceptions
URL: http://wildfly.org/
# git clone git://github.com/wildfly/wildfly.git
-# cd wildfly && git checkout 8.0.0.Beta1 && git checkout-index -f -a --prefix=wildfly-8.0.0.Beta1/
-# find wildfly-8.0.0.Beta1/ -name '*.jar' -type f -delete
-# tar -cJf wildfly-8.0.0.Beta1-CLEAN.tar.xz wildfly-8.0.0.Beta1
+# cd wildfly && git checkout 8.0.0.CR1 && git checkout-index -f -a --prefix=wildfly-8.0.0.CR1/
+# find wildfly-8.0.0.CR1/ -name '*.jar' -type f -delete
+# tar -cJf wildfly-8.0.0.CR1-CLEAN.tar.xz wildfly-8.0.0.CR1
Source0: wildfly-%{namedversion}-CLEAN.tar.xz
# Makes possible to run WildFly AS in different directory by creating the structure and copying required configuration files
@@ -56,6 +56,7 @@ Patch7: 0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patc
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
+Patch11: 0012-fedora-Use-Netty-4-only.patch
BuildArch: noarch
@@ -105,7 +106,7 @@ BuildRequires: hibernate3-infinispan
BuildRequires: hibernate-commons-annotations
BuildRequires: hibernate-jpa-2.1-api
BuildRequires: hibernate-validator
-BuildRequires: hornetq >= 2.4.0-0.2
+BuildRequires: hornetq >= 2.4.0-1
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: git
@@ -115,18 +116,20 @@ BuildRequires: glassfish-annotation-api
BuildRequires: glassfish-el
BuildRequires: glassfish-enterprise-concurrent-api
BuildRequires: glassfish-enterprise-concurrent
+BuildRequires: generic-jms-ra
BuildRequires: jboss-servlet-3.1-api
BuildRequires: gnu-getopt
BuildRequires: istack-commons
-BuildRequires: infinispan >= 6.0.0
-BuildRequires: ironjacamar
+BuildRequires: infinispan >= 6.0.0-1
+BuildRequires: ironjacamar >= 1.1.2-1
BuildRequires: jacorb
-BuildRequires: jberet
+BuildRequires: jberet >= 1.0.0-0.3.CR1
BuildRequires: jackson
BuildRequires: jandex
BuildRequires: javacc-maven-plugin
BuildRequires: javamail
BuildRequires: javassist
+BuildRequires: jastow >= 1.0.0-0.5.CR1
BuildRequires: jaxen
BuildRequires: jaxws-jboss-httpserver-httpspi
BuildRequires: jettison
@@ -139,22 +142,21 @@ BuildRequires: jboss-annotations-1.1-api
BuildRequires: jboss-classfilewriter
BuildRequires: jboss-common-core
BuildRequires: jboss-common-beans
-BuildRequires: jboss-connector-1.7-api
+BuildRequires: jboss-connector-1.7-api >= 1.0.0-1
BuildRequires: jboss-concurrency-1.0-api
-BuildRequires: jboss-dmr
+BuildRequires: jboss-dmr >= 1.2.0-1
BuildRequires: jboss-ejb-3.1-api
BuildRequires: jboss-ejb-3.2-api
BuildRequires: jboss-ejb3-ext-api
-BuildRequires: jboss-ejb-client
+BuildRequires: jboss-ejb-client >= 2.0.0-0.4.Beta5
BuildRequires: jboss-el-2.2-api
BuildRequires: jboss-el-3.0-api
BuildRequires: jboss-httpserver
BuildRequires: jboss-iiop-client
BuildRequires: jboss-invocation
-BuildRequires: jboss-interceptor
BuildRequires: jboss-interceptors-1.2-api
BuildRequires: jboss-j2eemgmt-1.1-api
-BuildRequires: jboss-jacc-1.4-api
+BuildRequires: jboss-jacc-1.5-api
BuildRequires: jboss-jad-1.2-api
BuildRequires: jboss-jaxb-2.2-api
BuildRequires: jboss-jaxb-intros
@@ -167,7 +169,7 @@ BuildRequires: jboss-batch-1.0-api
BuildRequires: jboss-jms-2.0-api
BuildRequires: jboss-jsf-2.1-api
BuildRequires: jboss-jsf-2.2-api
-BuildRequires: jboss-jsp-2.2-api
+BuildRequires: jboss-jsp-2.3-api
BuildRequires: jboss-jstl-1.2-api
BuildRequires: jboss-parent
BuildRequires: jboss-logging
@@ -175,7 +177,7 @@ BuildRequires: jboss-logging-tools
BuildRequires: jboss-logmanager
BuildRequires: jboss-logmanager-log4j
BuildRequires: jboss-marshalling
-BuildRequires: jboss-metadata
+BuildRequires: jboss-metadata >= 8.0.0-0.3.Beta4
BuildRequires: jboss-modules
BuildRequires: jboss-msc
BuildRequires: jboss-negotiation
@@ -195,21 +197,23 @@ BuildRequires: jboss-web-native
BuildRequires: jboss-vfs
BuildRequires: jbossws-parent
BuildRequires: jbossws-api
-BuildRequires: jbossws-common
+BuildRequires: jbossws-common >= 2.2.3-1
BuildRequires: jbossws-common-tools
BuildRequires: jbossws-cxf
-BuildRequires: jbossws-spi >= 2.2.1-1
+BuildRequires: jbossws-spi >= 2.2.2-1
BuildRequires: jbossxb
BuildRequires: jcip-annotations
BuildRequires: jdom
BuildRequires: jul-to-slf4j-stub
BuildRequires: joda-time
-BuildRequires: jipijapa >= 1.0.0-0.4
+BuildRequires: jipijapa >= 1.0.0-0.5.CR1
BuildRequires: jsonp
BuildRequires: jsoup
BuildRequires: jtype
BuildRequires: jansi
BuildRequires: log4j-jboss-logmanager
+BuildRequires: lucene
+BuildRequires: lucene-contrib
BuildRequires: maven-local
BuildRequires: maven-jar-plugin
BuildRequires: maven-checkstyle-plugin
@@ -229,8 +233,12 @@ BuildRequires: mockito
BuildRequires: mod_cluster-java
BuildRequires: neethi
BuildRequires: nekohtml
-BuildRequires: narayana >= 5.0.0-0.6
+BuildRequires: narayana >= 5.0.0-0.7
+%if 0%{?fedora} >= 21
BuildRequires: netty
+%else
+BuildRequires: netty4
+%endif
BuildRequires: objectweb-asm
BuildRequires: openjpa
BuildRequires: opensaml-java
@@ -242,7 +250,7 @@ BuildRequires: picketbox-commons
BuildRequires: picketbox-xacml
BuildRequires: powermock-junit4
BuildRequires: powermock-api-mockito
-BuildRequires: resteasy >= 3.0.1-3
+BuildRequires: resteasy >= 3.0.6-1
BuildRequires: relaxngDatatype
BuildRequires: rhq-plugin-annotations
BuildRequires: scannotation
@@ -256,7 +264,7 @@ BuildRequires: snakeyaml
BuildRequires: staxmapper
BuildRequires: stax2-api
BuildRequires: systemd-units
-BuildRequires: undertow
+BuildRequires: undertow >= 1:1.0.0-0.7.Beta30
BuildRequires: velocity
BuildRequires: weld-api >= 2.1-0.1
BuildRequires: weld-core >= 2.1.0-0.1
@@ -271,7 +279,8 @@ BuildRequires: xerces-j2
BuildRequires: xml-security
BuildRequires: xml-commons-apis
BuildRequires: xml-commons-resolver
-BuildRequires: xnio
+BuildRequires: xnio >= 3.2.0-0.1.Beta3
+BuildRequires: netty-xnio-transport
BuildRequires: xom
BuildRequires: mvn(org.hibernate:hibernate-validator-cdi)
@@ -358,18 +367,9 @@ git am %{patches}
rm -rf jsf/injection/src/main/java/org/jboss/as/jsf/injection/MyFaces*
%pom_remove_dep "org.apache.myfaces.core:myfaces-impl" jsf/injection/pom.xml
-# Remove the scope from tools.jar
-for p in clustering/pom.xml process-controller/pom.xml pom.xml; do
- %pom_remove_dep "com.sun:tools" $p
- %pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.sun</groupId><artifactId>tools</artifactId><version>1</version></dependency>" $p
-done
-
%pom_remove_dep "sun.jdk:jconsole" cli/pom.xml
%pom_add_dep "sun.jdk:jconsole" cli/pom.xml
-# Not necessary, we'll link it later
-%pom_remove_dep "org.hornetq:hornetq-native" build/pom.xml
-
%build
export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=384m"
@@ -410,6 +410,8 @@ pushd build/target/wildfly-%{namedversion}
# We don't need legacy init scripts
rm -rf bin/init.d
+ # TMP - investigate
+ rm -rf bin/client
# Prepare directory for properties files
install -d -m 755 docs/examples/properties
@@ -443,9 +445,6 @@ pushd build/target/wildfly-%{namedversion}
mv docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}
- # TMP - investigate
- rm -rf bin/client
-
mv copyright.txt README.txt LICENSE.txt welcome-content docs bin appclient modules $RPM_BUILD_ROOT%{homedir}
# Install the launch script
@@ -536,7 +535,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath cxf/cxf-rt-ws-security-jandex) org/apache/cxf/impl/main/cxf-rt-ws-security-jandex.jar
# Jandex indexes for resteasy
- for m in client atom-provider crypto cdi jackson-provider jaxb-provider jaxrs jettison-provider jsapi multipart-provider yaml-provider validator-provider-11; do
+ for m in atom-provider crypto cdi jackson-provider jackson2-provider jaxb-provider jaxrs jettison-provider jsapi multipart-provider yaml-provider validator-provider-11; do
ln -s $(build-classpath resteasy/resteasy-${m}-jandex) org/jboss/resteasy/resteasy-${m}/main/resteasy-${m}-jandex.jar
done
@@ -622,6 +621,7 @@ done
%{bindir}/*.conf
%{bindir}/*.sh
%{bindir}/*.properties
+%{bindir}/.jbossclirc
%{_bindir}/*
%dir %{homedir}
%{homedir}/auth
@@ -659,19 +659,25 @@ done
%doc %{homedir}/README.txt
%doc %{homedir}/copyright.txt
%doc %{homedir}/LICENSE.txt
-%doc tools/maven/NOTICE.txt
-%doc tools/maven/LICENSE.txt
+%doc tools/maven/NOTICE
+%doc tools/maven/LICENSE
%doc README.md
%dir %{_javadir}/%{name}
%files javadoc -f .mfiles-javadoc
-%doc tools/maven/LICENSE.txt
+%doc tools/maven/LICENSE
%files doc
%{_docdir}/%{name}
-%doc tools/maven/LICENSE.txt
+%doc tools/maven/LICENSE
%changelog
+* Wed Jan 22 2014 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.16.CR1
+- Upstream release 8.0.0.CR1
+
+* Thu Dec 12 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.15.20131212gitd637807
+- Release based on commit d6378078ea61fc4eea7db208a7624fa2f27da2f2
+
* 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
More information about the scm-commits
mailing list