Author: veithen
Date: Sat Jul 17 13:49:42 2010
New Revision: 965078
URL: http://svn.apache.org/viewvc?rev=965078&view=rev
Log:
Merged r905980, r960978, r961012 and r965074 in order keep the root and parent
POM up to date on 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/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/parent/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)
axis/axis2/java/core/branches/java/1_5/pom.xml
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780
+/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
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 Sat Jul 17 13:49:42 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,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
+/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
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,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 Sat Jul 17 13:49:42 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,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
+/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
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780
+/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
+/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml?rev=965078&r1=965077&r2=965078&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml Sat Jul 17
13:49:42 2010
@@ -1160,7 +1160,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -1192,9 +1191,9 @@
</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>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
@@ -1286,6 +1285,12 @@
<artifactId>gmaven-plugin</artifactId>
<version>1.2</version>
</plugin>
+ <plugin>
+ <!-- Need 1.1 to avoid MGPG-17 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,834175,904780
+/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
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,834175,904780
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:49:42 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,801630,803725,834058,834175,904780
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
+/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,801630,803725,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 Sat Jul 17 13:49:42 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,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
+/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
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,801630,803725,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 Sat Jul 17 13:49:42 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,960995,963081,963147,965032,965036,965056,965068
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
+/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
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/pom.xml?rev=965078&r1=965077&r2=965078&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/pom.xml Sat Jul 17 13:49:42 2010
@@ -97,82 +97,6 @@
<module>modules/distribution</module>
</modules>
</profile>
- <profile>
- <id>java15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>axis2-jar</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/lib"/>
- <jar
destfile="target/lib/axis2-${pom.version}.jar">
- <fileset
dir="modules/java2wsdl/target/classes"/>
- <fileset
dir="modules/kernel/target/classes"/>
- <fileset
dir="modules/addressing/target/classes"/>
- <fileset
dir="modules/codegen/target/classes"/>
- <fileset
dir="modules/adb/target/classes"/>
- <fileset
dir="modules/adb-codegen/target/classes"/>
- <fileset
dir="modules/xmlbeans/target/classes"/>
- <fileset
dir="modules/clustering/target/classes"/>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>java16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>axis2-jar</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/lib"/>
- <jar
destfile="target/lib/axis2-${pom.version}.jar">
- <fileset
dir="modules/java2wsdl/target/classes"/>
- <fileset
dir="modules/kernel/target/classes"/>
- <fileset
dir="modules/addressing/target/classes"/>
- <fileset
dir="modules/codegen/target/classes"/>
- <fileset
dir="modules/adb/target/classes"/>
- <fileset
dir="modules/adb-codegen/target/classes"/>
- <fileset
dir="modules/xmlbeans/target/classes"/>
- <fileset
dir="modules/clustering/target/classes"/>
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<ciManagement>
<system>continuum</system>
@@ -203,13 +127,23 @@
</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>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Need 1.1 to avoid MGPG-17 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -218,6 +152,34 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>axis2-jar</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/lib"/>
+ <jar
destfile="target/lib/axis2-${pom.version}.jar">
+ <fileset
dir="modules/java2wsdl/target/classes"/>
+ <fileset
dir="modules/kernel/target/classes"/>
+ <fileset
dir="modules/addressing/target/classes"/>
+ <fileset
dir="modules/codegen/target/classes"/>
+ <fileset dir="modules/adb/target/classes"/>
+ <fileset
dir="modules/adb-codegen/target/classes"/>
+ <fileset
dir="modules/xmlbeans/target/classes"/>
+ <fileset
dir="modules/clustering/target/classes"/>
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
