Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6888] Remove deprecated command line options 

This closes #418
This commit is contained in:
Karl Heinz Marbaise 2020-04-10 14:21:09 +02:00 committed by Michael Osipov
parent 3709e2ea2c
commit 538de4d192
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
View File

@ -149,12 +149,6 @@ public class CLIManager
options.addOption( Option.builder( LEGACY_LOCAL_REPOSITORY ).longOpt( "legacy-local-repository" ).desc( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).build() ); options.addOption( Option.builder( LEGACY_LOCAL_REPOSITORY ).longOpt( "legacy-local-repository" ).desc( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).build() );
options.addOption( Option.builder( BUILDER ).longOpt( "builder" ).hasArg().desc( "The id of the build strategy to use" ).build() ); options.addOption( Option.builder( BUILDER ).longOpt( "builder" ).hasArg().desc( "The id of the build strategy to use" ).build() );
options.addOption( Option.builder( NO_TRANSFER_PROGRESS ).longOpt( "no-transfer-progress" ).desc( "Do not display transfer progress when downloading or uploading" ).build() ); options.addOption( Option.builder( NO_TRANSFER_PROGRESS ).longOpt( "no-transfer-progress" ).desc( "Do not display transfer progress when downloading or uploading" ).build() );
// Adding this back in for compatibility with the verifier that hard codes this option.
options.addOption( Option.builder( "npr" ).longOpt( "no-plugin-registry" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
options.addOption( Option.builder( "cpu" ).longOpt( "check-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
options.addOption( Option.builder( "up" ).longOpt( "update-plugins" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
options.addOption( Option.builder( "npu" ).longOpt( "no-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
} }
public CommandLine parse( String[] args ) public CommandLine parse( String[] args )

15
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -103,7 +103,6 @@ import java.io.InputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -149,8 +148,6 @@ public class MavenCli
public static final String STYLE_COLOR_PROPERTY = "style.color"; public static final String STYLE_COLOR_PROPERTY = "style.color";
private static final String[] DEPRECATED_OPTIONS = { "up", "npu", "cpu", "npr" };
private ClassWorld classWorld; private ClassWorld classWorld;
private LoggerManager plexusLoggerManager; private LoggerManager plexusLoggerManager;
@ -1351,8 +1348,6 @@ public class MavenCli
request.setShowErrors( cliRequest.showErrors ); // default: false request.setShowErrors( cliRequest.showErrors ); // default: false
File baseDirectory = new File( workingDirectory, "" ).getAbsoluteFile(); File baseDirectory = new File( workingDirectory, "" ).getAbsoluteFile();
handleDeprecatedOptions( commandLine );
disableOnPresentOption( commandLine, CLIManager.BATCH_MODE, request::setInteractiveMode ); disableOnPresentOption( commandLine, CLIManager.BATCH_MODE, request::setInteractiveMode );
enableOnPresentOption( commandLine, CLIManager.SUPRESS_SNAPSHOT_UPDATES, request::setNoSnapshotUpdates ); enableOnPresentOption( commandLine, CLIManager.SUPRESS_SNAPSHOT_UPDATES, request::setNoSnapshotUpdates );
request.setGoals( commandLine.getArgList() ); request.setGoals( commandLine.getArgList() );
@ -1562,16 +1557,6 @@ public class MavenCli
} }
} }
private void handleDeprecatedOptions( final CommandLine commandLine )
{
Arrays.stream( DEPRECATED_OPTIONS )
.filter( commandLine::hasOption )
.forEach( deprecatedOption -> slf4jLogger.warn(
"Command line option -{} is deprecated and will be removed in future Maven versions.",
deprecatedOption )
);
}
private String determineReactorFailureBehaviour( final CommandLine commandLine ) private String determineReactorFailureBehaviour( final CommandLine commandLine )
{ {
if ( commandLine.hasOption( CLIManager.FAIL_FAST ) ) if ( commandLine.hasOption( CLIManager.FAIL_FAST ) )