Author: veithen
Date: Wed Jul 21 19:26:36 2010
New Revision: 966375
URL: http://svn.apache.org/viewvc?rev=966375&view=rev
Log:
Merged r960984 (Removed redundant distributionManagement entries. It is enough
to specify them in the root and parent POMs.) to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Wed Jul
21 19:26:36 2010
@@ -92,8 +92,8 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxbri</artifactId>
- <version>${pom.version}</version>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -178,21 +178,6 @@
<type>aar</type>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
- <url>
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
- </url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
<build>
<plugins>
<plugin>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -117,16 +117,4 @@
</plugin>
</plugins>
</reporting>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
</project>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -111,16 +111,4 @@
</plugin>
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
</project>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -162,18 +162,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<resources>
<resource>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -135,18 +135,6 @@
<artifactId>ant</artifactId>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<resources>
<resource>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -186,17 +186,4 @@
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
</project>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -80,18 +80,6 @@
<artifactId>maven-plugin-testing-harness</artifactId>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<reporting>
<plugins>
<plugin>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -118,16 +118,4 @@
</plugin>
</plugins>
</reporting>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
</project>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=966375&r1=966374&r2=966375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Wed Jul 21 19:26:36 2010
@@ -104,18 +104,6 @@
</plugin>
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
-
<url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<reporting>
<plugins>
<plugin>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 19:26:36 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
