Author: veithen
Date: Thu Jun 9 18:38:05 2016
New Revision: 1747575
URL: http://svn.apache.org/viewvc?rev=1747575&view=rev
Log:
AXIS2-5782: Strip whitespace from list of modules and services in
axis2-repo-maven-plugin.
Added:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
(with props)
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1747575&r1=1747574&r2=1747575&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Thu Jun 9 18:38:05
2016
@@ -461,7 +461,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/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1747575&r1=1747574&r2=1747575&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml Thu
Jun 9 18:38:05 2016
@@ -50,6 +50,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>
@@ -86,6 +107,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>
Added:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml?rev=1747575&view=auto
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
(added)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
Thu Jun 9 18:38:05 2016
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>@pom.groupId@</groupId>
+ <artifactId>axis2</artifactId>
+ <version>@pom.version@</version>
+ </parent>
+ <artifactId>test</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>@pom.groupId@</groupId>
+ <artifactId>addressing</artifactId>
+ <version>@pom.version@</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>@pom.groupId@</groupId>
+ <artifactId>ping</artifactId>
+ <version>@pom.version@</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>@pom.groupId@</groupId>
+ <artifactId>mex</artifactId>
+ <version>@pom.version@</version>
+ <type>mar</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@pom.groupId@</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>create-repository</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <-- Test with additional whitespace -->
+ addressing,
+ ping
+ </modules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/it/AXIS2-5782/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
axis/axis2/java/core/trunk/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/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1747575&r1=1747574&r2=1747575&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Thu Jun 9 18:38:05 2016
@@ -282,7 +282,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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1747575&r1=1747574&r2=1747575&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Thu Jun 9 18:38:05 2016
@@ -1217,6 +1217,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. -->
