Author: veithen
Date: Tue Feb 12 20:51:21 2013
New Revision: 1445353
URL: http://svn.apache.org/r1445353
Log:
Merged r1410313 (with changes) to the 1.6 branch (prerequisite for AXIS2-5434).
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml
axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml
axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml
axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml
axis/axis2/java/core/branches/1_6/modules/json/pom.xml
axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml
axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml
axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml
axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1410313
Modified: axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-codegen/pom.xml Tue Feb 12
20:51:21 2013
@@ -55,6 +55,11 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/adb/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/pom.xml Tue Feb 12 20:51:21
2013
@@ -48,6 +48,11 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/addressing/pom.xml Tue Feb 12
20:51:21 2013
@@ -38,6 +38,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/clustering/pom.xml Tue Feb 12
20:51:21 2013
@@ -55,6 +55,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
</dependency>
Modified: axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/codegen/pom.xml Tue Feb 12
20:51:21 2013
@@ -53,6 +53,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml Tue Feb 12
20:51:21 2013
@@ -100,6 +100,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/integration/pom.xml Tue Feb 12
20:51:21 2013
@@ -143,6 +143,11 @@
<type>mar</type>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml Tue Feb 12
20:51:21 2013
@@ -77,6 +77,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxbri/pom.xml Tue Feb 12
20:51:21 2013
@@ -59,6 +59,11 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/pom.xml Tue Feb 12 20:51:21
2013
@@ -101,6 +101,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jibx/pom.xml Tue Feb 12 20:51:21
2013
@@ -66,6 +66,11 @@
<artifactId>ant</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/json/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/json/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/json/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/json/pom.xml Tue Feb 12 20:51:21
2013
@@ -55,6 +55,11 @@
<artifactId>xmlunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml Tue Feb 12
20:51:21 2013
@@ -100,6 +100,11 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/metadata/pom.xml Tue Feb 12
20:51:21 2013
@@ -70,6 +70,11 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/mtompolicy/pom.xml Tue Feb 12
20:51:21 2013
@@ -40,6 +40,11 @@
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Tue Feb 12
20:51:21 2013
@@ -734,13 +734,11 @@
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>${xmlunit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
@@ -933,32 +931,10 @@
<profiles>
<profile>
- <id>java15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <!-- Junit testing environment-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>java16</id>
<activation>
<jdk>1.6</jdk>
</activation>
- <dependencies>
- <!-- Junit testing environment-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
</profile>
</profiles>
<scm>
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk/modules/saaj:r1410313
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/saaj/pom.xml Tue Feb 12 20:51:21
2013
@@ -70,6 +70,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/scripting/pom.xml Tue Feb 12
20:51:21 2013
@@ -49,6 +49,11 @@
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified: axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/testutils/pom.xml Tue Feb 12
20:51:21 2013
@@ -32,7 +32,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
</dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
Modified: axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/http/pom.xml Tue Feb 12
20:51:21 2013
@@ -110,5 +110,10 @@
<artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/transport/local/pom.xml Tue Feb
12 20:51:21 2013
@@ -96,5 +96,10 @@
<artifactId>axis2-kernel</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml?rev=1445353&r1=1445352&r2=1445353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/xmlbeans/pom.xml Tue Feb 12
20:51:21 2013
@@ -48,6 +48,11 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
