Author: veithen
Date: Sat Mar 19 12:34:30 2011
New Revision: 1083171
URL: http://svn.apache.org/viewvc?rev=1083171&view=rev
Log:
Merged r1082702 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 12:34:30 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082726,1082738
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738
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=1083171&r1=1083170&r2=1083171&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 Sat Mar 19
12:34:30 2011
@@ -942,14 +942,6 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/parent</developerConnection>
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent</url>
</scm>
- <distributionManagement>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
<build>
<pluginManagement>
<plugins>
Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1083171&r1=1083170&r2=1083171&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Sat Mar 19 12:34:30 2011
@@ -539,14 +539,6 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6</developerConnection>
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6</url>
</scm>
- <distributionManagement>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
<properties>
<!-- 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
