Author: dejanb
Date: Tue Oct 19 12:18:20 2010
New Revision: 1024215
URL: http://svn.apache.org/viewvc?rev=1024215&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2989 - xmpp3
Modified:
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web-demo/pom.xml
activemq/trunk/activemq-web/pom.xml
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-optional/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Tue Oct 19 12:18:20 2010
@@ -86,8 +86,8 @@
<artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Tue Oct 19 12:18:20 2010
@@ -267,8 +267,8 @@
<!-- XStream marshalling -->
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-web-demo/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Tue Oct 19 12:18:20 2010
@@ -110,8 +110,8 @@
</dependency>
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/activemq-web/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Tue Oct 19 12:18:20 2010
@@ -117,8 +117,8 @@
</dependency>
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Oct 19 12:18:20 2010
@@ -191,8 +191,8 @@
<artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Oct 19
12:18:20 2010
@@ -203,7 +203,7 @@
<include>org.springframework:spring-asm</include>
<include>org.springframework:spring-expression</include>
<include>com.thoughtworks.xstream:xstream</include>
- <include>xmlpull:xmlpull</include>
+ <include>xpp3:xpp3</include>
<include>org.codehaus.woodstox:woodstox-core-asl</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.springframework.ws:spring-oxm-tiger</include>
Modified: activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1024215&r1=1024214&r2=1024215&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Oct 19 12:18:20 2010
@@ -83,7 +83,7 @@
<stax-version>1.2.0</stax-version>
<xalan-version>2.6.0</xalan-version>
<xmlbeans-version>2.0.0-beta1</xmlbeans-version>
- <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
+ <xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.3.1</xstream-version>
<xbean-version>3.7</xbean-version>
<velocity-version>1.6.2</velocity-version>
@@ -789,9 +789,9 @@
</dependency>
<dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- <version>${xmlpull-version}</version>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3-version}</version>
</dependency>
<dependency>
