mirror of https://github.com/apache/activemq.git
resolve some dependency divergence among modules
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@719220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0fe1944bad
commit
7673448206
|
@ -114,7 +114,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.thoughtworks.xstream</groupId>
|
<groupId>com.thoughtworks.xstream</groupId>
|
||||||
<artifactId>xstream</artifactId>
|
<artifactId>xstream</artifactId>
|
||||||
<version>1.2.2</version>
|
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -182,7 +181,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>stax</groupId>
|
<groupId>stax</groupId>
|
||||||
<artifactId>stax-api</artifactId>
|
<artifactId>stax-api</artifactId>
|
||||||
<version>1.0.1</version>
|
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sun.xml.bind</groupId>
|
<groupId>com.sun.xml.bind</groupId>
|
||||||
<artifactId>jaxb-impl</artifactId>
|
<artifactId>jaxb-impl</artifactId>
|
||||||
<version>2.0.2</version>
|
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>javax.xml.bind</groupId>
|
<groupId>javax.xml.bind</groupId>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -669,7 +669,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>stax</groupId>
|
<groupId>stax</groupId>
|
||||||
<artifactId>stax-api</artifactId>
|
<artifactId>stax-api</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.0.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>stax</groupId>
|
<groupId>stax</groupId>
|
||||||
|
|
Loading…
Reference in New Issue