You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/10/24 18:02:33 UTC
[maven] 02/03: Remove Java code for parsing
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1c10e5aaded62ca80b5a1133282802fed2f97b4f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 24 19:47:19 2021 +0200
Remove Java code for parsing
---
.../main/java/org/apache/maven/cli/MavenCli.java | 84 +---------------------
1 file changed, 1 insertion(+), 83 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index ead1331..d4a06ee 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -21,7 +21,6 @@ package org.apache.maven.cli;
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.UnrecognizedOptionException;
import org.apache.maven.BuildAbort;
@@ -104,8 +103,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -148,8 +145,6 @@ public class MavenCli
private static final String EXTENSIONS_FILENAME = ".mvn/extensions.xml";
- private static final String MVN_MAVEN_CONFIG = ".mvn/maven.config";
-
public static final String STYLE_COLOR_PROPERTY = "style.color";
private ClassWorld classWorld;
@@ -386,47 +381,9 @@ public class MavenCli
cliManager = new CLIManager();
- List<String> args = new ArrayList<>();
- CommandLine mavenConfig = null;
try
{
- File configFile = new File( cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
-
- if ( configFile.isFile() )
- {
- for ( String arg : Files.readAllLines( configFile.toPath(), Charset.defaultCharset() ) )
- {
- if ( !arg.isEmpty() )
- {
- args.add( arg );
- }
- }
-
- mavenConfig = cliManager.parse( args.toArray( new String[0] ) );
- List<?> unrecongized = mavenConfig.getArgList();
- if ( !unrecongized.isEmpty() )
- {
- throw new ParseException( "Unrecognized maven.config entries: " + unrecongized );
- }
- }
- }
- catch ( ParseException e )
- {
- System.err.println( "Unable to parse maven.config: " + e.getMessage() );
- cliManager.displayHelp( System.out );
- throw e;
- }
-
- try
- {
- if ( mavenConfig == null )
- {
- cliRequest.commandLine = cliManager.parse( cliRequest.args );
- }
- else
- {
- cliRequest.commandLine = cliMerge( cliManager.parse( cliRequest.args ), mavenConfig );
- }
+ cliRequest.commandLine = cliManager.parse( cliRequest.args );
}
catch ( ParseException e )
{
@@ -458,45 +415,6 @@ public class MavenCli
}
}
- private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
- {
- CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
-
- // the args are easy, cli first then config file
- for ( String arg : mavenArgs.getArgs() )
- {
- commandLineBuilder.addArg( arg );
- }
- for ( String arg : mavenConfig.getArgs() )
- {
- commandLineBuilder.addArg( arg );
- }
-
- // now add all options, except for -D with cli first then config file
- List<Option> setPropertyOptions = new ArrayList<>();
- for ( Option opt : mavenArgs.getOptions() )
- {
- if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
- {
- setPropertyOptions.add( opt );
- }
- else
- {
- commandLineBuilder.addOption( opt );
- }
- }
- for ( Option opt : mavenConfig.getOptions() )
- {
- commandLineBuilder.addOption( opt );
- }
- // finally add the CLI system properties
- for ( Option opt : setPropertyOptions )
- {
- commandLineBuilder.addOption( opt );
- }
- return commandLineBuilder.build();
- }
-
/**
* configure logging
*/