You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2012/09/11 16:44:15 UTC
svn commit: r1383439 - in
/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin:
CompilerMojo.java TestCompilerMojo.java
Author: struberg
Date: Tue Sep 11 14:44:15 2012
New Revision: 1383439
URL: http://svn.apache.org/viewvc?rev=1383439&view=rev
Log:
MCOMPILER-21 fix the default inclusion/exclusion pattern for all occurences
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java?rev=1383439&r1=1383438&r2=1383439&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java Tue Sep 11 14:44:15 2012
@@ -146,17 +146,19 @@ public class CompilerMojo
{
SourceInclusionScanner scanner = null;
+ // it's not defined if we get the ending with or without the dot '.'
+ String defaultIncludePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
+
if ( includes.isEmpty() && excludes.isEmpty() )
{
- String includePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
- includes = Collections.singleton( includePattern );
+ includes = Collections.singleton( defaultIncludePattern );
scanner = new SimpleSourceInclusionScanner( includes, Collections.<String>emptySet() );
}
else
{
if ( includes.isEmpty() )
{
- includes.add( "**/*." + inputFileEnding );
+ includes.add( defaultIncludePattern );
}
scanner = new SimpleSourceInclusionScanner( includes, excludes );
}
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java?rev=1383439&r1=1383438&r2=1383439&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java Tue Sep 11 14:44:15 2012
@@ -191,17 +191,19 @@ public class TestCompilerMojo
{
SourceInclusionScanner scanner = null;
+ // it's not defined if we get the ending with or without the dot '.'
+ String defaultIncludePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
+
if ( testIncludes.isEmpty() && testExcludes.isEmpty() )
{
- String includePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
- testIncludes = Collections.singleton( includePattern );
+ testIncludes = Collections.singleton( defaultIncludePattern );
scanner = new SimpleSourceInclusionScanner( testIncludes, Collections.<String>emptySet() );
}
else
{
if ( testIncludes.isEmpty() )
{
- testIncludes.add( "**/*." + inputFileEnding );
+ testIncludes.add( defaultIncludePattern );
}
scanner = new SimpleSourceInclusionScanner( testIncludes, testExcludes );
}