[jboss-cvs] JBossAS SVN: r105506 - in trunk: component-matrix and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 1 17:09:58 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-06-01 17:09:57 -0400 (Tue, 01 Jun 2010)
New Revision: 105506
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/depchain/pom.xml
trunk/deployment/pom.xml
trunk/hornetq-int/pom.xml
trunk/iiop/pom.xml
trunk/server/pom.xml
trunk/tomcat/pom.xml
trunk/webservices/pom.xml
Log:
JBAS-8053 JBAS-8054 - use jboss-javaee6-specs-bom for EE API dep mgmt
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/build/build.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -1701,7 +1701,7 @@
<target name="install-jbossws-to-endorsed">
<!-- Endorse JBossWS jars on JDK1.6 and above -->
<copy todir="${install.lib}/endorsed" flatten="true" overwrite="true">
- <fileset refid="javax.xml.ws:jaxws-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-factories:jar"/>
<mapper refid="remove-versions" />
</copy>
@@ -2006,10 +2006,8 @@
<fileset refid="org.apache.ws.security:wss4j:jar"/>
<fileset refid="org.jboss.threads:jboss-threads:jar"/>
<fileset refid="org.jboss.xnio:xnio-api:jar"/>
- <fileset refid="javax.xml.ws:jaxws-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
- <fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
@@ -2053,7 +2051,10 @@
<fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
<fileset refid="org.jboss.jbossts:jbossjts:jar"/>
<fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
@@ -2332,7 +2333,10 @@
<fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
@@ -2352,10 +2356,8 @@
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
- <fileset refid="javax.xml.ws:jaxws-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
- <fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-client:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
@@ -2378,6 +2380,7 @@
<fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-validator:jar"/>
<fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
+ <fileset refid="javax.validation:validation-api:jar"/>
<fileset refid="org.jboss.aop:jboss-aop:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
<!-- For JSR-250 impl -->
@@ -2400,7 +2403,6 @@
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
<fileset refid="commons-collections:commons-collections:jar"/>
<fileset refid="commons-lang:commons-lang:jar"/>
- <fileset refid="sun-jaxb:jaxb-api:jar"/>
<fileset refid="stax:stax-api:jar"/>
<fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
@@ -2438,7 +2440,8 @@
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
<copy todir="${install.lib}/endorsed" filtering="no">
- <fileset refid="sun-jaxb:jaxb-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
<fileset refid="javax.activation:activation:jar"/>
<fileset refid="stax:stax-api:jar"/>
<mapper refid="remove-versions" />
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/component-matrix/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -44,13 +44,11 @@
<version.fastinfoset>1.2.2</version.fastinfoset>
<version.hornetq>2.1.0.BETA3</version.hornetq>
<version.rhq>1.4.0.B01</version.rhq>
- <version.inject.api>1</version.inject.api>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
<version.javassist>3.11.0.GA</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxrpc.api>1.1</version.jaxrpc.api>
- <version.jaxws.api>2.2</version.jaxws.api>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.3.0.GA</version.jboss.jbossws-native>
@@ -110,6 +108,7 @@
<version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
<version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
+ <version.org.jboss.javaee.specs.bom>1.0.0.Beta1</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.Beta3</version.org.jboss.jopr>
<version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
@@ -156,13 +155,10 @@
<version.org.slf4j>1.5.6</version.org.slf4j>
<version.org.springframework>3.0.1.RELEASE</version.org.springframework>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
- <version.saaj.api>1.3</version.saaj.api>
<version.seam.integration>6.0.0.Alpha1</version.seam.integration>
<version.spring.integration>2.0.0-M1-SP1</version.spring.integration>
<version.staxex>2.1.1</version.staxex>
<version.streambuffer>1.0</version.streambuffer>
- <version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>
- <version.spec.javaee.ejb.api>1.0.0.Beta2</version.spec.javaee.ejb.api>
<version.sun.jaxb>2.2</version.sun.jaxb>
<version.sun-jaxws>2.2</version.sun-jaxws>
<version.sun-policy>2.0-b01</version.sun-policy>
@@ -235,6 +231,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>${version.weld.api}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.weld.integration</groupId>
<artifactId>weld-jboss-int-deployer-assembly</artifactId>
<version>${version.weld.integration}</version>
@@ -1561,199 +1563,7 @@
<version>${version.jboss.web}</version>
</dependency>
- <!-- JBoss EE API Dependencies -->
-
<dependency>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- <version>1.0.0.Beta2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>${version.spec.javaee.ejb.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <version>1.0.0.Beta2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
- <artifactId>jboss-jad-api_1.2_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.resource</groupId>
- <artifactId>jboss-connector-api_1.5_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.4_spec</artifactId>
- <version>1.0.0.Beta2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.security.auth.message</groupId>
- <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <version>1.0.0.Beta2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.xml.registry</groupId>
- <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${version.weld.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <version>${version.weld.api}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${version.inject.api}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.javax.faces}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>${version.org.hibernate.javax.persistence}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.sun.jaxb}</version>
- </dependency>
-
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- <version>${version.jaxrpc.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${version.saaj.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${version.jaxws.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- END OF Java EE API Dependencies -->
-
- <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
@@ -3369,8 +3179,16 @@
<artifactId>shrinkwrap-impl-base</artifactId>
<version>${version.org.jboss.shrinkwrap}</version>
</dependency>
-
+
<dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee6-specs-bom</artifactId>
+ <version>${version.org.jboss.javaee.specs.bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/connector/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -257,8 +257,8 @@
<artifactId>quartz</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
</dependency>
</dependencies>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/depchain/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -744,10 +744,22 @@
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.registry</groupId>
<artifactId>jboss-jaxr-api_1.0_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.xml.soap</groupId>
+ <artifactId>jboss-saaj-api_1.3_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
<type>sar</type>
@@ -896,10 +908,6 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
</dependency>
@@ -928,10 +936,6 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/deployment/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -78,8 +78,8 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/hornetq-int/pom.xml
===================================================================
--- trunk/hornetq-int/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/hornetq-int/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -87,6 +87,10 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -164,11 +168,23 @@
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
- <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-plugin-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/iiop/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -143,6 +143,18 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/server/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -247,11 +247,6 @@
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-deployment</artifactId>
</dependency>
@@ -457,16 +452,26 @@
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.soap</groupId>
+ <artifactId>jboss-saaj-api_1.3_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ </dependency>
<dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
</dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/tomcat/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -227,10 +227,6 @@
<artifactId>jasper-jdt</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- </dependency>
- <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
@@ -443,6 +439,10 @@
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
</dependency>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-06-01 20:26:53 UTC (rev 105505)
+++ trunk/webservices/pom.xml 2010-06-01 21:09:57 UTC (rev 105506)
@@ -83,9 +83,8 @@
</dependency>
<!-- jboss provided dependencies -->
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1</version>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
More information about the jboss-cvs-commits
mailing list