You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/30 07:51:14 UTC
svn commit: r1635406 - in /maven/shared/trunk/maven-invoker: ./
src/main/java/org/apache/maven/shared/invoker/
Author: hboutemy
Date: Thu Oct 30 06:51:13 2014
New Revision: 1635406
URL: http://svn.apache.org/r1635406
Log:
upgraded parent pom
Modified:
maven/shared/trunk/maven-invoker/pom.xml
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java
Modified: maven/shared/trunk/maven-invoker/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Thu Oct 30 06:51:13 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java Thu Oct 30 06:51:13 2014
@@ -393,7 +393,7 @@ public class DefaultInvocationRequest
public Map<String, String> getShellEnvironments()
{
- return shellEnvironments == null ? Collections.<String, String>emptyMap(): shellEnvironments;
+ return shellEnvironments == null ? Collections.<String, String>emptyMap() : shellEnvironments;
}
public String getMavenOpts()
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java Thu Oct 30 06:51:13 2014
@@ -70,19 +70,21 @@ public interface InvocationRequest
* Gets whether Maven should search subdirectories to build a dynamic reactor
* @return <code>true</code> if we should search subdirectories, <code>false</code> otherwise
*/
- public boolean isActivatedReactor();
+ boolean isActivatedReactor();
/**
* Gets the list of subdirectory patterns to search
* @return list of subdirectory patterns to search, or <code>null</code> in which case defaults should be used
*/
- public String[] getActivatedReactorIncludes();
+ String[] getActivatedReactorIncludes();
/**
* Gets the list of subdirectory patterns to exclude from search
- * @return list of subdirectory patterns to exclude search, or <code>null</code> in which case nothing should be excluded
+ *
+ * @return list of subdirectory patterns to exclude search, or <code>null</code> in which case nothing should be
+ * excluded
*/
- public String[] getActivatedReactorExcludes();
+ String[] getActivatedReactorExcludes();
/**
* A list of specified reactor projects to build instead of all projects.
@@ -91,7 +93,7 @@ public interface InvocationRequest
* @return the list of projects to add to reactor build, otherwise {@code null}
* @since 2.1
*/
- public List<String> getProjects();
+ List<String> getProjects();
/**
* Get the value of the {@code also-make} argument.
@@ -265,7 +267,8 @@ public interface InvocationRequest
/**
* Gets the path to the custom toolchains file
*
- * @return The path to the custom toolchains file or <code>null</code> to load the toolchains from the default location
+ * @return The path to the custom toolchains file or <code>null</code> to load the toolchains from the default
+ * location
* @since 2.1
*/
File getToolchainsFile();
@@ -320,17 +323,17 @@ public interface InvocationRequest
/**
* The failure mode "fail-fast" where the build is stopped by the first failure.
*/
- static final String REACTOR_FAIL_FAST = "fail-fast";
+ String REACTOR_FAIL_FAST = "fail-fast";
/**
* The failure mode "fail-at-end" where the build is only failed at its very end if necessary.
*/
- static final String REACTOR_FAIL_AT_END = "fail-at-end";
+ String REACTOR_FAIL_AT_END = "fail-at-end";
/**
* The failure mode "fail-never" in which Maven will always exit with code 0 regardless of build failures.
*/
- static final String REACTOR_FAIL_NEVER = "fail-never";
+ String REACTOR_FAIL_NEVER = "fail-never";
// ----------------------------------------------------------------------
// Artifact repository policies
@@ -339,12 +342,12 @@ public interface InvocationRequest
/**
* The strict checksum policy which fails the build if a corrupt artifact is detected.
*/
- static final String CHECKSUM_POLICY_FAIL = "fail";
+ String CHECKSUM_POLICY_FAIL = "fail";
/**
* The lax checksum policy which only outputs a warning if a corrupt artifact is detected.
*/
- static final String CHECKSUM_POLICY_WARN = "warn";
+ String CHECKSUM_POLICY_WARN = "warn";
// ----------------------------------------------------------------------
//
@@ -400,8 +403,8 @@ public interface InvocationRequest
InvocationRequest setUpdateSnapshots( boolean updateSnapshots );
/**
- * Sets the failure mode of the Maven invocation.
- * Equivalent of {@code -ff} and {@code --fail-fast}, {@code -fae} and {@code --fail-at-end}, {@code -fn} and {@code --fail-never}
+ * Sets the failure mode of the Maven invocation. Equivalent of {@code -ff} and {@code --fail-fast}, {@code -fae}
+ * and {@code --fail-at-end}, {@code -fn} and {@code --fail-never}
*
* @param failureBehavior The failure mode, must be one of {@link #REACTOR_FAIL_FAST}, {@link #REACTOR_FAIL_AT_END}
* and {@link #REACTOR_FAIL_NEVER}.
@@ -648,9 +651,8 @@ public interface InvocationRequest
*/
InvocationRequest setAlsoMake( boolean alsoMake );
- /**
- * Enable the 'also make dependents' mode.
- * Equivalent of {@code -amd} or {@code --also-make-dependents}
+ /**
+ * Enable the 'also make dependents' mode. Equivalent of {@code -amd} or {@code --also-make-dependents}
*
* @param alsoMakeDependents enable 'also make' mode
* @return This invocation request.
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/Invoker.java Thu Oct 30 06:51:13 2014
@@ -39,6 +39,7 @@ public interface Invoker
* @deprecated Query this property by yourself, this has nothing to do with invoking Maven and as such does not
* belong into this API!
*/
+ @SuppressWarnings( "checkstyle:constantname" )
String userHome = System.getProperty( "user.home" );
/**
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvokerLogger.java Thu Oct 30 06:51:13 2014
@@ -32,27 +32,27 @@ public interface InvokerLogger
/**
* The threshold for debug output.
*/
- public static final int DEBUG = 4;
+ int DEBUG = 4;
/**
* The threshold for info output.
*/
- public static final int INFO = 3;
+ int INFO = 3;
/**
* The threshold for warn output.
*/
- public static final int WARN = 2;
+ int WARN = 2;
/**
* The threshold for error output.
*/
- public static final int ERROR = 1;
+ int ERROR = 1;
/**
* The threshold for fatal error output.
*/
- public static final int FATAL = 0;
+ int FATAL = 0;
/**
* Logs the specified debug message.
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Thu Oct 30 06:51:13 2014
@@ -443,7 +443,7 @@ public class MavenCommandLineBuilder
}
}
- if( StringUtils.isNotEmpty( request.getResumeFrom() ) )
+ if ( StringUtils.isNotEmpty( request.getResumeFrom() ) )
{
cli.createArg().setValue( "-rf" );
cli.createArg().setValue( request.getResumeFrom() );
@@ -517,7 +517,7 @@ public class MavenCommandLineBuilder
{
cli.createArg().setValue( "-V" );
}
- }
+ }
protected void setThreads( InvocationRequest request, Commandline cli )
{
@@ -567,7 +567,7 @@ public class MavenCommandLineBuilder
if ( mavenExecutable == null || !mavenExecutable.isAbsolute() )
{
String executable;
- if( mavenExecutable != null )
+ if ( mavenExecutable != null )
{
executable = mavenExecutable.getPath();
}
Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java?rev=1635406&r1=1635405&r2=1635406&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/PrintStreamLogger.java Thu Oct 30 06:51:13 2014
@@ -93,30 +93,26 @@ public class PrintStreamLogger
switch ( level )
{
case ( DEBUG ):
- {
buffer.append( "[DEBUG]" );
break;
- }
+
case ( INFO ):
- {
buffer.append( "[INFO]" );
break;
- }
+
case ( WARN ):
- {
buffer.append( "[WARN]" );
break;
- }
+
case ( ERROR ):
- {
buffer.append( "[ERROR]" );
break;
- }
+
case ( FATAL ):
- {
buffer.append( "[FATAL]" );
break;
- }
+
+ default:
}
buffer.append( ' ' );