Author: bentmann
Date: Sun May 17 11:13:32 2009
New Revision: 775626
URL: http://svn.apache.org/viewvc?rev=775626&view=rev
Log:
o Fixed injection of repos from settings.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=775626&r1=775625&r2=775626&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Sun May 17 11:13:32 2009
@@ -680,7 +680,19 @@
public MavenExecutionRequest addProfile( Profile profile )
{
- // TODO Auto-generated method stub
- return null;
+ if ( profile == null )
+ {
+ throw new IllegalArgumentException( "profile missing" );
+ }
+
+ if ( profiles == null )
+ {
+ profiles = new ArrayList<Profile>();
+ }
+
+ profiles.add( profile );
+
+ return this;
}
+
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=775626&r1=775625&r2=775626&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Sun May 17 11:13:32 2009
@@ -231,24 +231,35 @@
this.repositorySystem = repositorySystem;
originalModel = model;
- setRemoteArtifactRepositories(
(projectBuilderConfiguration.getRemoteRepositories() != null) ? new
ArrayList<ArtifactRepository>(projectBuilderConfiguration.getRemoteRepositories())
: new ArrayList<ArtifactRepository>());
-
- for(Repository r: model.getPluginRepositories())
- {
- try {
-
remoteArtifactRepositories.add(repositorySystem.buildArtifactRepository( r ));
- } catch (InvalidRepositoryException e) {
-
- }
- }
- for(Repository r: model.getPluginRepositories())
- {
- try {
-
remoteArtifactRepositories.add(repositorySystem.buildArtifactRepository( r ));
- } catch (InvalidRepositoryException e) {
+ remoteArtifactRepositories = new ArrayList<ArtifactRepository>();
- }
- }
+ for ( Repository r : model.getRepositories() )
+ {
+ try
+ {
+ remoteArtifactRepositories.add(
repositorySystem.buildArtifactRepository( r ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+
+ }
+ }
+ for ( Repository r : model.getPluginRepositories() )
+ {
+ try
+ {
+ remoteArtifactRepositories.add(
repositorySystem.buildArtifactRepository( r ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+
+ }
+ }
+
+ if ( projectBuilderConfiguration.getRemoteRepositories() != null )
+ {
+ remoteArtifactRepositories.addAll(
projectBuilderConfiguration.getRemoteRepositories() );
+ }
}
// TODO: Find a way to use <relativePath/> here...it's tricky, because the
moduleProject
