Author: veithen
Date: Thu Jun 9 21:01:59 2016
New Revision: 1747599
URL: http://svn.apache.org/viewvc?rev=1747599&view=rev
Log:
AXIS2-5782: Merge r1747575 and r1747578 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/
- copied from r1747575,
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/1_7/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 9 21:01:59 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747503
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747503,1747575,1747578
Modified: axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml?rev=1747599&r1=1747598&r2=1747599&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml Thu Jun 9
21:01:59 2016
@@ -445,7 +445,6 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>build-maven-samples</id>
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1747599&r1=1747598&r2=1747599&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
Thu Jun 9 21:01:59 2016
@@ -46,6 +46,27 @@
<artifactId>maven-common-artifact-filters</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ping</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mex</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/tools/maven-plugins/axis2-repo-maven-plugin/</url>
<scm>
@@ -82,6 +103,21 @@
<goalPrefix>axis2</goalPrefix>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml?rev=1747599&r1=1747575&r2=1747599&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
Thu Jun 9 21:01:59 2016
@@ -58,7 +58,7 @@
</goals>
<configuration>
<modules>
- <-- Test with additional whitespace -->
+ <!-- Test with additional whitespace -->
addressing,
ping
</modules>
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1747599&r1=1747598&r2=1747599&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Thu Jun 9 21:01:59 2016
@@ -219,7 +219,7 @@ public abstract class AbstractCreateRepo
private void selectArtifacts(Set<Artifact> artifacts, String list, String
type) throws MojoFailureException {
if (list != null) {
- Set<String> set = new
HashSet<String>(Arrays.asList(StringUtils.split(list, ",")));
+ Set<String> set = new
HashSet<String>(Arrays.asList(StringUtils.stripAll(StringUtils.split(list,
","))));
for (Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); )
{
Artifact artifact = it.next();
if (artifact.getType().equals(type) &&
!set.remove(artifact.getArtifactId())) {
Modified: axis/axis2/java/core/branches/1_7/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1747599&r1=1747598&r2=1747599&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Thu Jun 9 21:01:59 2016
@@ -1196,6 +1196,10 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.16.v20140903</version>
</plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>2.0.0</version>
+ </plugin>
<!-- Use 1.5.2 versions of the aar and mar plugins in order to
avoid
the chicken and egg problem. -->
