You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/04/03 13:11:12 UTC
[1/2] maven-surefire git commit: [SUREFIRE] Java Collections
improvement
Repository: maven-surefire
Updated Branches:
refs/heads/s1 [created] 71160434f
[SUREFIRE] Java Collections improvement
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f07699c5
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f07699c5
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f07699c5
Branch: refs/heads/s1
Commit: f07699c543584c6cadbbe97dd43a557fa92d1e04
Parents: be9d923
Author: Tibor17 <ti...@lycos.com>
Authored: Fri Apr 3 13:05:36 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Fri Apr 3 13:05:36 2015 +0200
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f07699c5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 55239af..3f2dc0d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -1606,7 +1607,7 @@ public abstract class AbstractSurefireMojo
// Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
if ( actualExcludes == null || actualExcludes.isEmpty() )
{
- actualExcludes = Arrays.asList( "**/*$*" );
+ actualExcludes = Collections.singletonList( "**/*$*" );
}
}
return filterNulls( actualExcludes );
@@ -1618,7 +1619,7 @@ public abstract class AbstractSurefireMojo
List<String> includes = null;
if ( isSpecificTestSpecified() && !isMultipleExecutionBlocksDetected() )
{
- includes = Arrays.asList( getTest() );
+ includes = Collections.singletonList( getTest() );
}
else
{
@@ -1710,7 +1711,7 @@ public abstract class AbstractSurefireMojo
Plugin plugin = (Plugin) project.getBuild().getPluginsAsMap().get( key );
if ( plugin != null )
{
- List<PluginExecution> executions = plugin.getExecutions();
+ Collection<PluginExecution> executions = plugin.getExecutions();
return executions != null && executions.size() > 1;
}
}
[2/2] maven-surefire git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/maven-surefire into s1
Posted by ti...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-surefire into s1
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/71160434
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/71160434
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/71160434
Branch: refs/heads/s1
Commit: 71160434f675c8cb0c1596b8519a6698842bff47
Parents: f07699c 72dce82
Author: Tibor17 <ti...@lycos.com>
Authored: Fri Apr 3 13:07:53 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Fri Apr 3 13:07:53 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------