activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1086566 - in /activemq/trunk: activemq-core/pom.xml activemq-optional/pom.xml activemq-rar/pom.xml activemq-xmpp/pom.xml assembly/pom.xml assembly/src/main/descriptors/common-bin.xml pom.xml
Date Tue, 29 Mar 2011 12:32:34 GMT
Author: dejanb
Date: Tue Mar 29 12:32:34 2011
New Revision: 1086566

URL: http://svn.apache.org/viewvc?rev=1086566&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3249 - removing jaxb and stax from dependencies
and distro

Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-optional/pom.xml
    activemq/trunk/activemq-rar/pom.xml
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Mar 29 12:32:34 2011
@@ -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>

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Tue Mar 29 12:32:34 2011
@@ -158,12 +158,7 @@
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <optional>true</optional>
-    </dependency>     
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <optional>true</optional>
-    </dependency>    
+    </dependency>
 
     <dependency>
       <groupId>log4j</groupId>

Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Tue Mar 29 12:32:34 2011
@@ -114,14 +114,6 @@
            <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>
         </exclusion>

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Tue Mar 29 12:32:34 2011
@@ -78,30 +78,6 @@
       <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>
       <version>1.0.2</version>
@@ -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>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Mar 29 12:32:34 2011
@@ -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>

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=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Mar 29 12:32:34 2011
@@ -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>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1086566&r1=1086565&r2=1086566&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Mar 29 12:32:34 2011
@@ -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>
@@ -454,31 +452,7 @@
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
       <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>
+    </dependency>
 
       <!-- camel testing -->
       <dependency>
@@ -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>



Mime
View raw message