[wildfly] First bugfixes for the first Alpha4 release

Marek Goldmann goldmann at fedoraproject.org
Wed Sep 18 05:20:14 UTC 2013 

commit 439901bbbfbd6496b6e0ce6ff38257a969555056
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Sep 17 15:10:33 2013 +0200

    First bugfixes for the first Alpha4 release
    
    - wildfly: incorrect symlink, RHBZ#1007687
    - Missing .jar files in the org.jboss.jts module, RHBZ#1008605
    - Missing javax.activation.api module, RHBZ#1008612
    - Missing javax.enterprise.concurrent.api module, RHBZ#1008614
    - Broken link to jandex.jar in modules directory, RHBZ#1008578

 ...more-places-with-the-javax.activation-ref.patch |   38 ++++++++++++++++
 0018-fedora-Enable-the-jboss-concurrency-api.patch |   47 ++++++++++++++++++++
 wildfly.spec                                       |   12 +++++-
 3 files changed, 96 insertions(+), 1 deletions(-)
---
diff --git a/0017-fedora-Two-more-places-with-the-javax.activation-ref.patch b/0017-fedora-Two-more-places-with-the-javax.activation-ref.patch
new file mode 100644
index 0000000..14cc9b2
--- /dev/null
+++ b/0017-fedora-Two-more-places-with-the-javax.activation-ref.patch
@@ -0,0 +1,38 @@
+From 3565ca50709ee7908a68f3a09790243b9e6eaa13 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 17 Sep 2013 14:52:08 +0200
+Subject: [PATCH] [fedora] Two more places with the javax.activation references
+ cleaned
+
+---
+ .../layers/base/org/jboss/resteasy/resteasy-client/main/module.xml       | 1 -
+ .../layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml       | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client/main/module.xml b/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client/main/module.xml
+index 36da0ab..fc19fd3 100755
+--- a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client/main/module.xml
++++ b/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client/main/module.xml
+@@ -31,7 +31,6 @@
+     <dependencies>
+         <module name="javax.api"/>
+         <module name="javax.annotation.api"/>
+-        <module name="javax.activation.api"/>
+         <module name="javax.validation.api"/>
+         <module name="javax.ws.rs.api"/>
+         <module name="org.jboss.resteasy.resteasy-jaxrs" services="import"/>
+diff --git a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml b/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
+index fb381d9..d132d58 100755
+--- a/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
++++ b/build/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
+@@ -33,7 +33,6 @@
+ 
+     <dependencies>
+         <module name="javax.api"/>
+-        <module name="javax.activation.api"/>
+         <module name="javax.mail.api"/>
+         <module name="org.apache.james.mime4j"/>
+         <module name="javax.servlet.api"/>
+-- 
+1.8.3.1
+
diff --git a/0018-fedora-Enable-the-jboss-concurrency-api.patch b/0018-fedora-Enable-the-jboss-concurrency-api.patch
new file mode 100644
index 0000000..f032e31
--- /dev/null
+++ b/0018-fedora-Enable-the-jboss-concurrency-api.patch
@@ -0,0 +1,47 @@
+From b75f197250c936d2043fe2ff11a820151cc86f4b Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 17 Sep 2013 14:59:10 +0200
+Subject: [PATCH] [fedora] Enable the jboss-concurrency-api
+
+This reverts commit 99ffa65dba23ee734adfbc08311ac9465da9a647.
+---
+ build/build.xml | 2 --
+ build/pom.xml   | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index aab347c..a3589dd 100755
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -464,11 +464,9 @@
+             <maven-resource group="javax.enterprise" artifact="cdi-api"/>
+         </module-def>
+ 
+-        <!--
+         <module-def name="javax.enterprise.concurrent.api">
+             <maven-resource group="org.jboss.spec.javax.enterprise.concurrent" artifact="jboss-concurrency-api_1.0_spec"/>
+         </module-def>
+-        -->
+ 
+         <module-def name="javax.faces.api">
+             <maven-resource group="org.jboss.spec.javax.faces" artifact="jboss-jsf-api_2.2_spec"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 6f94664..47416f8 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1569,12 +1569,10 @@
+                     <artifactId>jboss-el-api_2.2_spec</artifactId>
+                 </dependency>
+ 
+-                <!--
+                 <dependency>
+                     <groupId>org.jboss.spec.javax.enterprise.concurrent</groupId>
+                     <artifactId>jboss-concurrency-api_1.0_spec</artifactId>
+                 </dependency>
+-                -->
+ 
+                 <dependency>
+                     <groupId>org.jboss.spec.javax.faces</groupId>
+-- 
+1.8.3.1
+
diff --git a/wildfly.spec b/wildfly.spec
index 95dd1f9..c03ebf1 100644
--- a/wildfly.spec
+++ b/wildfly.spec
@@ -16,7 +16,7 @@
 
 Name:             wildfly
 Version:          8.0.0
-Release:          0.8%{namedreltag}%{?dist}
+Release:          0.9%{namedreltag}%{?dist}
 Summary:          WildFly Application Server
 License:          LGPLv2+ and ASL 2.0 and GPLv2 with exceptions
 URL:              http://wildfly.org/
@@ -49,6 +49,8 @@ Patch12:          0013-fedora-Remove-jipijapa-hibernate4-3-depednency.patch
 Patch13:          0014-fedora-Remove-wildfly-jsf-injection-dependency.patch
 Patch14:          0015-fedora-Remove-jasper-jdt-dependency.patch
 Patch15:          0016-fedora-Rename-to-wildfly-all-the-systemd-scripts.patch
+Patch16:          0017-fedora-Two-more-places-with-the-javax.activation-ref.patch
+Patch17:          0018-fedora-Enable-the-jboss-concurrency-api.patch
 
 BuildArch:        noarch
 
@@ -128,6 +130,7 @@ BuildRequires:    jboss-classfilewriter
 BuildRequires:    jboss-common-core
 BuildRequires:    jboss-common-beans
 BuildRequires:    jboss-connector-1.6-api
+BuildRequires:    jboss-concurrency-1.0-api
 BuildRequires:    jboss-dmr
 BuildRequires:    jboss-ejb-3.1-api
 BuildRequires:    jboss-ejb-3.2-api
@@ -612,6 +615,13 @@ exit 0
 %doc tools/maven/LICENSE.txt
 
 %changelog
+* Tue Sep 17 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.9.Alpha4
+- wildfly: incorrect symlink, RHBZ#1007687
+- Missing .jar files in the org.jboss.jts module, RHBZ#1008605
+- Missing javax.activation.api module, RHBZ#1008612
+- Missing javax.enterprise.concurrent.api module, RHBZ#1008614
+- Broken link to jandex.jar in modules directory, RHBZ#1008578
+
 * Mon Sep 16 2013 Marek Goldmann <mgoldman at redhat.com> - 8.0.0-0.8.Alpha4
 - Upstream release 8.0.0.Alpha4
 - Updated Obsoletes

More information about the scm-commits mailing list