mirror of https://github.com/apache/activemq.git
https://issues.apache.org/jira/browse/AMQ-3249 - removing jaxb and stax from dependencies and distro
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086566 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan
parent
eb22a02563
commit
d8c142f1f4
|
|
@ -146,11 +146,6 @@
|
|||
<artifactId>xbean-spring</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
|
|
@ -687,19 +682,6 @@
|
|||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>jdk1.4</id>
|
||||
<activation>
|
||||
<jdk>1.4</jdk>
|
||||
</activation>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>activesoap</groupId>
|
||||
<artifactId>jaxp-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -159,11 +159,6 @@
|
|||
<artifactId>xalan</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
|
|
|
|||
|
|
@ -113,14 +113,6 @@
|
|||
<groupId>qdox</groupId>
|
||||
<artifactId>qdox</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
|
|
|
|||
|
|
@ -77,30 +77,6 @@
|
|||
<artifactId>stax2-api</artifactId>
|
||||
<version>3.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.xml.bind</groupId>
|
||||
<artifactId>jaxb-impl</artifactId>
|
||||
<version>2.1.12</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jsr173_api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.xml</groupId>
|
||||
<artifactId>jsr173</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.activation</groupId>
|
||||
<artifactId>activation</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<!-- needed so explicitly pull in geronimo .. spec below -->
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>activation</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-activation_1.1_spec</artifactId>
|
||||
|
|
@ -135,24 +111,6 @@
|
|||
<defaultGoal>install</defaultGoal>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
<source>1.5</source>
|
||||
<target>1.5</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
<source>1.5</source>
|
||||
<target>1.5</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
|
|
|
|||
|
|
@ -143,20 +143,6 @@
|
|||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-jms</artifactId>
|
||||
</dependency>
|
||||
<!-- for the XML parsing -->
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.xml.bind</groupId>
|
||||
<artifactId>jaxb-impl</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.activation</groupId>
|
||||
<artifactId>activation</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- commons -->
|
||||
<dependency>
|
||||
|
|
@ -313,15 +299,6 @@
|
|||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jsp-2.1-glassfish</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jasypt</groupId>
|
||||
<artifactId>jasypt</artifactId>
|
||||
|
|
|
|||
|
|
@ -164,12 +164,6 @@
|
|||
<include>org.apache.camel:camel-jetty</include>
|
||||
<include>org.apache.camel:camel-jms</include>
|
||||
<include>org.apache.activemq:activemq-camel</include>
|
||||
<!-- Java 5 only -->
|
||||
<include>javax.xml.bind:jaxb-api</include>
|
||||
<include>javax.activation:activation</include>
|
||||
<include>com.sun.xml.bind:jaxb-impl</include>
|
||||
<include>stax:stax-api</include>
|
||||
<include>stax:stax</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
|
|
|
|||
38
pom.xml
38
pom.xml
|
|
@ -78,8 +78,6 @@
|
|||
<!-- pax-logging (osgi) dont support slf4j 1.6.x -->
|
||||
<slf4j-version>1.5.11</slf4j-version>
|
||||
<spring-oxm-version>1.5.8</spring-oxm-version>
|
||||
<stax-api-version>1.0.1</stax-api-version>
|
||||
<stax-version>1.2.0</stax-version>
|
||||
<xalan-version>2.6.0</xalan-version>
|
||||
<xmlbeans-version>2.0.0-beta1</xmlbeans-version>
|
||||
<xpp3-version>1.1.4c</xpp3-version>
|
||||
|
|
@ -456,30 +454,6 @@
|
|||
<version>1.0.3</version>
|
||||
</dependency>
|
||||
|
||||
<!-- for the XML parsing -->
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
<version>2.1</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.xml</groupId>
|
||||
<artifactId>jsr173</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.xml.bind</groupId>
|
||||
<artifactId>jaxb-impl</artifactId>
|
||||
<version>2.1.6</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.jws</groupId>
|
||||
<artifactId>jsr181-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- camel testing -->
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
|
|
@ -750,18 +724,6 @@
|
|||
<version>${xmlbeans-version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- For Stax -->
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
<version>${stax-api-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax</artifactId>
|
||||
<version>${stax-version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- To use XPath using JAXP 1.3 (std in Java 5) -->
|
||||
<dependency>
|
||||
<groupId>activesoap</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue