Author: jdcasey
Date: Tue Feb 27 09:47:30 2007
New Revision: 512339
URL: http://svn.apache.org/viewvc?view=rev&rev=512339
Log:
Fixing some lingering dependency ordering problems from artifact resolution,
and adding settings-builder advice to the CLI.
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
Tue Feb 27 09:47:30 2007
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -39,7 +39,7 @@
{
if ( artifacts == null )
{
- artifacts = new HashSet();
+ artifacts = new LinkedHashSet();
for ( Iterator it = resolutionNodes.iterator(); it.hasNext(); )
{
@@ -55,7 +55,7 @@
{
return resolutionNodes;
}
-
+
public void setArtifactResolutionNodes( Set resolutionNodes )
{
this.resolutionNodes = resolutionNodes;
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Tue Feb 27 09:47:30 2007
@@ -28,9 +28,9 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -58,7 +58,7 @@
ArtifactMetadataSource source,
ArtifactFilter filter, List listeners )
throws ArtifactResolutionException
{
- Map resolvedArtifacts = new HashMap();
+ Map resolvedArtifacts = new LinkedHashMap();
ResolutionNode root = new ResolutionNode( originatingArtifact,
remoteRepositories );
@@ -67,7 +67,7 @@
recurse( root, resolvedArtifacts, managedVersions, localRepository,
remoteRepositories, source, filter,
listeners );
- Set set = new HashSet();
+ Set set = new LinkedHashSet();
for ( Iterator i = resolvedArtifacts.values().iterator(); i.hasNext();
)
{
Modified:
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Feb 27 09:47:30 2007
@@ -24,6 +24,7 @@
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.settings.SettingsBuilderAdvice;
import org.codehaus.plexus.classworlds.ClassWorld;
import java.io.File;
@@ -314,6 +315,11 @@
}
Properties executionProperties = getExecutionProperties(
commandLine );
+
+ SettingsBuilderAdvice settingsAdvice = new SettingsBuilderAdvice();
+
+ settingsAdvice.setDefaultGlobalLocationEnabled( true );
+ settingsAdvice.setDefaultUserLocationEnabled( true );
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setBaseDirectory( baseDirectory )
@@ -326,6 +332,7 @@
.setShowErrors( showErrors ) // default: false
// Settings
.setSettingsFile( commandLine.getOptionValue(
CLIManager.ALTERNATE_USER_SETTINGS ) )
+ .setSettingsBuilderAdvice( settingsAdvice )
//.setLocalRepositoryPath( localRepositoryPath ) //
default: ~/.m2/repository
.setInteractiveMode( interactive ) // default: false
.setUsePluginRegistry( usePluginRegistry )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Tue Feb 27 09:47:30 2007
@@ -528,9 +528,11 @@
return advice;
}
- public void setSettingsBuilderAdvice( SettingsBuilderAdvice advice )
+ public MavenExecutionRequest setSettingsBuilderAdvice(
SettingsBuilderAdvice advice )
{
this.advice = advice;
+
+ return this;
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Tue Feb 27 09:47:30 2007
@@ -193,5 +193,5 @@
MavenExecutionRequest setUsePluginUpdateOverride( boolean
usePluginUpdateOverride );
SettingsBuilderAdvice getSettingsBuilderAdvice();
- void setSettingsBuilderAdvice( SettingsBuilderAdvice advice );
+ MavenExecutionRequest setSettingsBuilderAdvice( SettingsBuilderAdvice
advice );
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Feb 27 09:47:30 2007
@@ -539,7 +539,7 @@
public List getTestClasspathElements()
throws DependencyResolutionRequiredException
{
- List list = new ArrayList( getArtifacts().size() + 1 );
+ List list = new ArrayList( getArtifacts().size() + 2 );
list.add( getBuild().getOutputDirectory() );
Modified:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?view=diff&rev=512339&r1=512338&r2=512339
==============================================================================
---
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(original)
+++
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Tue Feb 27 09:47:30 2007
@@ -76,6 +76,8 @@
return new Settings();
}
+ getLogger().debug( "Reading global settings from: " +
globalSettingsFile );
+
Settings globalSettings = readSettings( globalSettingsFile );
if ( globalSettings == null )
@@ -83,6 +85,8 @@
globalSettings = new Settings();
}
+ getLogger().debug( "Reading user settings from: " + userSettingsFile );
+
Settings userSettings = readSettings( userSettingsFile );
if ( userSettings == null )
@@ -124,6 +128,7 @@
{
if ( settingsFile == null )
{
+ getLogger().debug( "Settings file is null. Returning." );
return null;
}
@@ -131,6 +136,8 @@
if ( settingsFile.exists() && settingsFile.isFile() )
{
+ getLogger().debug( "Settings file is a proper file. Reading." );
+
FileReader reader = null;
try
{
