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 2013/02/09 15:43:12 UTC
git commit: [MNG-5181] renamed *simple* local repository *manager* to
*legacy* local repository
Updated Branches:
refs/heads/master ada6bd1e6 -> 720bef7df
[MNG-5181] renamed *simple* local repository *manager* to *legacy* local
repository
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/720bef7d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/720bef7d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/720bef7d
Branch: refs/heads/master
Commit: 720bef7df7bb2c7f7e19930d66b00518b50a3ed8
Parents: ada6bd1
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Feb 9 15:43:00 2013 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 9 15:43:00 2013 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/DefaultMaven.java | 6 +++---
.../execution/DefaultMavenExecutionRequest.java | 4 ++--
.../maven/execution/MavenExecutionRequest.java | 4 ++--
.../main/java/org/apache/maven/cli/CLIManager.java | 7 ++-----
.../main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
5 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/720bef7d/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 9dfa7c8..98dc5c1 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -358,9 +358,9 @@ public class DefaultMaven
LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() );
- if ( request.isUseSimpleLocalRepositoryManager() )
+ if ( request.isUseLegacyLocalRepository() )
{
- logger.warn( "Disabling enhanced local repository manager: this is stronlgy discouraged to ensure build reproducibility." );
+ logger.warn( "Disabling enhanced local repository: using legacy is stronlgy discouraged to ensure build reproducibility." );
try
{
session.setLocalRepositoryManager( simpleLocalRepositoryManagerFactory.newInstance( localRepo ) );
@@ -368,7 +368,7 @@ public class DefaultMaven
catch ( NoLocalRepositoryManagerException e )
{
- logger.warn( "Failed to configure simple local repository manager: back to default" );
+ logger.warn( "Failed to configure legacy local repository: back to default" );
session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/720bef7d/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 09ead1a..bea6059 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -1078,12 +1078,12 @@ public class DefaultMavenExecutionRequest
return this;
}
- public boolean isUseSimpleLocalRepositoryManager()
+ public boolean isUseLegacyLocalRepository()
{
return this.useSimpleLocalRepositoryManager;
}
- public MavenExecutionRequest setUseSimpleLocalRepositoryManager( boolean useSimpleLocalRepositoryManager )
+ public MavenExecutionRequest setUseLegacyLocalRepository( boolean useSimpleLocalRepositoryManager )
{
this.useSimpleLocalRepositoryManager = useSimpleLocalRepositoryManager;
return this;
http://git-wip-us.apache.org/repos/asf/maven/blob/720bef7d/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index cb4b207..62b6662 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -286,11 +286,11 @@ public interface MavenExecutionRequest
/**
* @since 3.1
*/
- boolean isUseSimpleLocalRepositoryManager();
+ boolean isUseLegacyLocalRepository();
/**
* @since 3.1
*/
- MavenExecutionRequest setUseSimpleLocalRepositoryManager( boolean useSimpleLocalRepositoryManager );
+ MavenExecutionRequest setUseLegacyLocalRepository( boolean useLegacyLocalRepository );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/720bef7d/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 4bcbda6..e4c62e3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -97,7 +97,7 @@ public class CLIManager
public static final String THREADS = "T";
- public static final String SIMPLE_LOCAL_REPOSITORY_MANAGER ="slrm";
+ public static final String LEGACY_LOCAL_REPOSITORY ="llr";
protected Options options;
@@ -135,10 +135,7 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
-
- options.addOption( OptionBuilder.withLongOpt( "simple-local-repository-manager" ).withDescription(
- "Use a simple Local Repository Manager, ie no use of _maven.repositories. Can be activated using -Dmaven.simpleLocalRepoMan=true" ).create(
- SIMPLE_LOCAL_REPOSITORY_MANAGER ) );
+ options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Laven 2 Legacy Local Repository behaviour, ie no use of _maven.repositories. Can be activated using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
// Adding this back in for compatibility with the verifier that hard codes this option.
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/720bef7d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 9fad9e6..0e71c8b 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
@@ -542,9 +542,9 @@ public class MavenCli
private void repository( CliRequest cliRequest )
throws Exception
{
- if ( cliRequest.commandLine.hasOption( CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER ) || Boolean.getBoolean( "maven.simpleLocalRepoMan" ) )
+ if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean( "maven.legacyLocalRepo" ) )
{
- cliRequest.request.setUseSimpleLocalRepositoryManager( true );
+ cliRequest.request.setUseLegacyLocalRepository( true );
}
}