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 2010/12/28 15:28:42 UTC
svn commit: r1053355 - in /axis/axis2/java/sandesha/branches/1_4: ./
modules/core/ modules/interop/ modules/persistence/
modules/resource-bundle/ modules/samples/ modules/tests/ src/site/xdoc/
Author: veithen
Date: Tue Dec 28 14:28:41 2010
New Revision: 1053355
URL: http://svn.apache.org/viewvc?rev=1053355&view=rev
Log:
Bulk merged changes from trunk to the 1.4 branch. In particular, this should prevent the build from polluting the local Maven repository with incorrect POM files downloaded from the WSO2 Maven repository.
Added:
axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml.vm
- copied unchanged from r1053350, axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm
Removed:
axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml
Modified:
axis/axis2/java/sandesha/branches/1_4/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
axis/axis2/java/sandesha/branches/1_4/pom.xml
Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 14:28:41 2010
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050214-1050926
+/axis/axis2/java/sandesha/trunk:1050214-1053350
Modified: axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml Tue Dec 28 14:28:41 2010
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml Tue Dec 28 14:28:41 2010
@@ -132,19 +132,16 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml Tue Dec 28 14:28:41 2010
@@ -121,12 +121,10 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
Propchange: axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 28 14:28:41 2010
@@ -0,0 +1 @@
+target
Modified: axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml Tue Dec 28 14:28:41 2010
@@ -112,7 +112,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml Tue Dec 28 14:28:41 2010
@@ -40,8 +40,6 @@
<url>http://axis.apache.org/axis2/java/sandesha/</url>
<build>
- <sourceDirectory>src/test/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
<testResource>
<directory>test-resources</directory>
@@ -170,12 +168,10 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/pom.xml?rev=1053355&r1=1053354&r2=1053355&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/pom.xml Tue Dec 28 14:28:41 2010
@@ -264,17 +264,14 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
@@ -307,20 +304,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>${axis2.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
@@ -348,6 +342,70 @@
<artifactId>rampart-policy</artifactId>
<version>${rampart.version}</version>
</dependency>
+ <!-- This ensures that we always use artifacts from the expected Axiom and Axis2 versions,
+ even for transitive dependencies of Rampart -->
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${axis2.version}</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <classifier>impl</classifier>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -374,6 +432,11 @@
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.2</junit.version>
<log4j.version>1.2.15</log4j.version>
+
+ <!-- This variable is used in some Xdocs and is substituted using Velocity. Note that
+ we can't use the project.version variable directly because of the dot. See
+ http://maven.apache.org/plugins/maven-site-plugin/examples/creating-content.html -->
+ <sandesha2_version>${project.version}</sandesha2_version>
</properties>
<distributionManagement>