rpms/wildfly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upstream release 8.0.0.Final

Browse source
This commit is contained in:
Marek Goldmann 2014-02-14 16:05:58 +01:00
commit cf77fc0c2d
15 changed files with 124 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
/wildfly-8.0.0.Alpha4-CLEAN.tar.xz
/wildfly-8.0.0.Beta1-CLEAN.tar.xz
/wildfly-8.0.0.CR1-CLEAN.tar.xz
/wildfly-8.0.0.Final-CLEAN.tar.xz

26
0001-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
View file

@ -1,4 +1,4 @@
From 3d14f31ce995ea9a4702074d4aa4ed160ea1b6ab Mon Sep 17 00:00:00 2001
From edcc0aa7ee453b5ad85a703fd7ad23fcac5106c9 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Wed, 22 Aug 2012 11:23:43 +0200
Subject: [PATCH] [fedora] Add jtype dependency to hibernate-validator to fix
@ -14,11 +14,11 @@ 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 5dfe99e..14e7b33 100755
index 16e374f..5b5f032 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -426,6 +426,10 @@
<maven-resource group="com.google.protobuf" artifact="protobuf-java" />
@@ -422,6 +422,10 @@
<maven-resource group="com.google.guava" artifact="guava" />
</module-def>
+ <module-def name="com.googlecode.jtype">
@ -29,10 +29,10 @@ index 5dfe99e..14e7b33 100755
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
index 886c315..1efc8f5 100644
index 5d75697..231256f 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -246,6 +246,11 @@
@@ -241,6 +241,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 60bae93..37032c9 100644
index 2074e3b..95714cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
<version.com.google.guava>15.0</version.com.google.guava>
<version.com.google.protobuf>2.5.0</version.com.google.protobuf>
@@ -85,6 +85,7 @@
<version.com.github.relaxng>2011.1</version.com.github.relaxng>
<version.com.google.guava>16.0.1</version.com.google.guava>
<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.4-jbossorg-1</version.com.sun.faces>
<version.com.sun.faces>2.2.5-jbossorg-3</version.com.sun.faces>
<version.com.sun.istack>2.6.1</version.com.sun.istack>
@@ -1509,6 +1510,12 @@
@@ -1504,6 +1505,12 @@
</dependency>
<dependency>
@ -121,5 +121,5 @@ index 60bae93..37032c9 100644
<artifactId>jsf-impl</artifactId>
<version>${version.com.sun.faces}</version>
--
1.8.4.2
1.8.5.3

12
0002-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
View file

@ -1,4 +1,4 @@
From 105853b12d21cd3bfea7779a72228050c8196a96 Mon Sep 17 00:00:00 2001
From 6798f1c5063afdb8d0927313c483fb5f4199ce83 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@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 14e7b33..48ba559 100755
index 5b5f032..2e2f8e5 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -698,7 +698,9 @@
@@ -694,7 +694,9 @@
</module-def>
<module-def name="org.apache.james.mime4j">
@ -27,10 +27,10 @@ index 14e7b33..48ba559 100755
<module-def name="org.apache.lucene">
diff --git a/build/pom.xml b/build/pom.xml
index 1efc8f5..e5734ce 100644
index 231256f..77182d4 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -608,7 +608,17 @@
@@ -603,7 +603,17 @@
<dependency>
<groupId>org.apache.james</groupId>
@ -79,5 +79,5 @@ index 0e04923..65f3893 100644
</resources>
--
1.8.4.2
1.8.5.3

12
0003-fedora-Use-old-relaxngDatatype.patch
View file

@ -1,4 +1,4 @@
From 8c2b858be337456c74b681699d93d3df7034ad83 Mon Sep 17 00:00:00 2001
From 8e9bfe4692029d5b7ecfcba5115a9a7a1babae81 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Thu, 1 Aug 2013 14:11:47 +0200
Subject: [PATCH] [fedora] Use old relaxngDatatype.
@ -10,7 +10,7 @@ Subject: [PATCH] [fedora] Use old relaxngDatatype.
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index 48ba559..cb7fd16 100755
index 2e2f8e5..5352eb5 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -415,7 +415,7 @@
@ -23,7 +23,7 @@ index 48ba559..cb7fd16 100755
<module-def name="com.google.guava">
diff --git a/build/pom.xml b/build/pom.xml
index e5734ce..75cfbfc 100644
index 77182d4..56ea067 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -221,7 +221,7 @@
@ -36,10 +36,10 @@ index e5734ce..75cfbfc 100644
</dependency>
diff --git a/pom.xml b/pom.xml
index 37032c9..adc22ed 100644
index 95714cd..c2a0496 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1474,7 +1474,7 @@
@@ -1475,7 +1475,7 @@
</dependency>
<dependency>
@ -49,5 +49,5 @@ index 37032c9..adc22ed 100644
<version>${version.com.github.relaxng}</version>
</dependency>
--
1.8.4.2
1.8.5.3

12
0004-fedora-Use-ecj-instead-of-jasper-jdt-dependency.patch
View file

@ -1,4 +1,4 @@
From 355c7158ef1fce2b6abed2ec4d0236d48de6b988 Mon Sep 17 00:00:00 2001
From 15bae2e20b53beb3769536d1523700be142b130d Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 cb7fd16..cfec22e 100755
index 5352eb5..b195e29 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -1531,7 +1531,7 @@
@@ -1521,7 +1521,7 @@
<maven-resource group="io.undertow.jastow" artifact="jastow"/>
</module-def>
<module-def name="io.undertow.jasper-jdt">
@ -22,10 +22,10 @@ index cb7fd16..cfec22e 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 75cfbfc..a1133bf 100644
index 56ea067..974d112 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1833,11 +1833,6 @@
@@ -1815,11 +1815,6 @@
</dependency>
<dependency>
@ -38,5 +38,5 @@ index 75cfbfc..a1133bf 100644
<artifactId>jastow</artifactId>
</dependency>
--
1.8.4.2
1.8.5.3

40
0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
View file

@ -1,28 +1,30 @@
From 62ba9571567631a03e3accbbc1864775e142fcd4 Mon Sep 17 00:00:00 2001
From ef8fc6953b8ce3f854c9d8c4827ae703a99ece71 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@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/build.xml | 7 ++++++-
build/pom.xml | 6 ++++++
2 files changed, 12 insertions(+), 2 deletions(-)
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/build.xml b/build/build.xml
index cfec22e..6a482e1 100755
index b195e29..f3b48cc 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -100,7 +100,9 @@
@@ -100,9 +100,10 @@
<target name="create-ext-content">
<mkdir dir="${output.dir}/modules/system/layers/base/org/jboss/integration/ext-content/main/bundled"/>
+ <!--
<copy file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}" tofile="${output.dir}/modules/system/layers/base/org/jboss/integration/ext-content/main/bundled/jboss-seam-int.jar"/>
- <!-- resteasy spring integration -->
<copy file="${org.jboss.resteasy:resteasy-spring:jar}" tofile="${output.dir}/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/bundled/resteasy-spring.jar"/>
+ -->
<!-- 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/">
@@ -935,9 +937,11 @@
@@ -935,9 +936,11 @@
<maven-resource group="org.wildfly" artifact="wildfly-appclient"/>
</module-def>
@ -34,30 +36,28 @@ index cfec22e..6a482e1 100755
<module-def name="org.jboss.as.cli">
<maven-resource group="org.wildfly" artifact="wildfly-cli"/>
@@ -1444,8 +1448,7 @@
@@ -1434,6 +1437,7 @@
<maven-resource group="org.osgi" artifact="org.osgi.core"/>
</module-def>
- <module-def name="org.picketlink">
- </module-def>
+ <!--
<module-def name="org.picketlink">
</module-def>
<module-def name="org.picketlink.common">
<maven-resource group="org.picketlink" artifact="picketlink-common"/>
@@ -1478,6 +1481,7 @@
@@ -1468,6 +1472,7 @@
<module-def name="org.picketlink.idm">
<maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
</module-def>
+ -->
+ -->
<module-def name="org.picketbox">
<maven-resource group="org.picketbox" artifact="picketbox"/>
diff --git a/build/pom.xml b/build/pom.xml
index a1133bf..e3f1ce8 100644
index 974d112..7d70cd1 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1037,11 +1037,13 @@
<artifactId>wildfly-configadmin</artifactId>
@@ -1023,11 +1023,13 @@
<artifactId>wildfly-cmp</artifactId>
</dependency>
+ <!--
@ -70,7 +70,7 @@ index a1133bf..e3f1ce8 100644
<dependency>
<groupId>org.wildfly</groupId>
@@ -1637,10 +1639,12 @@
@@ -1619,10 +1621,12 @@
<artifactId>jboss-sasl</artifactId>
</dependency>
@ -83,7 +83,7 @@ index a1133bf..e3f1ce8 100644
<dependency>
<groupId>org.jboss.security</groupId>
@@ -1948,6 +1952,7 @@
@@ -1930,6 +1934,7 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
@ -91,7 +91,7 @@ index a1133bf..e3f1ce8 100644
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-api</artifactId>
@@ -1987,6 +1992,7 @@
@@ -1969,6 +1974,7 @@
<groupId>org.picketlink.distribution</groupId>
<artifactId>picketlink-jbas7</artifactId>
</dependency>
@ -100,5 +100,5 @@ index a1133bf..e3f1ce8 100644
<dependency>
<groupId>org.scannotation</groupId>
--
1.8.4.2
1.8.5.3

12
0006-fedora-Use-activation-classes-provided-by-the-JDK.patch
View file

@ -1,4 +1,4 @@
From bd65aaf057d9ce9250e462ef64b80c144ab101a6 Mon Sep 17 00:00:00 2001
From bc0d0ab756ef9a0b6c43f82783a825232c638f9c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 6a482e1..6a7127a 100755
index f3b48cc..72dabd2 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -488,9 +488,7 @@
@@ -483,9 +483,7 @@
<module-def name="javaee.api"/>
@ -25,10 +25,10 @@ index 6a482e1..6a7127a 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 e3f1ce8..d6f1771 100644
index 7d70cd1..243ac50 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -351,11 +351,6 @@
@@ -346,11 +346,6 @@
</dependency>
<dependency>
@ -57,5 +57,5 @@ index b2285d6..a503e6d 100644
<resources>
--
1.8.4.2
1.8.5.3

12
0007-fedora-Use-jws-classes-provided-by-the-JDK.patch
View file

@ -1,4 +1,4 @@
From 047cc51f214426ee51e4b7f57487f1c4ecebf418 Mon Sep 17 00:00:00 2001
From ff4bc889bff5a76c27c8d8b2b0e148c6b22d4cb5 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 6a7127a..e2392b7 100755
index 72dabd2..ae122fb 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -532,9 +532,7 @@
@@ -527,9 +527,7 @@
<maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_2.0_spec"/>
</module-def>
@ -25,10 +25,10 @@ index 6a7127a..e2392b7 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 d6f1771..7593ff9 100644
index 243ac50..32eee93 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -367,11 +367,6 @@
@@ -362,11 +362,6 @@
</dependency>
<dependency>
@ -59,5 +59,5 @@ index 3332464..b2f5523 100644
<!-- Insert resources here -->
</resources>
--
1.8.4.2
1.8.5.3

20
0008-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
View file

@ -1,4 +1,4 @@
From 71a84fffb603064e8ad92c3fd7ceba941f14a054 Mon Sep 17 00:00:00 2001
From 6fcadf5d057a967469166fb5c4aa800d2181aa72 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 e2392b7..36a8d7e 100755
index ae122fb..7990855 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -778,7 +778,8 @@
@@ -773,7 +773,8 @@
</module-def>
<module-def name="org.glassfish.javax.el">
@ -28,10 +28,10 @@ index e2392b7..36a8d7e 100755
<module-def name="org.glassfish.javax.enterprise.concurrent">
diff --git a/build/pom.xml b/build/pom.xml
index 7593ff9..8b7373e 100644
index 32eee93..231320b 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -719,7 +719,7 @@
@@ -714,7 +714,7 @@
</dependency>
<dependency>
@ -40,7 +40,7 @@ index 7593ff9..8b7373e 100644
<artifactId>javax.el</artifactId>
</dependency>
@@ -730,6 +730,11 @@
@@ -725,6 +725,11 @@
</dependency>
<dependency>
@ -53,10 +53,10 @@ index 7593ff9..8b7373e 100644
<artifactId>hibernate-core</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index adc22ed..91fc6d6 100644
index c2a0496..221ec40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3569,7 +3569,7 @@
@@ -3564,7 +3564,7 @@
<!-- EL3 RI implementation -->
<dependency>
@ -65,7 +65,7 @@ index adc22ed..91fc6d6 100644
<artifactId>javax.el</artifactId>
<version>${version.org.glassfish.javax.el}</version>
</dependency>
@@ -3588,6 +3588,13 @@
@@ -3583,6 +3583,13 @@
</dependency>
<dependency>
@ -80,5 +80,5 @@ index adc22ed..91fc6d6 100644
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
--
1.8.4.2
1.8.5.3

8
0009-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
View file

@ -1,4 +1,4 @@
From 7ac997f50bfb326873276c61125227edaa3ce06c Mon Sep 17 00:00:00 2001
From 284f09b58d875c6cfb774a555bf3041acfe78e8b Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 36a8d7e..0ee17f8 100755
index 7990855..f512419 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -332,6 +332,7 @@
@@ -331,6 +331,7 @@
</module-def>
<module-def name="org.jboss.log4j.logmanager">
@ -21,5 +21,5 @@ index 36a8d7e..0ee17f8 100755
</module-def>
--
1.8.4.2
1.8.5.3

8
0010-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
View file

@ -1,4 +1,4 @@
From e4cf1fd0fa569acab036f1744350d72e4da7d473 Mon Sep 17 00:00:00 2001
From 1a2b3328a005e519e3afe266756caa696cc9e693 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Mon, 28 Oct 2013 15:32:57 +0100
Subject: [PATCH] [fedora] Remove hornetq-native extraction, we're linking it
@ -9,10 +9,10 @@ Subject: [PATCH] [fedora] Remove hornetq-native extraction, we're linking it
1 file changed, 2 insertions(+)
diff --git a/build/build.xml b/build/build.xml
index 0ee17f8..706af91 100755
index f512419..3f3ba4e 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -857,7 +857,9 @@
@@ -858,7 +858,9 @@
and contains native libraries that are extracted
-->
<maven-resource group="org.hornetq" artifact="hornetq-native"/>
@ -23,5 +23,5 @@ index 0ee17f8..706af91 100755
<module-def name="org.hornetq.protocol.amqp">
--
1.8.4.2
1.8.5.3

12
0011-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
View file

@ -1,4 +1,4 @@
From 18eaac7af7c2e3fd1e87de17f22c6155e30f5690 Mon Sep 17 00:00:00 2001
From 9693991f8e7e7896cae32858dafaef385edf6862 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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 706af91..3cb8ecd 100755
index 3f3ba4e..855b3b0 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -822,11 +822,6 @@
@@ -823,11 +823,6 @@
<maven-resource group="org.jipijapa" artifact="jipijapa-hibernate3"/>
</module-def>
@ -26,10 +26,10 @@ index 706af91..3cb8ecd 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 8b7373e..e85643f 100644
index 231320b..ea798c3 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1348,11 +1348,6 @@
@@ -1334,11 +1334,6 @@
<dependency>
<groupId>org.jipijapa</groupId>
@ -42,5 +42,5 @@ index 8b7373e..e85643f 100644
</dependency>
--
1.8.4.2
1.8.5.3

75
0012-fedora-Use-Netty-4-only.patch
View file

@ -1,80 +1,25 @@
From a24189f824bd552d9f32f702eb2dd78877f585c8 Mon Sep 17 00:00:00 2001
From e82a3729b4b98728ffc3aa7b094c4148bbbc1264 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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(-)
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 221ec40..161ece9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,8 +105,7 @@
@@ -104,7 +104,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.groovy-all>2.2.1</version.groovy-all>
- <version.io.netty>4.0.15.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.io.undertow>1.0.0.Final</version.io.undertow>
<version.io.undertow.jastow>1.0.0.Final</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
1.8.5.3

2
sources
View file

@ -1 +1 @@
c640cd4e0d0cfdeaa741274ea41e6b1b wildfly-8.0.0.CR1-CLEAN.tar.xz
906b598181370292e1dec65697b2aa7d wildfly-8.0.0.Final-CLEAN.tar.xz

43
wildfly.spec
View file

@ -1,4 +1,4 @@
%global namedreltag .CR1
%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
%global cachedir %{_var}/cache/%{name}
@ -12,22 +12,22 @@
%global wfuid 185
# Enabled modules:
%global modules appclient cli cmp configadmin connector controller-client controller core-security deployment-repository deployment-scanner domain-management domain-http-error-context domain-http-interface ee ejb3 embedded host-controller jacorb jaxr jaxrs jdr jpa jsf jmx jsr77 logging management-client-content mail messaging naming network patching platform-mbean pojo process-controller protocol remoting sar security server system-jmx threads transactions version web web-common weld xts
%global modules appclient cli cmp connector controller-client controller core-security deployment-repository deployment-scanner domain-management domain-http-error-context domain-http-interface ee ejb3 embedded host-controller jacorb jaxr jaxrs jdr jpa jsf jmx jsr77 logging management-client-content mail messaging naming network patching platform-mbean pojo process-controller protocol remoting sar security server system-jmx threads transactions version web web-common weld xts
# New modules added in WildFly
%global wildflymodules jberet
Name: wildfly
Version: 8.0.0
Release: 0.17%{namedreltag}%{?dist}
Release: 1%{?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.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
# cd wildfly && git checkout 8.0.0.Final && git checkout-index -f -a --prefix=wildfly-8.0.0.Final/
# find wildfly-8.0.0.Final/ -name '*.jar' -type f -delete
# tar -cJf wildfly-8.0.0.Final-CLEAN.tar.xz wildfly-8.0.0.Final
Source0: wildfly-%{namedversion}-CLEAN.tar.xz
# Makes possible to run WildFly AS in different directory by creating the structure and copying required configuration files
@ -79,6 +79,7 @@ BuildRequires: apache-james-project
BuildRequires: apache-juddi
BuildRequires: apache-mime4j
BuildRequires: apache-scout
BuildRequires: apacheds
BuildRequires: atinject
BuildRequires: bean-validation-api
BuildRequires: bsf
@ -106,7 +107,8 @@ BuildRequires: hibernate3-infinispan
BuildRequires: hibernate-commons-annotations
BuildRequires: hibernate-jpa-2.1-api
BuildRequires: hibernate-validator
BuildRequires: hornetq >= 2.4.0-1
BuildRequires: hibernate-search >= 4.5.0-1
BuildRequires: hornetq >= 2.4.1-1
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: git
@ -123,18 +125,17 @@ BuildRequires: istack-commons
BuildRequires: infinispan >= 6.0.0-1
BuildRequires: ironjacamar >= 1.1.2-1
BuildRequires: jacorb
BuildRequires: jberet >= 1.0.0-0.3.CR1
BuildRequires: jberet >= 1.0.0-1
BuildRequires: jackson
BuildRequires: jandex
BuildRequires: javacc-maven-plugin
BuildRequires: javamail
BuildRequires: javassist
BuildRequires: jastow >= 1.0.0-0.5.CR1
BuildRequires: jastow >= 1.0.0-1
BuildRequires: jaxen
BuildRequires: jaxws-jboss-httpserver-httpspi
BuildRequires: jettison
BuildRequires: jgroups
BuildRequires: jberet
BuildRequires: jbosgi-metadata
BuildRequires: jbosgi-parent
BuildRequires: jboss-annotations-1.2-api
@ -177,11 +178,11 @@ BuildRequires: jboss-logging-tools
BuildRequires: jboss-logmanager
BuildRequires: jboss-logmanager-log4j
BuildRequires: jboss-marshalling
BuildRequires: jboss-metadata >= 8.0.0-0.3.Beta4
BuildRequires: jboss-metadata >= 8.0.0-1
BuildRequires: jboss-modules
BuildRequires: jboss-msc
BuildRequires: jboss-negotiation
BuildRequires: jboss-remoting
BuildRequires: jboss-remoting >= 4.0.0-1
BuildRequires: jboss-remoting-jmx
BuildRequires: jboss-remote-naming
BuildRequires: jboss-rmi-1.0-api
@ -245,7 +246,7 @@ BuildRequires: opensaml-java
BuildRequires: opensaml-java-openws
BuildRequires: opensaml-java-xmltooling
BuildRequires: opensaml-java-parent
BuildRequires: picketbox
BuildRequires: picketbox >= 4.0.20-1
BuildRequires: picketbox-commons
BuildRequires: picketbox-xacml
BuildRequires: powermock-junit4
@ -264,7 +265,7 @@ BuildRequires: snakeyaml
BuildRequires: staxmapper
BuildRequires: stax2-api
BuildRequires: systemd-units
BuildRequires: undertow >= 1:1.0.0-0.7.Beta30
BuildRequires: undertow >= 1:1.0.0-1
BuildRequires: velocity
BuildRequires: weld-api >= 2.1-0.1
BuildRequires: weld-core >= 2.1.0-0.1
@ -272,14 +273,14 @@ BuildRequires: weld-parent
BuildRequires: woodstox-core
BuildRequires: wsdl4j
BuildRequires: wss4j
BuildRequires: wildfly-security-manager >= 1.0.0-0.3
BuildRequires: wildfly-security-manager >= 1.0.0-1
BuildRequires: ws-xmlschema
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xml-security
BuildRequires: xml-commons-apis
BuildRequires: xml-commons-resolver
BuildRequires: xnio >= 3.2.0-0.1.Beta3
BuildRequires: xnio >= 3.2.0-1
BuildRequires: netty-xnio-transport
BuildRequires: xom
@ -539,11 +540,14 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath resteasy/resteasy-${m}-jandex) org/jboss/resteasy/resteasy-${m}/main/resteasy-${m}-jandex.jar
done
# Not caucght by xmvn-subst
# RestEasy Spring integration special case
install -d -m 755 org/jboss/resteasy/resteasy-spring/main/bundled/
ln -s %{_javadir}/resteasy/resteasy-spring.jar org/jboss/resteasy/resteasy-spring/main/bundled/resteasy-spring.jar
# Not caught by xmvn-subst
ln -s $(build-classpath txw2) com/sun/xml/bind/main/txw2.jar
ln -s $(build-classpath istack-commons-runtime) com/sun/xml/bind/main/istack-commons-runtime.jar
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
# Incorrect symlinks made by xmvn
@ -672,6 +676,9 @@ done
%doc tools/maven/LICENSE
%changelog
* Thu Feb 13 2014 Marek Goldmann <mgoldman@redhat.com> - 8.0.0-1
- Upstream release 8.0.0.Final
* Sat Feb 08 2014 Marek Goldmann <mgoldman@redhat.com> - 8.0.0-0.17.CR1
- Fixed missing wildfly-clustering-ejb-spi.jar link, RHBZ#1062877