[wildfly] Upstream release 8.1.0.Final
Marek Goldmann
goldmann at fedoraproject.org
Wed Jun 11 09:05:28 UTC 2014
commit 3e56888c824896f751ba48a80943ca538ac8cf08
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Jun 11 10:45:31 2014 +0200
Upstream release 8.1.0.Final
.gitignore | 1 +
...jtype-dependency-to-hibernate-validator-t.patch | 16 ++++----
...ing-module-dependencies-in-mime4j-com.sun.patch | 10 ++--
0003-fedora-Use-old-relaxngDatatype.patch | 14 +++---
...ve-still-unavailable-in-Fedora-dependenci.patch | 24 +++++-----
...se-activation-classes-provided-by-the-JDK.patch | 10 ++--
...edora-Use-jws-classes-provided-by-the-JDK.patch | 10 ++--
...glassfish-el-and-jboss-el-3.0-api-togethe.patch | 20 +++++-----
...log4j-dependency-to-org.jboss.log4j.logma.patch | 6 +-
...ve-hornetq-native-extraction-we-re-linkin.patch | 8 ++--
...ble-jipijapa-support-for-Hibernate-4.1-si.patch | 12 +++---
0011-fedora-Use-Netty-4-only.patch | 8 ++--
...-Use-Log4j-version-1.2-provided-by-Fedora.patch | 43 ++++++++++++++++++++
sources | 2 +-
wildfly.spec | 24 +++++++----
15 files changed, 129 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8115d0..519b8d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/wildfly-8.0.0.CR1-CLEAN.tar.xz
/wildfly-8.0.0.Final-CLEAN.tar.xz
/wildfly-8.1.0.CR1-CLEAN.tar.xz
+/wildfly-8.1.0.Final-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 40726bd..22235ec 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 5fde596f62054417c3009ff1f5c0c6a3ecdf6571 Mon Sep 17 00:00:00 2001
+From 658fe0a7d19eb4584b188d5f65663236b85d1027 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,7 +14,7 @@ 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 2eb2e3b..8a24f45 100755
+index 50c6045..0c89e98 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -426,6 +426,10 @@
@@ -29,10 +29,10 @@ index 2eb2e3b..8a24f45 100755
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 69cd103..e4ae335 100644
+index e9b9b01..03a00f3 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -241,6 +241,11 @@
+@@ -236,6 +236,11 @@
</dependency>
<dependency>
@@ -96,7 +96,7 @@ index fafcd0f..24c893b 100644
<module name="javax.validation.api"/>
<module name="javax.xml.bind.api"/>
diff --git a/pom.xml b/pom.xml
-index 89966a5..563892b 100644
+index a1eec5f..c7d60a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
@@ -105,9 +105,9 @@ index 89966a5..563892b 100644
<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.6-jbossorg-3</version.com.sun.faces>
+ <version.com.sun.faces>2.2.6-jbossorg-4</version.com.sun.faces>
<version.com.sun.istack>2.6.1</version.com.sun.istack>
-@@ -1515,6 +1516,12 @@
+@@ -1514,6 +1515,12 @@
</dependency>
<dependency>
@@ -121,5 +121,5 @@ index 89966a5..563892b 100644
<artifactId>jsf-impl</artifactId>
<version>${version.com.sun.faces}</version>
--
-1.9.0
+1.9.3
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 057d576..6b9f44f 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 0ecb8e274f85b5946da929acbc2b78e6cdac6bc5 Mon Sep 17 00:00:00 2001
+From 169881cdf575e8005e2f4bd45f301a0ae857aed0 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,7 +12,7 @@ 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 8a24f45..66e110f 100755
+index 0c89e98..7688b8a 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -698,7 +698,9 @@
@@ -27,10 +27,10 @@ index 8a24f45..66e110f 100755
<module-def name="org.apache.lucene">
diff --git a/build/pom.xml b/build/pom.xml
-index e4ae335..3952872 100644
+index 03a00f3..d21bba9 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -603,7 +603,17 @@
+@@ -598,7 +598,17 @@
<dependency>
<groupId>org.apache.james</groupId>
@@ -79,5 +79,5 @@ index 0c42c9c..61fd40d 100644
</resources>
--
-1.9.0
+1.9.3
diff --git a/0003-fedora-Use-old-relaxngDatatype.patch b/0003-fedora-Use-old-relaxngDatatype.patch
index ad58450..3e9cd57 100644
--- a/0003-fedora-Use-old-relaxngDatatype.patch
+++ b/0003-fedora-Use-old-relaxngDatatype.patch
@@ -1,4 +1,4 @@
-From 6d4630d6182a22b3c78168159798c2ec282eaa0f Mon Sep 17 00:00:00 2001
+From 79737b63bdebed3b2a320a8e44c23ba7f911a2bf 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,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 66e110f..0eb87da 100755
+index 7688b8a..d0b020e 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -419,7 +419,7 @@
@@ -23,10 +23,10 @@ index 66e110f..0eb87da 100755
<module-def name="com.google.guava">
diff --git a/build/pom.xml b/build/pom.xml
-index 3952872..d8cc9db 100644
+index d21bba9..3734798 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -221,7 +221,7 @@
+@@ -216,7 +216,7 @@
</dependency>
<dependency>
@@ -36,10 +36,10 @@ index 3952872..d8cc9db 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index 563892b..2933bd8 100644
+index c7d60a4..17a8f4b 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -1486,7 +1486,7 @@
+@@ -1485,7 +1485,7 @@
</dependency>
<dependency>
@@ -49,5 +49,5 @@ index 563892b..2933bd8 100644
<version>${version.com.github.relaxng}</version>
</dependency>
--
-1.9.0
+1.9.3
diff --git a/0004-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0004-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
index 306c97b..e4d9ffc 100644
--- a/0004-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+++ b/0004-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
@@ -1,4 +1,4 @@
-From fa1898409240ecf82b8ad1029899baa11d485ec8 Mon Sep 17 00:00:00 2001
+From ceb7a4d31c4945ffc7d4a72ea7d63b5f5836c86d 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, 12 insertions(+), 1 deletion(-)
diff --git a/build/build.xml b/build/build.xml
-index 0eb87da..431bd1f 100755
+index d0b020e..36a51a9 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -100,9 +100,10 @@
@@ -24,7 +24,7 @@ index 0eb87da..431bd1f 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/">
-@@ -939,9 +940,11 @@
+@@ -940,9 +941,11 @@
<maven-resource group="org.wildfly" artifact="wildfly-appclient"/>
</module-def>
@@ -36,7 +36,7 @@ index 0eb87da..431bd1f 100755
<module-def name="org.jboss.as.cli">
<maven-resource group="org.wildfly" artifact="wildfly-cli"/>
-@@ -1438,6 +1441,7 @@
+@@ -1439,6 +1442,7 @@
<maven-resource group="org.osgi" artifact="org.osgi.core"/>
</module-def>
@@ -44,7 +44,7 @@ index 0eb87da..431bd1f 100755
<module-def name="org.picketlink">
</module-def>
-@@ -1472,6 +1476,7 @@
+@@ -1473,6 +1477,7 @@
<module-def name="org.picketlink.idm">
<maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>
</module-def>
@@ -53,24 +53,24 @@ index 0eb87da..431bd1f 100755
<module-def name="org.picketbox">
<maven-resource group="org.picketbox" artifact="picketbox"/>
diff --git a/build/pom.xml b/build/pom.xml
-index d8cc9db..408e240 100644
+index 3734798..c87bffe 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1023,11 +1023,13 @@
+@@ -1024,11 +1024,13 @@
<artifactId>wildfly-cmp</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.jboss.hal</groupId>
- <artifactId>release-stream</artifactId>
+ <artifactId>release-stream</artifactId>
<classifier>resources</classifier>
</dependency>
+ -->
<dependency>
<groupId>org.wildfly</groupId>
-@@ -1624,10 +1626,12 @@
+@@ -1625,10 +1627,12 @@
<artifactId>jboss-sasl</artifactId>
</dependency>
@@ -83,7 +83,7 @@ index d8cc9db..408e240 100644
<dependency>
<groupId>org.jboss.security</groupId>
-@@ -1935,6 +1939,7 @@
+@@ -1936,6 +1940,7 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
@@ -91,7 +91,7 @@ index d8cc9db..408e240 100644
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-api</artifactId>
-@@ -1974,6 +1979,7 @@
+@@ -1975,6 +1980,7 @@
<groupId>org.picketlink.distribution</groupId>
<artifactId>picketlink-jbas7</artifactId>
</dependency>
@@ -100,5 +100,5 @@ index d8cc9db..408e240 100644
<dependency>
<groupId>org.scannotation</groupId>
--
-1.9.0
+1.9.3
diff --git a/0005-fedora-Use-activation-classes-provided-by-the-JDK.patch b/0005-fedora-Use-activation-classes-provided-by-the-JDK.patch
index 58c6b6a..7b4f068 100644
--- a/0005-fedora-Use-activation-classes-provided-by-the-JDK.patch
+++ b/0005-fedora-Use-activation-classes-provided-by-the-JDK.patch
@@ -1,4 +1,4 @@
-From cd694108f741d008d5980c1cbb5c3cde9f21a4d0 Mon Sep 17 00:00:00 2001
+From cd075b8ecd7d146d6f33586d0772a744d44399ef 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 431bd1f..a9095cf 100755
+index 36a51a9..115223b 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -487,9 +487,7 @@
@@ -25,10 +25,10 @@ index 431bd1f..a9095cf 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 408e240..bc32c9b 100644
+index c87bffe..aa538ee 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -346,11 +346,6 @@
+@@ -341,11 +341,6 @@
</dependency>
<dependency>
@@ -57,5 +57,5 @@ index f6406b3..1eed105 100644
<resources>
--
-1.9.0
+1.9.3
diff --git a/0006-fedora-Use-jws-classes-provided-by-the-JDK.patch b/0006-fedora-Use-jws-classes-provided-by-the-JDK.patch
index 6d14ec0..45f9bd0 100644
--- a/0006-fedora-Use-jws-classes-provided-by-the-JDK.patch
+++ b/0006-fedora-Use-jws-classes-provided-by-the-JDK.patch
@@ -1,4 +1,4 @@
-From 66b622b56c2e22d20f1a60f3739071f3d8fc6dec Mon Sep 17 00:00:00 2001
+From a96d61d05367aaef2584f076bf1d72cb934cf6ff 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 a9095cf..77c3f20 100755
+index 115223b..94ce63e 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -531,9 +531,7 @@
@@ -25,10 +25,10 @@ index a9095cf..77c3f20 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 bc32c9b..7b3deec 100644
+index aa538ee..53dfc42 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -362,11 +362,6 @@
+@@ -357,11 +357,6 @@
</dependency>
<dependency>
@@ -59,5 +59,5 @@ index 8358f92..d2fb8b6 100644
<!-- Insert resources here -->
</resources>
--
-1.9.0
+1.9.3
diff --git a/0007-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch b/0007-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
index 3802a0f..0c812fc 100644
--- a/0007-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
+++ b/0007-fedora-Use-glassfish-el-and-jboss-el-3.0-api-togethe.patch
@@ -1,4 +1,4 @@
-From 7f3a27b5260f074bffffda518bcf1d2a7630aec5 Mon Sep 17 00:00:00 2001
+From 85e05fab9c029bab9c7d8345de407955eb5f4bdb 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, 15 insertions(+), 3 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 77c3f20..c19b632 100755
+index 94ce63e..decafc9 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -777,7 +777,7 @@
+@@ -778,7 +778,7 @@
</module-def>
<module-def name="org.glassfish.javax.el">
@@ -27,10 +27,10 @@ index 77c3f20..c19b632 100755
<module-def name="org.glassfish.javax.enterprise.concurrent">
diff --git a/build/pom.xml b/build/pom.xml
-index 7b3deec..698f95e 100644
+index 53dfc42..8e11641 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -714,7 +714,7 @@
+@@ -715,7 +715,7 @@
</dependency>
<dependency>
@@ -39,7 +39,7 @@ index 7b3deec..698f95e 100644
<artifactId>javax.el</artifactId>
</dependency>
-@@ -725,6 +725,11 @@
+@@ -726,6 +726,11 @@
</dependency>
<dependency>
@@ -52,10 +52,10 @@ index 7b3deec..698f95e 100644
<artifactId>hibernate-core</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
-index 2933bd8..97b86b5 100644
+index 17a8f4b..05df4e0 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -3568,7 +3568,7 @@
+@@ -3575,7 +3575,7 @@
<!-- EL3 RI implementation -->
<dependency>
@@ -64,7 +64,7 @@ index 2933bd8..97b86b5 100644
<artifactId>javax.el</artifactId>
<version>${version.org.glassfish.javax.el}</version>
</dependency>
-@@ -3587,6 +3587,13 @@
+@@ -3594,6 +3594,13 @@
</dependency>
<dependency>
@@ -79,5 +79,5 @@ index 2933bd8..97b86b5 100644
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
--
-1.9.0
+1.9.3
diff --git a/0008-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch b/0008-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
index 573f9b5..420aa99 100644
--- a/0008-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
+++ b/0008-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patch
@@ -1,4 +1,4 @@
-From 50066c2978e942f6080e3ff5f48a5534478ed74d Mon Sep 17 00:00:00 2001
+From 653d86e1a48caf41af2f6530053ef336dfbe1f4c 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 c19b632..4834156 100755
+index decafc9..eaf9758 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -335,6 +335,7 @@
@@ -21,5 +21,5 @@ index c19b632..4834156 100755
</module-def>
--
-1.9.0
+1.9.3
diff --git a/0009-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch b/0009-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
index b5b48cc..58b92a4 100644
--- a/0009-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
+++ b/0009-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
@@ -1,4 +1,4 @@
-From 676b0041afe4dd8b79487c8e2fadacae5c02cc0c Mon Sep 17 00:00:00 2001
+From 87f77bb9bd0b636e27bb1f4a641de981305659cb 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,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 4834156..5476d08 100755
+index eaf9758..a3553d8 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -861,7 +861,9 @@
+@@ -862,7 +862,9 @@
and contains native libraries that are extracted
-->
<maven-resource group="org.hornetq" artifact="hornetq-native"/>
@@ -23,5 +23,5 @@ index 4834156..5476d08 100755
<module-def name="org.hornetq.protocol.amqp">
--
-1.9.0
+1.9.3
diff --git a/0010-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch b/0010-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
index c33b077..aa81dac 100644
--- a/0010-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
+++ b/0010-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
@@ -1,4 +1,4 @@
-From 40dda21b0e1d314280484d05c8c1dc034c8bc799 Mon Sep 17 00:00:00 2001
+From d28cbb23457b1908facb2b80718371cdf91b1380 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 5476d08..272501b 100755
+index a3553d8..53a423c 100755
--- a/build/build.xml
+++ b/build/build.xml
-@@ -826,11 +826,6 @@
+@@ -827,11 +827,6 @@
<maven-resource group="org.jipijapa" artifact="jipijapa-hibernate3"/>
</module-def>
@@ -26,10 +26,10 @@ index 5476d08..272501b 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 698f95e..7263749 100644
+index 8e11641..2bfe852 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1344,11 +1344,6 @@
+@@ -1345,11 +1345,6 @@
<dependency>
<groupId>org.jipijapa</groupId>
@@ -42,5 +42,5 @@ index 698f95e..7263749 100644
</dependency>
--
-1.9.0
+1.9.3
diff --git a/0011-fedora-Use-Netty-4-only.patch b/0011-fedora-Use-Netty-4-only.patch
index 6300aa9..1ab2bfa 100644
--- a/0011-fedora-Use-Netty-4-only.patch
+++ b/0011-fedora-Use-Netty-4-only.patch
@@ -1,4 +1,4 @@
-From c878d0343acf7b8323d741430ccdaa6acbcca422 Mon Sep 17 00:00:00 2001
+From 5b49521d8d0f4287c4ac2ff3cbbcfa8eca93707b 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
@@ -8,7 +8,7 @@ Subject: [PATCH] [fedora] Use Netty 4 only
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
-index 97b86b5..0b6e65f 100644
+index 05df4e0..31e5e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
@@ -17,9 +17,9 @@ index 97b86b5..0b6e65f 100644
<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.5.Final</version.io.undertow>
+ <version.io.undertow>1.0.15.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>
--
-1.9.0
+1.9.3
diff --git a/0012-Use-Log4j-version-1.2-provided-by-Fedora.patch b/0012-Use-Log4j-version-1.2-provided-by-Fedora.patch
new file mode 100644
index 0000000..440226c
--- /dev/null
+++ b/0012-Use-Log4j-version-1.2-provided-by-Fedora.patch
@@ -0,0 +1,43 @@
+From b59b78a1270c94b248b760d61b2c01c3b32929c8 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Mon, 9 Jun 2014 15:33:04 +0200
+Subject: [PATCH] Use Log4j version 1.2 provided by Fedora
+
+---
+ logging/pom.xml | 6 ++++++
+ pom.xml | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/logging/pom.xml b/logging/pom.xml
+index 88bb17f..9690ea2 100644
+--- a/logging/pom.xml
++++ b/logging/pom.xml
+@@ -131,6 +131,12 @@
+ </dependency>
+
+ <dependency>
++ <groupId>log4j</groupId>
++ <artifactId>log4j</artifactId>
++ <scope>compile</scope>
++ </dependency>
++
++ <dependency>
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ </dependency>
+diff --git a/pom.xml b/pom.xml
+index 31e5e89..94daeb5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -118,7 +118,7 @@
+ <version.joda-time>1.6.2</version.joda-time>
+ <version.junit>4.11</version.junit>
+ <version.jsoup>1.6.1</version.jsoup>
+- <version.log4j>1.2.16</version.log4j>
++ <version.log4j>12</version.log4j>
+ <version.net.jcip>1.0</version.net.jcip>
+ <version.org.apache.ant>1.8.2</version.org.apache.ant>
+ <version.org.apache.avro>1.7.6</version.org.apache.avro>
+--
+1.9.3
+
diff --git a/sources b/sources
index 86cf8b1..e557a99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4838f63613b6abad187d7b76bdf02c27 wildfly-8.1.0.CR1-CLEAN.tar.xz
+79f8c09b9991dabf51c9f41ae76ab298 wildfly-8.1.0.Final-CLEAN.tar.xz
diff --git a/wildfly.spec b/wildfly.spec
index c951d82..f06042b 100644
--- a/wildfly.spec
+++ b/wildfly.spec
@@ -1,4 +1,4 @@
-%global namedreltag .CR1
+%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
%global cachedir %{_var}/cache/%{name}
@@ -19,15 +19,15 @@
Name: wildfly
Version: 8.1.0
-Release: 0.3%{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.1.0.CR1 && git checkout-index -f -a --prefix=wildfly-8.1.0.CR1/
-# find wildfly-8.1.0.CR1/ -name '*.jar' -type f -delete
-# tar -cJf wildfly-8.1.0.CR1-CLEAN.tar.xz wildfly-8.1.0.CR1
+# cd wildfly && git checkout 8.1.0.Final && git checkout-index -f -a --prefix=wildfly-8.1.0.Final/
+# find wildfly-8.1.0.Final/ -name '*.jar' -type f -delete
+# tar -cJf wildfly-8.1.0.Final-CLEAN.tar.xz wildfly-8.1.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
@@ -56,6 +56,7 @@ Patch7: 0008-fedora-Add-log4j-dependency-to-org.jboss.log4j.logma.patc
Patch8: 0009-fedora-Remove-hornetq-native-extraction-we-re-linkin.patch
Patch9: 0010-fedora-Disable-jipijapa-support-for-Hibernate-4.1-si.patch
Patch10: 0011-fedora-Use-Netty-4-only.patch
+Patch11: 0012-Use-Log4j-version-1.2-provided-by-Fedora.patch
BuildArch: noarch
@@ -176,7 +177,6 @@ BuildRequires: jboss-parent
BuildRequires: jboss-logging
BuildRequires: jboss-logging-tools
BuildRequires: jboss-logmanager
-BuildRequires: jboss-logmanager-log4j
BuildRequires: jboss-marshalling
BuildRequires: jboss-metadata >= 8.0.0-1
BuildRequires: jboss-modules
@@ -212,11 +212,12 @@ BuildRequires: jsonp
BuildRequires: jsoup
BuildRequires: jtype
BuildRequires: jansi
-BuildRequires: log4j-jboss-logmanager
+BuildRequires: log4j-jboss-logmanager >= 1.1.0-1
%if 0%{?fedora} >= 21
BuildRequires: lucene3
BuildRequires: lucene3-contrib
+BuildRequires: log4j12
%else
BuildRequires: lucene
BuildRequires: lucene-contrib
@@ -502,8 +503,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
pushd modules/system/layers/base
# Definition of submodules
# If a submodule contains hyphen in the name, just skip it, e.g. domain-http => domainhttp
- multimodules="core-security mod_cluster clustering"
- modules_coresecurity="api implementation"
+ multimodules="mod_cluster clustering"
modules_mod_cluster="web undertow"
modules_clustering="api ejb-spi common jgroups infinispan registry server singleton web-api web-catalina web-spi web-infinispan web-undertow ejb-infinispan"
@@ -540,6 +540,9 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s %{_javadir}/%{name}/%{name}-webservices-server-integration.jar org/jboss/as/webservices/main/%{name}-webservices-server-integration-%{namedversion}.jar
ln -s %{_javadir}/%{name}/%{name}-jsf-injection.jar org/jboss/as/jsf-injection/main/%{name}-jsf-injection-%{namedversion}.jar
+ ln -s %{_javadir}/%{name}/%{name}-core-security.jar org/jboss/as/core-security/main/%{name}-core-security-%{namedversion}.jar
+ ln -s %{_javadir}/%{name}/%{name}-core-security-api.jar org/jboss/as/core-security-api/main/%{name}-core-security-api-%{namedversion}.jar
+
# Remove native libs that are shipped with the source distribution...
rm -rf org/hornetq/main/lib/*
@@ -690,6 +693,9 @@ done
%doc tools/maven/LICENSE
%changelog
+* Wed Jun 11 2014 Marek Goldmann <mgoldman at redhat.com> - 8.1.0-1
+- Upstream release 8.1.0.Final
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.0-0.3.CR1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list