diff --git a/.gitignore b/.gitignore index 4fbea06..3f96480 100644 --- a/.gitignore +++ b/.gitignore @@ -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 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 894ba2c..f3b9d05 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 3d14f31ce995ea9a4702074d4aa4ed160ea1b6ab Mon Sep 17 00:00:00 2001 +From edcc0aa7ee453b5ad85a703fd7ad23fcac5106c9 Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ - +@@ -422,6 +422,10 @@ + + @@ -29,10 +29,10 @@ index 5dfe99e..14e7b33 100755 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 @@ @@ -96,18 +96,18 @@ index 9260d48..76913ef 100644 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 @@ - 15.0 - 2.5.0 +@@ -85,6 +85,7 @@ + 2011.1 + 16.0.1 1.3.173 + 0.1.1 2.6 - 2.2.4-jbossorg-1 + 2.2.5-jbossorg-3 2.6.1 -@@ -1509,6 +1510,12 @@ +@@ -1504,6 +1505,12 @@ @@ -121,5 +121,5 @@ index 60bae93..37032c9 100644 jsf-impl ${version.com.sun.faces} -- -1.8.4.2 +1.8.5.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 dcb0ddd..0fd0737 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 105853b12d21cd3bfea7779a72228050c8196a96 Mon Sep 17 00:00:00 2001 +From 6798f1c5063afdb8d0927313c483fb5f4199ce83 Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ @@ -27,10 +27,10 @@ index 14e7b33..48ba559 100755 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 @@ org.apache.james @@ -79,5 +79,5 @@ index 0e04923..65f3893 100644 -- -1.8.4.2 +1.8.5.3 diff --git a/0003-fedora-Use-old-relaxngDatatype.patch b/0003-fedora-Use-old-relaxngDatatype.patch index d2a537b..245a9e3 100644 --- a/0003-fedora-Use-old-relaxngDatatype.patch +++ b/0003-fedora-Use-old-relaxngDatatype.patch @@ -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 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 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 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 @@ @@ -49,5 +49,5 @@ index 37032c9..adc22ed 100644 ${version.com.github.relaxng} -- -1.8.4.2 +1.8.5.3 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 4f5fed6..4cd45c3 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 355c7158ef1fce2b6abed2ec4d0236d48de6b988 Mon Sep 17 00:00:00 2001 +From 15bae2e20b53beb3769536d1523700be142b130d Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ @@ -22,10 +22,10 @@ index cb7fd16..cfec22e 100755 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 @@ @@ -38,5 +38,5 @@ index 75cfbfc..a1133bf 100644 jastow -- -1.8.4.2 +1.8.5.3 diff --git a/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch index f685c32..2d6431f 100644 --- a/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch +++ b/0005-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch @@ -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 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 @@ + + + --> -@@ -935,9 +937,11 @@ +@@ -935,9 +936,11 @@ @@ -34,30 +36,28 @@ index cfec22e..6a482e1 100755 -@@ -1444,8 +1448,7 @@ +@@ -1434,6 +1437,7 @@ -- -- + ++ --> 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 @@ - wildfly-configadmin +@@ -1023,11 +1023,13 @@ + wildfly-cmp + -- -1.8.4.2 +1.8.5.3 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 e659559..da82d5a 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 71a84fffb603064e8ad92c3fd7ceba941f14a054 Mon Sep 17 00:00:00 2001 +From 6fcadf5d057a967469166fb5c4aa800d2181aa72 Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ @@ -28,10 +28,10 @@ index e2392b7..36a8d7e 100755 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 @@ @@ -40,7 +40,7 @@ index 7593ff9..8b7373e 100644 javax.el -@@ -730,6 +730,11 @@ +@@ -725,6 +725,11 @@ @@ -53,10 +53,10 @@ index 7593ff9..8b7373e 100644 hibernate-core 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 @@ @@ -65,7 +65,7 @@ index adc22ed..91fc6d6 100644 javax.el ${version.org.glassfish.javax.el} -@@ -3588,6 +3588,13 @@ +@@ -3583,6 +3583,13 @@ @@ -80,5 +80,5 @@ index adc22ed..91fc6d6 100644 hibernate-core ${version.org.hibernate} -- -1.8.4.2 +1.8.5.3 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 8073277..e448e75 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 7ac997f50bfb326873276c61125227edaa3ce06c Mon Sep 17 00:00:00 2001 +From 284f09b58d875c6cfb774a555bf3041acfe78e8b Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ @@ -21,5 +21,5 @@ index 36a8d7e..0ee17f8 100755 -- -1.8.4.2 +1.8.5.3 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 d616831..1428e53 100644 --- a/0010-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 e4cf1fd0fa569acab036f1744350d72e4da7d473 Mon Sep 17 00:00:00 2001 +From 1a2b3328a005e519e3afe266756caa696cc9e693 Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 --> @@ -23,5 +23,5 @@ index 0ee17f8..706af91 100755 -- -1.8.4.2 +1.8.5.3 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 3920f7f..042a275 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 18eaac7af7c2e3fd1e87de17f22c6155e30f5690 Mon Sep 17 00:00:00 2001 +From 9693991f8e7e7896cae32858dafaef385edf6862 Mon Sep 17 00:00:00 2001 From: Marek Goldmann 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 @@ @@ -26,10 +26,10 @@ index 706af91..3cb8ecd 100755 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 @@ org.jipijapa @@ -42,5 +42,5 @@ index 8b7373e..e85643f 100644 -- -1.8.4.2 +1.8.5.3 diff --git a/0012-fedora-Use-Netty-4-only.patch b/0012-fedora-Use-Netty-4-only.patch index e3bcf7c..f4946c0 100644 --- a/0012-fedora-Use-Netty-4-only.patch +++ b/0012-fedora-Use-Netty-4-only.patch @@ -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 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 @@ - - - -- -- -- -- -- - - - -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 @@ - - - -- -- io.netty -- netty -- -- -- 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 @@ 1.6.1 1.0.13 - 2.1.8 -- 3.6.6.Final -- 4.0.13.Final + 2.2.1 +- 4.0.15.Final + 4 - 1.0.0.Beta30 - 1.0.0.CR1 + 1.0.0.Final + 1.0.0.Final 1.1.1 -@@ -4897,12 +4896,6 @@ - - - -- io.netty -- netty -- ${version.io.netty3} -- -- -- - io.undertow - undertow-core - ${version.io.undertow} -- -1.8.4.2 +1.8.5.3 diff --git a/sources b/sources index 1092831..feab348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c640cd4e0d0cfdeaa741274ea41e6b1b wildfly-8.0.0.CR1-CLEAN.tar.xz +906b598181370292e1dec65697b2aa7d wildfly-8.0.0.Final-CLEAN.tar.xz diff --git a/wildfly.spec b/wildfly.spec index a01b9d2..dd75f47 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} @@ -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 - 8.0.0-1 +- Upstream release 8.0.0.Final + * Sat Feb 08 2014 Marek Goldmann - 8.0.0-0.17.CR1 - Fixed missing wildfly-clustering-ejb-spi.jar link, RHBZ#1062877