[jboss-as] Added jboss-as-jaxrs module Added jboss-as-pojo module Spec file cleanup from versions
Marek Goldmann
goldmann at fedoraproject.org
Tue Apr 24 15:01:35 UTC 2012
commit 0686fe83f39ca56d59a5ba9ab1594490729b152c
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Tue Apr 24 14:01:05 2012 +0200
Added jboss-as-jaxrs module
Added jboss-as-pojo module
Spec file cleanup from versions
0048-Added-org.jboss.as.configadmin-module.patch | 88 ------
0049-Added-org.jboss.as.jaxrs-module.patch | 290 ++++++++++++++++++++
0050-Added-org.jboss.as.pojo-module.patch | 88 ++++++
...-banned-deps-on-javax.xml.stream-stax-api.patch | 25 ++
jboss-as.spec | 190 +++++++------
5 files changed, 506 insertions(+), 175 deletions(-)
---
diff --git a/0049-Added-org.jboss.as.jaxrs-module.patch b/0049-Added-org.jboss.as.jaxrs-module.patch
new file mode 100644
index 0000000..1def6b8
--- /dev/null
+++ b/0049-Added-org.jboss.as.jaxrs-module.patch
@@ -0,0 +1,290 @@
+From 670c8a591566f33470f79d66dfcf276dbf87713a Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Mon, 23 Apr 2012 13:29:03 +0200
+Subject: [PATCH 49/49] Added org.jboss.as.jaxrs module
+
+---
+ build/build.xml | 82 ++++++++++++++++++++---------------------
+ build/pom.xml | 110 +++++++++++++++++++++++++++----------------------------
+ pom.xml | 2 +-
+ 3 files changed, 97 insertions(+), 97 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index df0a912..ea0e220 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -409,6 +409,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-embedded"/>
+ </module-def>
+
++ <module-def name="org.jboss.as.jaxrs">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
++ </module-def>
++
+ <module-def name="org.jboss.as.jmx">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jmx"/>
+ </module-def>
+@@ -590,6 +594,43 @@
+ <maven-resource group="org.jboss.remotingjmx" artifact="remoting-jmx"/>
+ </module-def>
+
++ <module-def name="org.jboss.resteasy.resteasy-atom-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-cdi">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-cdi"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-jackson-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jackson-provider" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-jaxb-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxb-provider" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-jettison-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jettison-provider" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-jaxrs">
++ <maven-resource group="org.jboss.resteasy" artifact="async-http-servlet-3.0"/>
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxrs" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-jsapi">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-jsapi" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-multipart-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-multipart-provider" jandex="true"/>
++ </module-def>
++
++ <module-def name="org.jboss.resteasy.resteasy-yaml-provider">
++ <maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider" jandex="true"/>
++ </module-def>
++
+ <module-def name="org.jboss.sasl">
+ <maven-resource group="org.jboss.sasl" artifact="jboss-sasl" />
+ </module-def>
+@@ -952,10 +993,6 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jaxr"/>
+ </module-def>
+
+- <module-def name="org.jboss.as.jaxrs">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
+- </module-def>
+-
+ <module-def name="org.jboss.as.jdr">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jdr"/>
+ <maven-resource group="org.jboss.as" artifact="jboss-as-sos"/>
+@@ -1056,43 +1093,6 @@
+ <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs30"/>
+ </module-def>
+
+- <module-def name="org.jboss.resteasy.resteasy-atom-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-cdi">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-cdi"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-jackson-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jackson-provider" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-jaxb-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxb-provider" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-jettison-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jettison-provider" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-jaxrs">
+- <maven-resource group="org.jboss.resteasy" artifact="async-http-servlet-3.0"/>
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxrs" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-jsapi">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-jsapi" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-multipart-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-multipart-provider" jandex="true"/>
+- </module-def>
+-
+- <module-def name="org.jboss.resteasy.resteasy-yaml-provider">
+- <maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider" jandex="true"/>
+- </module-def>
+-
+ <module-def name="org.jboss.security.xacml">
+ <maven-resource group="org.jboss.security" artifact="jbossxacml"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 949bcf6..2acf0f9 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -309,6 +309,11 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-jaxrs</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jmx</artifactId>
+ </dependency>
+
+@@ -508,6 +513,56 @@
+ </dependency>
+
+ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>async-http-servlet-3.0</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-jaxrs</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-atom-provider</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-cdi</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-jackson-provider</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-jaxb-provider</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-jettison-provider</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-jsapi</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-multipart-provider</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.resteasy</groupId>
++ <artifactId>resteasy-yaml-provider</artifactId>
++ </dependency>
++
++ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ </dependency>
+@@ -1197,11 +1252,6 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-jaxrs</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jdr</artifactId>
+ </dependency>
+
+@@ -1466,56 +1516,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-jaxrs</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>async-http-servlet-3.0</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-atom-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-cdi</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-jackson-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-jaxb-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-jettison-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-jsapi</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-multipart-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.resteasy</groupId>
+- <artifactId>resteasy-yaml-provider</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ </dependency>
+diff --git a/pom.xml b/pom.xml
+index 05d2b5c..b540261 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -286,6 +286,7 @@
+ <module>ee-deployment</module>
+ <module>ejb3</module>
+ <module>embedded</module>
++ <module>jaxrs</module>
+ <module>jmx</module>
+ <module>jpa</module>
+ <module>management-client-content</module>
+@@ -5976,7 +5977,6 @@
+ <module>jacorb</module>
+ -->
+ <module>jaxr</module>
+- <module>jaxrs</module>
+ <module>jdr</module>
+ <module>jsr77</module>
+ <module>messaging</module>
+--
+1.7.10
+
diff --git a/0050-Added-org.jboss.as.pojo-module.patch b/0050-Added-org.jboss.as.pojo-module.patch
new file mode 100644
index 0000000..524203a
--- /dev/null
+++ b/0050-Added-org.jboss.as.pojo-module.patch
@@ -0,0 +1,88 @@
+From 38a845652dd726263280b06c282359979785ac0c Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Mon, 23 Apr 2012 16:17:34 +0200
+Subject: [PATCH 50/50] Added org.jboss.as.pojo module
+
+---
+ build/build.xml | 8 ++++----
+ build/pom.xml | 10 +++++-----
+ pom.xml | 2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index ea0e220..759c15c 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -445,6 +445,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-platform-mbean"/>
+ </module-def>
+
++ <module-def name="org.jboss.as.pojo">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-pojo"/>
++ </module-def>
++
+ <module-def name="org.jboss.as.process-controller">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-process-controller"/>
+ </module-def>
+@@ -1026,10 +1030,6 @@
+ <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-jbossweb"/>
+ </module-def>
+
+- <module-def name="org.jboss.as.pojo">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-pojo"/>
+- </module-def>
+-
+ <module-def name="org.jboss.as.osgi">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-osgi-service"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 2acf0f9..fea222d 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -359,6 +359,11 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-pojo</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+
+@@ -1304,11 +1309,6 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-pojo</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-process-controller</artifactId>
+ </dependency>
+
+diff --git a/pom.xml b/pom.xml
+index b540261..ead1611 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -295,6 +295,7 @@
+ <module>naming</module>
+ <module>network</module>
+ <module>platform-mbean</module>
++ <module>pojo</module>
+ <module>process-controller</module>
+ <module>protocol</module>
+ <module>remoting</module>
+@@ -5982,7 +5983,6 @@
+ <module>messaging</module>
+ <module>modcluster</module>
+ <module>osgi</module>
+- <module>pojo</module>
+ <module>remoting-test</module>
+ <module>sar</module>
+ <module>spec-api</module>
+--
+1.7.10
+
diff --git a/0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch b/0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch
new file mode 100644
index 0000000..736ed67
--- /dev/null
+++ b/0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch
@@ -0,0 +1,25 @@
+From cf6ad62b1c98b73c22d70cc734da975ad5dbb766 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 24 Apr 2012 13:38:48 +0200
+Subject: [PATCH 51/51] Loose banned deps on javax.xml.stream:stax-api
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index ead1611..1503a4a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -414,7 +414,7 @@
+ <exclude>javax.transaction:jta</exclude>
+ <exclude>javax.xml:jaxrpc-api</exclude>
+ <exclude>javax.xml.soap:saaj-api</exclude>
+- <exclude>javax.xml.stream:stax-api</exclude>
++ <!-- <exclude>javax.xml.stream:stax-api</exclude> this is pulled by resteasy deps -->
+ <exclude>jboss:jboss-logging-spi</exclude>
+ <exclude>jboss:jboss-serialization</exclude>
+ <exclude>jboss.web:el-api</exclude>
+--
+1.7.10
+
diff --git a/jboss-as.spec b/jboss-as.spec
index bec3f07..ef16ec7 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -11,7 +11,7 @@
%global jbuid 185
-%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded jmx logging mail naming network platform-mbean process-controller protocol remoting security server threads transactions web weld
+%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded jaxrs jmx logging mail naming network platform-mbean pojo process-controller protocol remoting security server threads transactions web weld
Name: jboss-as
Version: 7.1.1
@@ -78,6 +78,9 @@ Patch44: 0045-Add-org.jboss.as.config-assembly-module.patch
Patch45: 0046-Added-org.jboss.as.cmp-module.patch
Patch46: 0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
Patch47: 0048-Added-org.jboss.as.mail-module.patch
+Patch48: 0049-Added-org.jboss.as.jaxrs-module.patch
+Patch49: 0050-Added-org.jboss.as.pojo-module.patch
+Patch50: 0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch
BuildArch: noarch
@@ -87,8 +90,8 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-collections
BuildRequires: apache-james-project
BuildRequires: atinject
-BuildRequires: bean-validation-api >= 1.0.0-4
-BuildRequires: bsf >= 2.4.0-10
+BuildRequires: bean-validation-api
+BuildRequires: bsf
BuildRequires: cal10n
BuildRequires: cdi-api
BuildRequires: dom4j
@@ -96,64 +99,64 @@ BuildRequires: dom4j
BuildRequires: ecj
BuildRequires: guava
BuildRequires: h2
-BuildRequires: hibernate-jpa-2.0-api >= 1.0.1-5
-BuildRequires: hibernate-validator >= 4.2.0
-BuildRequires: infinispan >= 5.1.2-1
-BuildRequires: ironjacamar >= 1.0.9-3
-BuildRequires: jandex >= 1.0.3-3
+BuildRequires: hibernate-jpa-2.0-api
+BuildRequires: hibernate-validator
+BuildRequires: infinispan
+BuildRequires: ironjacamar
+BuildRequires: jandex
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: javamail
BuildRequires: javassist
BuildRequires: jgroups
BuildRequires: jboss-annotations-1.1-api
BuildRequires: jboss-classfilewriter
-BuildRequires: jboss-common-core >= 2.2.18-5
-BuildRequires: jboss-connector-1.6-api >= 1.0.1
-BuildRequires: jboss-dmr >= 1.1.1-3
-BuildRequires: jboss-ejb-3.1-api >= 1.0.2
-BuildRequires: jboss-ejb3-ext-api >= 2.0.0-2
+BuildRequires: jboss-common-core
+BuildRequires: jboss-connector-1.6-api
+BuildRequires: jboss-dmr
+BuildRequires: jboss-ejb-3.1-api
+BuildRequires: jboss-ejb3-ext-api
BuildRequires: jboss-ejb-client
BuildRequires: jboss-el-2.2-api
-BuildRequires: jboss-httpserver >= 1.0.0-1
+BuildRequires: jboss-httpserver
BuildRequires: jboss-iiop-client
-BuildRequires: jboss-invocation >= 1.1.1-1
-BuildRequires: jboss-interceptor >= 2.0.0-1
-BuildRequires: jboss-interceptors-1.1-api >= 1.0.1
-BuildRequires: jboss-jacc-1.4-api >= 1.0.2
-BuildRequires: jboss-jad-1.2-api >= 1.0.1
+BuildRequires: jboss-invocation
+BuildRequires: jboss-interceptor
+BuildRequires: jboss-interceptors-1.1-api
+BuildRequires: jboss-jacc-1.4-api
+BuildRequires: jboss-jad-1.2-api
BuildRequires: jboss-jaxb-2.2-api
-BuildRequires: jboss-jaxrpc-1.1-api >= 1.0.1
-BuildRequires: jboss-jaspi-1.0-api >= 1.0.1
-BuildRequires: jboss-jms-1.1-api >= 1.0.1
+BuildRequires: jboss-jaxrpc-1.1-api
+BuildRequires: jboss-jaspi-1.0-api
+BuildRequires: jboss-jms-1.1-api
BuildRequires: jboss-jts
BuildRequires: jboss-jsf-2.1-api
BuildRequires: jboss-jsp-2.2-api
-BuildRequires: jboss-jstl-1.2-api >= 1.0.3
+BuildRequires: jboss-jstl-1.2-api
BuildRequires: jboss-parent
-BuildRequires: jboss-logging >= 3.1.0-2
-BuildRequires: jboss-logging-tools >= 1.0.0-1
-BuildRequires: jboss-logmanager >= 1.2.2-1
-BuildRequires: jboss-logmanager-log4j >= 1.0.0-3
-BuildRequires: jboss-marshalling >= 1.3.9-2
-BuildRequires: jboss-metadata >= 7.0.1-1
-BuildRequires: jboss-modules >= 1.1.1-2
-BuildRequires: jboss-msc >= 1.0.2
-BuildRequires: jboss-negotiation >= 2.2.0-3.SP1
-BuildRequires: jboss-remoting >= 3.2.2-2
+BuildRequires: jboss-logging
+BuildRequires: jboss-logging-tools
+BuildRequires: jboss-logmanager
+BuildRequires: jboss-logmanager-log4j
+BuildRequires: jboss-marshalling
+BuildRequires: jboss-metadata
+BuildRequires: jboss-modules
+BuildRequires: jboss-msc
+BuildRequires: jboss-negotiation
+BuildRequires: jboss-remoting
BuildRequires: jboss-remoting-jmx
-BuildRequires: jboss-remote-naming >= 1.0.1
+BuildRequires: jboss-remote-naming
BuildRequires: jboss-rmi-1.0-api
-BuildRequires: jboss-sasl >= 1.0.0-2
+BuildRequires: jboss-sasl
BuildRequires: jboss-saaj-1.3-api
-BuildRequires: jboss-servlet-3.0-api >= 1.0.0-1
-BuildRequires: jboss-stdio >= 1.0.1-3
+BuildRequires: jboss-servlet-3.0-api
+BuildRequires: jboss-stdio
BuildRequires: jboss-specs-parent
-BuildRequires: jboss-threads >= 2.0.0-4
-BuildRequires: jboss-transaction-1.1-api >= 1.0.1
+BuildRequires: jboss-threads
+BuildRequires: jboss-transaction-1.1-api
BuildRequires: jboss-transaction-spi
-BuildRequires: jboss-web >= 7.0.10-1
+BuildRequires: jboss-web
BuildRequires: jboss-web-native
-BuildRequires: jboss-vfs >= 3.1.0-1
+BuildRequires: jboss-vfs
BuildRequires: jbossws-api
BuildRequires: jcip-annotations
BuildRequires: jline
@@ -170,22 +173,23 @@ BuildRequires: javacc-maven-plugin
BuildRequires: mojarra
BuildRequires: picketbox
BuildRequires: picketbox-commons
+BuildRequires: resteasy >= 2.3.2-6
BuildRequires: rhq-plugin-annotations
BuildRequires: slf4j
BuildRequires: slf4j-jboss-logmanager
-BuildRequires: staxmapper >= 1.1.0-2
+BuildRequires: staxmapper
BuildRequires: systemd-units
-BuildRequires: weld-api >= 1.1-3
+BuildRequires: weld-api
BuildRequires: weld-core
BuildRequires: weld-parent
BuildRequires: xalan-j2
BuildRequires: xerces-j2
-BuildRequires: xnio >= 3.0.1-2
+BuildRequires: xnio
Requires: atinject
Requires: apache-commons-logging
Requires: apache-commons-collections
-Requires: bean-validation-api >= 1.0.0-4
+Requires: bean-validation-api
Requires: cal10n
Requires: cdi-api
Requires: dom4j
@@ -193,61 +197,61 @@ Requires: dom4j
Requires: ecj
Requires: guava
Requires: h2
-Requires: hibernate-jpa-2.0-api >= 1.0.1-5
-Requires: hibernate-validator >= 4.2.0
-Requires: infinispan >= 5.1.2-1
-Requires: ironjacamar >= 1.0.9-3
-Requires: jandex >= 1.0.3-3
-Requires: java
+Requires: hibernate-jpa-2.0-api
+Requires: hibernate-validator
+Requires: infinispan
+Requires: ironjacamar
+Requires: jandex
+Requires: java >= 1:1.7.0
Requires: javamail
Requires: javassist
Requires: jboss-annotations-1.1-api
Requires: jboss-classfilewriter
-Requires: jboss-common-core >= 2.2.18-5
-Requires: jboss-connector-1.6-api >= 1.0.1
-Requires: jboss-dmr >= 1.1.1-3
-Requires: jboss-ejb-3.1-api >= 1.0.2
-Requires: jboss-ejb3-ext-api >= 2.0.0-2
+Requires: jboss-common-core
+Requires: jboss-connector-1.6-api
+Requires: jboss-dmr
+Requires: jboss-ejb-3.1-api
+Requires: jboss-ejb3-ext-api
Requires: jboss-ejb-client
Requires: jboss-el-2.2-api
-Requires: jboss-httpserver >= 1.0.0-1
+Requires: jboss-httpserver
Requires: jboss-iiop-client
-Requires: jboss-interceptor >= 2.0.0-1
-Requires: jboss-interceptors-1.1-api >= 1.0.1
-Requires: jboss-invocation >= 1.1.1-1
-Requires: jboss-jacc-1.4-api >= 1.0.2
-Requires: jboss-jad-1.2-api >= 1.0.1
+Requires: jboss-interceptor
+Requires: jboss-interceptors-1.1-api
+Requires: jboss-invocation
+Requires: jboss-jacc-1.4-api
+Requires: jboss-jad-1.2-api
Requires: jboss-jaxb-2.2-api
-Requires: jboss-jaxrpc-1.1-api >= 1.0.1
-Requires: jboss-jaspi-1.0-api >= 1.0.1
-Requires: jboss-jms-1.1-api >= 1.0.1
+Requires: jboss-jaxrpc-1.1-api
+Requires: jboss-jaspi-1.0-api
+Requires: jboss-jms-1.1-api
Requires: jboss-jsf-2.1-api
Requires: jboss-jsp-2.2-api
-Requires: jboss-jstl-1.2-api >= 1.0.3
+Requires: jboss-jstl-1.2-api
Requires: jboss-jts
-Requires: jboss-logging >= 3.1.0-2
-Requires: jboss-logging-tools >= 1.0.0-1
-Requires: jboss-logmanager >= 1.2.2-1
-Requires: jboss-logmanager-log4j >= 1.0.0-3
-Requires: jboss-marshalling >= 1.3.9-2
-Requires: jboss-metadata >= 7.0.1-1
-Requires: jboss-modules >= 1.1.1-2
-Requires: jboss-msc >= 1.0.2
-Requires: jboss-negotiation >= 2.2.0-3.SP1
-Requires: jboss-remoting >= 3.2.2-2
+Requires: jboss-logging
+Requires: jboss-logging-tools
+Requires: jboss-logmanager
+Requires: jboss-logmanager-log4j
+Requires: jboss-marshalling
+Requires: jboss-metadata
+Requires: jboss-modules
+Requires: jboss-msc
+Requires: jboss-negotiation
+Requires: jboss-remoting
Requires: jboss-remoting-jmx
-Requires: jboss-remote-naming >= 1.0.1
+Requires: jboss-remote-naming
Requires: jboss-rmi-1.0-api
-Requires: jboss-sasl >= 1.0.0-2
+Requires: jboss-sasl
Requires: jboss-saaj-1.3-api
-Requires: jboss-servlet-3.0-api >= 1.0.0-1
-Requires: jboss-stdio >= 1.0.1-3
-Requires: jboss-threads >= 2.0.0-4
-Requires: jboss-transaction-1.1-api >= 1.0.1
+Requires: jboss-servlet-3.0-api
+Requires: jboss-stdio
+Requires: jboss-threads
+Requires: jboss-transaction-1.1-api
Requires: jboss-transaction-spi
-Requires: jboss-web >= 7.0.10-1
+Requires: jboss-web
Requires: jboss-web-native
-Requires: jboss-vfs >= 3.1.0-1
+Requires: jboss-vfs
Requires: jbossws-api
Requires: jcip-annotations
Requires: jgroups
@@ -258,15 +262,16 @@ Requires: jpackage-utils
Requires: mojarra
Requires: picketbox
Requires: picketbox-commons
+Requires: resteasy >= 2.3.2-6
Requires: rhq-plugin-annotations
Requires: slf4j
Requires: slf4j-jboss-logmanager
-Requires: staxmapper >= 1.1.0-2
-Requires: weld-api >= 1.1-3
+Requires: staxmapper
+Requires: weld-api
Requires: weld-core
Requires: xalan-j2
Requires: xerces-j2
-Requires: xnio >= 3.0.1-2
+Requires: xnio
Requires(pre): shadow-utils
%description
@@ -334,6 +339,9 @@ This package contains the API documentation for %{name}.
%patch45 -p1
%patch46 -p1
%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
%build
# We don't have packaged all test dependencies (jboss-test for example)
@@ -602,6 +610,11 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath picketbox/picketbox) org/picketbox/main/picketbox.jar
ln -s $(build-classpath picketbox/infinispan) org/picketbox/main/infinispan.jar
ln -s $(build-classpath picketbox-commons) org/picketbox/main/picketbox-commons.jar
+
+ for m in atom-provider cdi jackson-provider jaxb-provider jaxrs jettison-provider jsapi multipart-provider yaml-provider; do
+ ln -s $(build-classpath resteasy/resteasy-${m}) org/jboss/resteasy/resteasy-${m}/main/resteasy-${m}.jar
+ done
+
ln -s $(build-classpath slf4j/api) org/slf4j/main/api.jar
ln -s $(build-classpath slf4j/ext) org/slf4j/ext/main/ext.jar
ln -s $(build-classpath slf4j/jcl-over-slf4j) org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j.jar
@@ -679,6 +692,9 @@ exit 0
- Upstream release 7.1.1.Final
- Added jboss-as-cmp module
- Added jboss-as-mail module
+- Added jboss-as-jaxrs module
+- Added jboss-as-pojo module
+- Spec file cleanup from versions
* Mon Apr 16 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.0-3
- Simplified systemd files
More information about the scm-commits
mailing list