You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/07/04 21:50:51 UTC
svn commit: r960386 - in /servicemix/smx3/trunk: ./ core/servicemix-core/
distributions/apache-servicemix/src/main/assembly/
distributions/apache-servicemix/src/sandbox/xfire-binding/
platforms/geronimo/servicemix/ web/servicemix-web-console/
Author: jbonofre
Date: Sun Jul 4 19:50:50 2010
New Revision: 960386
URL: http://svn.apache.org/viewvc?rev=960386&view=rev
Log:
[SM-1949] Update to woodstox 4.0.8 and stax-api 1.0-2.
Modified:
servicemix/smx3/trunk/core/servicemix-core/pom.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/sandbox/xfire-binding/project.xml
servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/web/servicemix-web-console/pom.xml
Modified: servicemix/smx3/trunk/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/pom.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Sun Jul 4 19:50:50 2010
@@ -178,7 +178,7 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Sun Jul 4 19:50:50 2010
@@ -166,7 +166,7 @@
<include>xerces:xercesImpl</include>
<include>xalan:xalan</include>
- <include>stax:stax-api</include>
+ <include>javax.xml.stream:stax-api</include>
<include>org.codehaus.woodstox:woodstox-core-asl</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>xml-apis:xml-apis</include>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Sun Jul 4 19:50:50 2010
@@ -158,7 +158,7 @@
<include>xerces:xercesImpl</include>
<include>xalan:xalan</include>
- <include>stax:stax-api</include>
+ <include>javax.xml.stream:stax-api</include>
<include>org.codehaus.woodstox:woodstox-core-asl</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>xml-apis:xml-apis</include>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/sandbox/xfire-binding/project.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/sandbox/xfire-binding/project.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/sandbox/xfire-binding/project.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/sandbox/xfire-binding/project.xml Sun Jul 4 19:50:50 2010
@@ -79,9 +79,9 @@
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0</version>
+ <version>1.0-2</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml Sun Jul 4 19:50:50 2010
@@ -179,7 +179,7 @@
<version>${xbean-version}</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sun Jul 4 19:50:50 2010
@@ -111,7 +111,7 @@
<wsdl4j-version>1.6.2</wsdl4j-version>
<commons-beanutils-version>1.7.0</commons-beanutils-version>
<commons-fileupload-version>1.1.1</commons-fileupload-version>
- <woodstox-version>4.0.7</woodstox-version>
+ <woodstox-version>4.0.8</woodstox-version>
<woodstox.stax2api.version>3.0.1</woodstox.stax2api.version>
<msv-version>20050913</msv-version>
<oro-version>2.0.8</oro-version>
@@ -1405,9 +1405,9 @@
<version>${spring-version}</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
+ <version>1.0-2</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Modified: servicemix/smx3/trunk/web/servicemix-web-console/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/servicemix-web-console/pom.xml?rev=960386&r1=960385&r2=960386&view=diff
==============================================================================
--- servicemix/smx3/trunk/web/servicemix-web-console/pom.xml (original)
+++ servicemix/smx3/trunk/web/servicemix-web-console/pom.xml Sun Jul 4 19:50:50 2010
@@ -74,6 +74,10 @@
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
</exclusion>