You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/11/16 12:51:27 UTC
svn commit: r1410313 - in /axis/axis2/java/core/trunk/modules: adb-codegen/
adb/ addressing/ clustering/ fastinfoset/ integration/ jaxws/ kernel/
metadata/ mtompolicy/ parent/ saaj/ scripting/ testutils/ transport/http/
transport/local/ xmlbeans/
Author: veithen
Date: Fri Nov 16 11:51:23 2012
New Revision: 1410313
URL: http://svn.apache.org/viewvc?rev=1410313&view=rev
Log:
AXIS2-5434: Preparing to move the transports into the core: normalized the dependency management so that the parent POM doesn't declare any dependencies (which would apply to all Maven modules) and that dependency management entries don't specify any scope other than compile. That avoids subtle issues in modules inheriting from that parent POM.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
axis/axis2/java/core/trunk/modules/adb/pom.xml
axis/axis2/java/core/trunk/modules/addressing/pom.xml
axis/axis2/java/core/trunk/modules/clustering/pom.xml
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/saaj/pom.xml
axis/axis2/java/core/trunk/modules/scripting/pom.xml
axis/axis2/java/core/trunk/modules/testutils/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/local/pom.xml
axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb/pom.xml Fri Nov 16 11:51:23 2012
@@ -53,6 +53,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/trunk/modules/addressing/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/addressing/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/clustering/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/clustering/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Fri Nov 16 11:51:23 2012
@@ -128,6 +128,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/trunk/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Fri Nov 16 11:51:23 2012
@@ -86,6 +86,11 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Fri Nov 16 11:51:23 2012
@@ -764,13 +764,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>
@@ -978,32 +976,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>
<!-- JDK 1.6 build still use JAX-WS 2.1 because integrating Java endorsed
mechanism with Maven is bit of complex -->
<properties>
Modified: axis/axis2/java/core/trunk/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/scripting/pom.xml Fri Nov 16 11:51:23 2012
@@ -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/trunk/modules/testutils/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/testutils/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/testutils/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/testutils/pom.xml Fri Nov 16 11:51:23 2012
@@ -42,7 +42,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/trunk/modules/transport/http/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Fri Nov 16 11:51:23 2012
@@ -117,6 +117,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
Modified: axis/axis2/java/core/trunk/modules/transport/local/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/pom.xml Fri Nov 16 11:51:23 2012
@@ -102,6 +102,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/trunk/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml?rev=1410313&r1=1410312&r2=1410313&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml Fri Nov 16 11:51:23 2012
@@ -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>