Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2011-03-29 12:32:34 +00:00
parent eb22a02563
commit d8c142f1f4
7 changed files with 2 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-core/pom.xml
View File

@ -146,11 +146,6 @@
<artifactId>xbean-spring</artifactId> <artifactId>xbean-spring</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -687,19 +682,6 @@
</build> </build>
</profile> </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> </profiles>
</project> </project>

5
activemq-optional/pom.xml
View File

@ -159,11 +159,6 @@
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>

8
activemq-rar/pom.xml
View File

@ -113,14 +113,6 @@
<groupId>qdox</groupId> <groupId>qdox</groupId>
<artifactId>qdox</artifactId> <artifactId>qdox</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

42
activemq-xmpp/pom.xml
View File

@ -77,30 +77,6 @@
<artifactId>stax2-api</artifactId> <artifactId>stax2-api</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
</dependency> </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> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId> <artifactId>geronimo-activation_1.1_spec</artifactId>
@ -135,24 +111,6 @@
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<plugins> <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> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

23
assembly/pom.xml
View File

@ -143,20 +143,6 @@
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId> <artifactId>camel-jms</artifactId>
</dependency> </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 --> <!-- commons -->
<dependency> <dependency>
@ -313,15 +299,6 @@
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId> <artifactId>jsp-2.1-glassfish</artifactId>
</dependency> </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>

6
assembly/src/main/descriptors/common-bin.xml
View File

@ -164,12 +164,6 @@
<include>org.apache.camel:camel-jetty</include> <include>org.apache.camel:camel-jetty</include>
<include>org.apache.camel:camel-jms</include> <include>org.apache.camel:camel-jms</include>
<include>org.apache.activemq:activemq-camel</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> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>

38
pom.xml
View File

@ -78,8 +78,6 @@
<!-- pax-logging (osgi) dont support slf4j 1.6.x --> <!-- pax-logging (osgi) dont support slf4j 1.6.x -->
<slf4j-version>1.5.11</slf4j-version> <slf4j-version>1.5.11</slf4j-version>
<spring-oxm-version>1.5.8</spring-oxm-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> <xalan-version>2.6.0</xalan-version>
<xmlbeans-version>2.0.0-beta1</xmlbeans-version> <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
<xpp3-version>1.1.4c</xpp3-version> <xpp3-version>1.1.4c</xpp3-version>
@ -456,30 +454,6 @@
<version>1.0.3</version> <version>1.0.3</version>
</dependency> </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 --> <!-- camel testing -->
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
@ -750,18 +724,6 @@
<version>${xmlbeans-version}</version> <version>${xmlbeans-version}</version>
</dependency> </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) --> <!-- To use XPath using JAXP 1.3 (std in Java 5) -->
<dependency> <dependency>
<groupId>activesoap</groupId> <groupId>activesoap</groupId>