Author: veithen
Date: Fri May 10 09:57:17 2013
New Revision: 1480971
URL: http://svn.apache.org/r1480971
Log:
AXIS2-5434: Merged r1480969 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1480969
Modified: axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml?rev=1480971&r1=1480970&r2=1480971&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml Fri May 10
09:57:17 2013
@@ -194,6 +194,57 @@
<type>aar</type>
</dependency>
+ <!-- Additional transports (with 3rd party dependencies excludes as in
Axis2 1.4.1) -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-mail</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-tcp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-udp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-xmpp</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smack</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smackx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Axis2 has always been shipped with Sun's implementations of
JavaMail and JAF, although Axiom depends on (and has been tested
with) Geronimo's implementations. This should probably
reevaluated. -->
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1480969
