Author: hboutemy
Date: Fri Nov 28 21:37:52 2014
New Revision: 1642366
URL: http://svn.apache.org/r1642366
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-verifier-plugin/pom.xml
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResult.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResultPrinter.java
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=1642366&r1=1642365&r2=1642366&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Fri Nov 28 21:37:52 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>27</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -58,7 +58,6 @@ under the License.
<properties>
<mavenVersion>2.2.1</mavenVersion>
- <mavenPluginVersion>3.2</mavenPluginVersion>
</properties>
<dependencies>
@@ -72,7 +71,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginVersion}</version>
<scope>provided</scope>
</dependency>
@@ -90,34 +88,8 @@ under the License.
</dependencies>
<build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
@@ -165,15 +137,6 @@ under the License.
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>verify</goal>
</goals>
Modified:
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java?rev=1642366&r1=1642365&r2=1642366&view=diff
==============================================================================
---
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
(original)
+++
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
Fri Nov 28 21:37:52 2014
@@ -21,6 +21,9 @@ package org.apache.maven.plugin.verifier
import org.apache.maven.plugin.logging.Log;
+/**
+ *
+ */
public class ConsoleVerificationResultPrinter
implements VerificationResultPrinter
{
@@ -40,28 +43,31 @@ public class ConsoleVerificationResultPr
private void printExistenceFailures( VerificationResult results )
{
- for (Object o : results.getExistenceFailures()) {
+ for ( Object o : results.getExistenceFailures() )
+ {
org.apache.maven.plugin.verifier.model.File file =
(org.apache.maven.plugin.verifier.model.File) o;
- printMessage("File not found [" + file.getLocation() + "]");
+ printMessage( "File not found [" + file.getLocation() + "]" );
}
}
private void printNonExistenceFailures( VerificationResult results )
{
- for (Object o : results.getNonExistenceFailures()) {
+ for ( Object o : results.getNonExistenceFailures() )
+ {
org.apache.maven.plugin.verifier.model.File file =
(org.apache.maven.plugin.verifier.model.File) o;
- printMessage("File should not exist [" + file.getLocation() + "]");
+ printMessage( "File should not exist [" + file.getLocation() + "]"
);
}
}
private void printContentFailures( VerificationResult results )
{
- for (Object o : results.getContentFailures()) {
+ for ( Object o : results.getContentFailures() )
+ {
org.apache.maven.plugin.verifier.model.File file =
(org.apache.maven.plugin.verifier.model.File) o;
- printMessage("File [" + file.getLocation() + "] does not match
regexp [" + file.getContains() + "]");
+ printMessage( "File [" + file.getLocation() + "] does not match
regexp [" + file.getContains() + "]" );
}
}
Modified:
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResult.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResult.java?rev=1642366&r1=1642365&r2=1642366&view=diff
==============================================================================
---
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResult.java
(original)
+++
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResult.java
Fri Nov 28 21:37:52 2014
@@ -24,6 +24,9 @@ import org.apache.maven.plugin.verifier.
import java.util.ArrayList;
import java.util.List;
+/**
+ *
+ */
public class VerificationResult
{
private List existenceFailures = new ArrayList();
Modified:
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResultPrinter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResultPrinter.java?rev=1642366&r1=1642365&r2=1642366&view=diff
==============================================================================
---
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResultPrinter.java
(original)
+++
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerificationResultPrinter.java
Fri Nov 28 21:37:52 2014
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.verifier
* under the License.
*/
+/**
+ *
+ */
public interface VerificationResultPrinter
{
void print( VerificationResult result );
Modified:
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java?rev=1642366&r1=1642365&r2=1642366&view=diff
==============================================================================
---
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
(original)
+++
maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
Fri Nov 28 21:37:52 2014
@@ -33,12 +33,12 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
-import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Verifies the existence or non-existence of files/directories and optionally
checks file content against a regular expression.
+ * Verifies the existence or non-existence of files/directories and optionally
checks file content against a regular
+ * expression.
*
* @author <a href="[email protected]">Vincent Massol</a>
* @version $Id$
@@ -109,14 +109,18 @@ public class VerifierMojo
VerificationsXpp3Reader xppReader = new VerificationsXpp3Reader();
Verifications verifications = xppReader.read( reader );
- for (org.apache.maven.plugin.verifier.model.File file :
verifications.getFiles()) {
+ for ( org.apache.maven.plugin.verifier.model.File file :
verifications.getFiles() )
+ {
// Transform the file to check into an absolute path prefixing
the basedir if
// the location is relative
- if (file.getLocation() != null) {
- file.setLocation(getAbsoluteFileToCheck(new
File(file.getLocation())).getPath());
- verifyFile(file, results);
- } else {
- throw new MojoExecutionException("Missing <location>
element");
+ if ( file.getLocation() != null )
+ {
+ file.setLocation( getAbsoluteFileToCheck( new File(
file.getLocation() ) ).getPath() );
+ verifyFile( file, results );
+ }
+ else
+ {
+ throw new MojoExecutionException( "Missing <location>
element" );
}
}
}
