JBossWS SVN: r14068 - in stack/cxf/branches/asoldano: modules/client and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-12 05:05:07 -0400 (Tue, 12 Apr 2011)
New Revision: 14068
Modified:
stack/cxf/branches/asoldano/modules/client/pom.xml
stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/asoldano/modules/server/pom.xml
stack/cxf/branches/asoldano/pom.xml
Log:
Moving to javax.xml.stream:stax-api:1.0-2
Modified: stack/cxf/branches/asoldano/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/pom.xml 2011-04-12 06:57:11 UTC (rev 14067)
+++ stack/cxf/branches/asoldano/modules/client/pom.xml 2011-04-12 09:05:07 UTC (rev 14068)
@@ -126,7 +126,7 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-12 06:57:11 UTC (rev 14067)
+++ stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-12 09:05:07 UTC (rev 14068)
@@ -71,7 +71,7 @@
<include>commons-beanutils:commons-beanutils:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
- <include>stax:stax-api:jar</include>
+ <include>javax.xml.stream:stax-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
Modified: stack/cxf/branches/asoldano/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/server/pom.xml 2011-04-12 06:57:11 UTC (rev 14067)
+++ stack/cxf/branches/asoldano/modules/server/pom.xml 2011-04-12 09:05:07 UTC (rev 14068)
@@ -142,7 +142,7 @@
<artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/asoldano/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/pom.xml 2011-04-12 06:57:11 UTC (rev 14067)
+++ stack/cxf/branches/asoldano/pom.xml 2011-04-12 09:05:07 UTC (rev 14068)
@@ -57,7 +57,6 @@
<!-- END -->
<jboss700.version>7.0.0.Beta3-SNAPSHOT</jboss700.version>
<cxf.version>2.3.3-patch-01</cxf.version>
- <cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -82,6 +81,7 @@
<log4j.version>1.2.14</log4j.version>
<mail.version>1.4.2</mail.version>
<saaj.api.version>1.0.0.Final</saaj.api.version>
+ <stax.api.version>1.0-2</stax.api.version>
<jms.api.version>1.0.0.Final</jms.api.version>
<velocity.version>1.5</velocity.version>
<xerces.version>2.9.1</xerces.version>
@@ -946,9 +946,9 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
- <version>${cxf.stax.version}</version>
+ <version>${stax.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>