Author: hboutemy
Date: Sun Nov 16 22:57:02 2014
New Revision: 1640048
URL: http://svn.apache.org/r1640048
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sun Nov 16 22:57:02 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -245,13 +245,6 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -294,17 +287,6 @@ under the License.
</executions>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
Sun Nov 16 22:57:02 2014
@@ -729,7 +729,7 @@ public abstract class AbstractCheckstyle
{
List<File> sourceDirs = null;
// if sourceDirectory is explicitly set, use it
- if( sourceDirectory != null )
+ if ( sourceDirectory != null )
{
sourceDirs = Collections.singletonList( sourceDirectory );
}
@@ -749,7 +749,7 @@ public abstract class AbstractCheckstyle
{
List<File> testSourceDirs = null;
// if testSourceDirectory is explicitly set, use it
- if( testSourceDirectory != null )
+ if ( testSourceDirectory != null )
{
testSourceDirs = Collections.singletonList( testSourceDirectory );
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
Sun Nov 16 22:57:02 2014
@@ -71,8 +71,8 @@ public class CheckstyleAggregateReport
.setResourceIncludes( resourceIncludes )
.setResourceExcludes( resourceExcludes )
.setIncludeTestSourceDirectory( includeTestSourceDirectory
).setListener( getListener() )
- .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() ).setResources( resources )
- .setTestResources( testResources )
+ .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() )
+ .setResources( resources ).setTestResources( testResources )
.setStringOutputStream( stringOutputStream
).setSuppressionsLocation( suppressionsLocation )
.setTestSourceDirectories( getTestSourceDirectories()
).setConfigLocation( configLocation )
.setPropertyExpansion( propertyExpansion ).setHeaderLocation(
headerLocation )
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Sun Nov 16 22:57:02 2014
@@ -171,7 +171,8 @@ public class CheckstyleReport
.setIncludeResources( includeResources )
.setIncludeTestResources( includeTestResources )
.setIncludeTestSourceDirectory( includeTestSourceDirectory
).setListener( getListener() )
- .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() ).setResources( resources )
+ .setLog( getLog() ).setProject( project ).setSourceDirectories(
getSourceDirectories() )
+ .setResources( resources )
.setStringOutputStream( stringOutputStream
).setSuppressionsLocation( suppressionsLocation )
.setTestSourceDirectories( getTestSourceDirectories()
).setConfigLocation( configLocation )
.setPropertyExpansion( propertyExpansion ).setHeaderLocation(
headerLocation )
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
Sun Nov 16 22:57:02 2014
@@ -818,7 +818,7 @@ public class CheckstyleViolationCheckMoj
{
List<File> sourceDirs = null;
// if sourceDirectory is explicitly set, use it
- if( sourceDirectory != null )
+ if ( sourceDirectory != null )
{
sourceDirs = Collections.singletonList( sourceDirectory );
}
@@ -838,7 +838,7 @@ public class CheckstyleViolationCheckMoj
{
List<File> testSourceDirs = null;
// if testSourceDirectory is explicitly set, use it
- if( testSourceDirectory != null )
+ if ( testSourceDirectory != null )
{
testSourceDirs = Collections.singletonList( testSourceDirectory );
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java
Sun Nov 16 22:57:02 2014
@@ -146,7 +146,7 @@ public final class RuleUtil
/**
* Audit event source name matcher.
*/
- public static interface Matcher
+ public interface Matcher
{
/**
* Does the event source name match?
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java
Sun Nov 16 22:57:02 2014
@@ -236,7 +236,7 @@ public class CheckstyleExecutorRequest
@Deprecated
public File getTestSourceDirectory()
{
- if( testSourceDirectories == null || testSourceDirectories.size() == 0
)
+ if ( testSourceDirectories == null || testSourceDirectories.size() ==
0 )
{
return null;
}
@@ -277,7 +277,7 @@ public class CheckstyleExecutorRequest
@Deprecated
public File getSourceDirectory()
{
- if( sourceDirectories == null || sourceDirectories.size() == 0 )
+ if ( sourceDirectories == null || sourceDirectories.size() == 0 )
{
return null;
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java?rev=1640048&r1=1640047&r2=1640048&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java
Sun Nov 16 22:57:02 2014
@@ -131,7 +131,8 @@ public class DefaultCheckstyleExecutor
// aggregator
Map<MavenProject, Collection<File>> sourceDirectoriesByProject = new
HashMap<MavenProject, Collection<File>>();
- Map<MavenProject, Collection<File>> testSourceDirectoriesByProject =
new HashMap<MavenProject, Collection<File>>();
+ Map<MavenProject, Collection<File>> testSourceDirectoriesByProject =
+ new HashMap<MavenProject, Collection<File>>();
if ( request.isAggregate() )
{
@@ -308,7 +309,7 @@ public class DefaultCheckstyleExecutor
{
for ( File testSourceDirectory : testSourceDirectories )
{
- if( testSourceDirectory.isDirectory() )
+ if ( testSourceDirectory.isDirectory() )
{
sinkListener.addSourceDirectory( testSourceDirectory );
}
@@ -625,8 +626,9 @@ public class DefaultCheckstyleExecutor
return new ArrayList<File>( files );
}
- private void addFilesToProcess( CheckstyleExecutorRequest request,
Collection<File> sourceDirectories, List<Resource> resources,
- List<Resource> testResources,
Collection<File> files, Collection<File> testSourceDirectories )
+ private void addFilesToProcess( CheckstyleExecutorRequest request,
Collection<File> sourceDirectories,
+ List<Resource> resources, List<Resource>
testResources, Collection<File> files,
+ Collection<File> testSourceDirectories )
throws IOException
{
if ( sourceDirectories != null )
@@ -651,7 +653,7 @@ public class DefaultCheckstyleExecutor
if ( testSourceDirectory.isDirectory() )
{
final List<File> testSourceFiles =
- FileUtils.getFiles( testSourceDirectory,
request.getIncludes(), request.getExcludes() );
+ FileUtils.getFiles( testSourceDirectory,
request.getIncludes(), request.getExcludes() );
files.addAll( testSourceFiles );
getLogger().debug( "Added " + testSourceFiles.size() + "
test source files found in '"
@@ -707,7 +709,7 @@ public class DefaultCheckstyleExecutor
}
String resourceExcludes = StringUtils.join(
resource.getExcludes().iterator(), "," );
- if( StringUtils.isEmpty( excludes ) )
+ if ( StringUtils.isEmpty( excludes ) )
{
excludes = resourceExcludes;
}
