maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject [maven-release] branch master updated: [MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings in the console output
Date Sun, 14 Jan 2018 12:07:57 GMT
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 69831b6  [MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings
in the console output
69831b6 is described below

commit 69831b60fedba2d94afd8d15a81e580acdef23e7
Author: rfscholte <rfscholte@apache.org>
AuthorDate: Sun Jan 14 13:07:50 2018 +0100

    [MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings in the console
output
---
 .../shared/release/exec/ForkedMavenExecutor.java   |  2 --
 .../shared/release/exec/InvokerMavenExecutor.java  | 34 ----------------------
 .../release/exec/ForkedMavenExecutorTest.java      | 15 ++++------
 3 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index 472d385..2db71e9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -118,8 +118,6 @@ public class ForkedMavenExecutor
                 cl.createArg().setValue( goal );
             }
 
-            cl.createArg().setValue( "--no-plugin-updates" );
-
             if ( !interactive )
             {
                 cl.createArg().setValue( "--batch-mode" );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
index c0f9761..df61c39 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -74,14 +74,6 @@ public class InvokerMavenExecutor
 
     private static final char ACTIVATE_PROFILES = 'P';
 
-    private static final String FORCE_PLUGIN_UPDATES = "cpu";
-
-    private static final String FORCE_PLUGIN_UPDATES2 = "up";
-
-    private static final String SUPPRESS_PLUGIN_UPDATES = "npu";
-
-    private static final String SUPPRESS_PLUGIN_REGISTRY = "npr";
-
     private static final char CHECKSUM_FAILURE_POLICY = 'C';
 
     private static final char CHECKSUM_WARNING_POLICY = 'c';
@@ -135,18 +127,6 @@ public class InvokerMavenExecutor
         OPTIONS.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription(
             "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES
) );
 
-        OPTIONS.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription(
-            "Force upToDate check for any relevant registered plugins" ).create( FORCE_PLUGIN_UPDATES
) );
-
-        OPTIONS.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription(
-            "Synonym for " + FORCE_PLUGIN_UPDATES ).create( FORCE_PLUGIN_UPDATES2 ) );
-
-        OPTIONS.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription(
-            "Suppress upToDate check for any relevant registered plugins" ).create( SUPPRESS_PLUGIN_UPDATES
) );
-
-        OPTIONS.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription(
-            "Don't use ~/.m2/plugin-registry.xml for plugin versions" ).create( SUPPRESS_PLUGIN_REGISTRY
) );
-
         OPTIONS.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription(
             "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY )
);
 
@@ -261,20 +241,6 @@ public class InvokerMavenExecutor
                 }
             }
 
-            if ( cli.hasOption( FORCE_PLUGIN_UPDATES ) || cli.hasOption( FORCE_PLUGIN_UPDATES2
) )
-            {
-                getLogger().warn( "Forcing plugin updates is not supported currently." );
-            }
-            else if ( cli.hasOption( SUPPRESS_PLUGIN_UPDATES ) )
-            {
-                req.setNonPluginUpdates( true );
-            }
-
-            if ( cli.hasOption( SUPPRESS_PLUGIN_REGISTRY ) )
-            {
-                getLogger().warn( "Explicit suppression of the plugin registry is not supported
currently." );
-            }
-
             if ( cli.hasOption( CHECKSUM_FAILURE_POLICY ) )
             {
                 req.setGlobalChecksumPolicy( InvocationRequest.CHECKSUM_POLICY_FAIL );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index 597f542..d6cc66d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -106,10 +106,9 @@ public class ForkedMavenExecutorTest
         verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
         verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull( String.class )
);
         verify( commandLineMock ).execute();
-        verify( commandLineMock, times( 4 ) ).createArg();
+        verify( commandLineMock, times( 3 ) ).createArg();
         verify( valueArgument ).setValue( "clean" );
         verify( valueArgument ).setValue( "integration-test" );
-        verify( valueArgument ).setValue( "--no-plugin-updates" );
         verify( valueArgument ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
 
@@ -149,12 +148,11 @@ public class ForkedMavenExecutorTest
         verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
         verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull( String.class )
);
         verify( commandLineMock ).execute();
-        verify( commandLineMock, times( 6 ) ).createArg();
+        verify( commandLineMock, times( 5 ) ).createArg();
         verify( argMock ).setValue( "clean" );
         verify( argMock ).setValue( "integration-test" );
         verify( argMock ).setValue( "-f" );
         verify( argMock ).setValue( "my-pom.xml" );
-        verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
 
@@ -195,10 +193,9 @@ public class ForkedMavenExecutorTest
         verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
         verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull( String.class )
);
         verify( commandLineMock ).execute();
-        verify( commandLineMock, times( 5 ) ).createArg();
+        verify( commandLineMock, times( 4 ) ).createArg();
         verify( argMock ).setValue( "clean" );
         verify( argMock ).setValue( "integration-test" );
-        verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( argMock ).setLine( "-DperformRelease=true -Dmaven.test.skip=true" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
@@ -251,10 +248,9 @@ public class ForkedMavenExecutorTest
         verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
         verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull( String.class )
);
         verify( commandLineMock ).execute();
-        verify( commandLineMock, times( 4 ) ).createArg();
+        verify( commandLineMock, times( 3 ) ).createArg();
         verify( argMock ).setValue( "clean" );
         verify( argMock ).setValue( "integration-test" );
-        verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
 
@@ -295,10 +291,9 @@ public class ForkedMavenExecutorTest
         verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
         verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull( String.class )
);
         verify( commandLineMock ).execute();
-        verify( commandLineMock, times( 4 ) ).createArg();
+        verify( commandLineMock, times( 3 ) ).createArg();
         verify( argMock ).setValue( "clean" );
         verify( argMock ).setValue( "integration-test" );
-        verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <commits@maven.apache.org>'].

Mime
View raw message