svn commit: r1635396 - in /maven/shared/trunk/maven-verifier: pom.xml src/main/java/org/apache/maven/it/ForkedLauncher.java src/main/java/org/apache/maven/it/Verifier.java src/main/java/org/apache/maven/it/util/ResourceExtractor.java

[hb...@apache.org]

Author: hboutemy
Date: Thu Oct 30 06:01:38 2014
New Revision: 1635396

URL: http://svn.apache.org/r1635396
Log:
upgraded parent pom

Modified:
    maven/shared/trunk/maven-verifier/pom.xml
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java

Modified: maven/shared/trunk/maven-verifier/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1635396&r1=1635395&r2=1635396&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/pom.xml (original)
+++ maven/shared/trunk/maven-verifier/pom.xml Thu Oct 30 06:01:38 2014
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>20</version>
+    <version>21</version>
     <relativePath>../maven-shared-components</relativePath>
   </parent>
 

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java?rev=1635396&r1=1635395&r2=1635396&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java Thu Oct 30 06:01:38 2014
@@ -53,7 +53,7 @@ class ForkedLauncher
 
     public ForkedLauncher( String mavenHome )
     {
-        this( mavenHome, Collections.<String, String> emptyMap(), false );
+        this( mavenHome, Collections.<String, String>emptyMap(), false );
     }
 
     public ForkedLauncher( String mavenHome, Map<String, String> envVars, boolean debugJvm )

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1635396&r1=1635395&r2=1635396&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Thu Oct 30 06:01:38 2014
@@ -75,7 +75,7 @@ public class Verifier
 {
     private static final String LOG_FILENAME = "log.txt";
 
-    public String localRepo;
+    private String localRepo;
 
     private final String basedir;
 
@@ -438,7 +438,7 @@ public class Verifier
         return lines;
     }
 
-    private final static String MARKER = "${artifact:";
+    private static final String MARKER = "${artifact:";
 
     private List<String> replaceArtifacts( String line, boolean hasCommand )
     {
@@ -931,9 +931,10 @@ public class Verifier
     /**
      * Filters a text file by replacing some user-defined tokens.
      *
-     * @param srcPath          The path to the input file, relative to the base directory, must not be <code>null</code>.
-     * @param dstPath          The path to the output file, relative to the base directory and possibly equal to the input file,
-     *                         must not be <code>null</code>.
+     * @param srcPath          The path to the input file, relative to the base directory, must not be
+     *                         <code>null</code>.
+     * @param dstPath          The path to the output file, relative to the base directory and possibly equal to the
+     *                         input file, must not be <code>null</code>.
      * @param fileEncoding     The file encoding to use, may be <code>null</code> or empty to use the platform's default
      *                         encoding.
      * @param filterProperties The mapping from tokens to replacement values, must not be <code>null</code>.
@@ -1452,7 +1453,7 @@ public class Verifier
     {
         try
         {
-            return getMavenLauncher( Collections.<String, String> emptyMap() ).getMavenVersion();
+            return getMavenLauncher( Collections.<String, String>emptyMap() ).getMavenVersion();
         }
         catch ( LauncherException e )
         {

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java?rev=1635396&r1=1635395&r2=1635396&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java Thu Oct 30 06:01:38 2014
@@ -32,7 +32,9 @@ import org.apache.maven.shared.utils.io.
 import org.apache.maven.shared.utils.io.IOUtil;
 
 
-/* @todo this can be replaced with plexus-archiver */
+/**
+ *  @todo this can be replaced with plexus-archiver
+ */
 public class ResourceExtractor
 {