Author: bentmann
Date: Sat Jun 20 10:29:51 2009
New Revision: 786790
URL: http://svn.apache.org/viewvc?rev=786790&view=rev
Log:
[MNG-4191] separate plugin and artifact repositories
o Extended requests to allow for configuration of plugin repos
Modified:
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-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
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?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
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
Sat Jun 20 10:29:51 2009
@@ -105,6 +105,8 @@
private List<ArtifactRepository> remoteRepositories;
+ private List<ArtifactRepository> pluginArtifactRepositories;
+
/**
* Suppress SNAPSHOT updates.
*
@@ -144,6 +146,7 @@
copy.setGlobalChecksumPolicy( original.getGlobalChecksumPolicy() );
copy.setUpdateSnapshots( original.isUpdateSnapshots() );
copy.setRemoteRepositories( original.getRemoteRepositories() );
+ copy.setPluginArtifactRepositories(
original.getPluginArtifactRepositories() );
copy.setNoSnapshotUpdates( original.isNoSnapshotUpdates() );
return original;
}
@@ -232,6 +235,14 @@
return this;
}
+ public MavenExecutionRequest setPluginArtifactRepositories(
List<ArtifactRepository> pluginArtifactRepositories )
+ {
+ getPluginArtifactRepositories().clear();
+ getPluginArtifactRepositories().addAll( pluginArtifactRepositories );
+
+ return this;
+ }
+
public void setProjectBuildingConfiguration( ProjectBuildingRequest
projectBuildingConfiguration )
{
this.projectBuildingRequest = projectBuildingConfiguration;
@@ -705,6 +716,15 @@
return remoteRepositories;
}
+ public List<ArtifactRepository> getPluginArtifactRepositories()
+ {
+ if ( pluginArtifactRepositories == null )
+ {
+ pluginArtifactRepositories = new ArrayList<ArtifactRepository>();
+ }
+ return pluginArtifactRepositories;
+ }
+
//TODO: this does not belong here.
public ProjectBuildingRequest getProjectBuildingRequest()
{
@@ -714,6 +734,7 @@
projectBuildingRequest.setLocalRepository( getLocalRepository() );
projectBuildingRequest.setExecutionProperties( getProperties() );
projectBuildingRequest.setRemoteRepositories(
getRemoteRepositories() );
+ projectBuildingRequest.setPluginArtifactRepositories(
getPluginArtifactRepositories() );
projectBuildingRequest.setActiveProfileIds( getActiveProfiles() );
projectBuildingRequest.setInactiveProfileIds(
getInactiveProfiles() );
projectBuildingRequest.setProfiles( getProfiles() );
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?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
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
Sat Jun 20 10:29:51 2009
@@ -199,6 +199,9 @@
MavenExecutionRequest setRemoteRepositories( List<ArtifactRepository>
repositories );
List<ArtifactRepository> getRemoteRepositories();
+ MavenExecutionRequest setPluginArtifactRepositories(
List<ArtifactRepository> repositories );
+ List<ArtifactRepository> getPluginArtifactRepositories();
+
File getUserToolchainsFile();
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
Sat Jun 20 10:29:51 2009
@@ -35,6 +35,8 @@
private List<ArtifactRepository> remoteRepositories;
+ private List<ArtifactRepository> pluginArtifactRepositories;
+
private List<ModelEventListener> listeners;
private MavenProject topProject;
@@ -60,6 +62,8 @@
activeProfileIds = new ArrayList<String>();
inactiveProfileIds = new ArrayList<String>();
executionProperties = new Properties();
+ remoteRepositories = new ArrayList<ArtifactRepository>();
+ pluginArtifactRepositories = new ArrayList<ArtifactRepository>();
}
public MavenProject getTopLevelProjectFromReactor()
@@ -85,16 +89,35 @@
public List<ArtifactRepository> getRemoteRepositories()
{
- if ( remoteRepositories == null )
- {
- remoteRepositories = new ArrayList<ArtifactRepository>();
- }
return remoteRepositories;
}
public ProjectBuildingRequest setRemoteRepositories(
List<ArtifactRepository> remoteRepositories )
{
- this.remoteRepositories = remoteRepositories;
+ this.remoteRepositories.clear();
+
+ if ( remoteRepositories != null )
+ {
+ this.remoteRepositories.addAll( remoteRepositories );
+ }
+
+ return this;
+ }
+
+ public List<ArtifactRepository> getPluginArtifactRepositories()
+ {
+ return pluginArtifactRepositories;
+ }
+
+ public ProjectBuildingRequest setPluginArtifactRepositories(
List<ArtifactRepository> pluginArtifactRepositories )
+ {
+ this.pluginArtifactRepositories.clear();
+
+ if ( pluginArtifactRepositories != null )
+ {
+ this.pluginArtifactRepositories.addAll( pluginArtifactRepositories
);
+ }
+
return this;
}
@@ -106,6 +129,7 @@
public ProjectBuildingRequest setExecutionProperties( Properties
executionProperties )
{
this.executionProperties.clear();
+
if ( executionProperties != null )
{
this.executionProperties.putAll( executionProperties );
@@ -155,6 +179,7 @@
public void setActiveProfileIds( List<String> activeProfileIds )
{
this.activeProfileIds.clear();
+
if ( activeProfileIds != null )
{
this.activeProfileIds.addAll( activeProfileIds );
@@ -169,6 +194,7 @@
public void setInactiveProfileIds( List<String> inactiveProfileIds )
{
this.inactiveProfileIds.clear();
+
if ( inactiveProfileIds != null )
{
this.inactiveProfileIds.addAll( inactiveProfileIds );
@@ -178,6 +204,7 @@
public void setProfiles( List<Profile> profiles )
{
this.profiles.clear();
+
if ( profiles != null )
{
this.profiles.addAll( profiles );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Sat Jun 20 10:29:51 2009
@@ -235,10 +235,12 @@
this.repositorySystem = repositorySystem;
originalModel = model;
- remoteArtifactRepositories =
- createArtifactRepositories( model.getRepositories(),
projectBuilderConfiguration.getRemoteRepositories() );
+ remoteArtifactRepositories =
projectBuilderConfiguration.getRemoteRepositories();
+ remoteArtifactRepositories = createArtifactRepositories(
model.getRepositories(), remoteArtifactRepositories );
- pluginArtifactRepositories = createArtifactRepositories(
model.getPluginRepositories(), null );
+ pluginArtifactRepositories =
projectBuilderConfiguration.getPluginArtifactRepositories();
+ pluginArtifactRepositories =
+ createArtifactRepositories( model.getPluginRepositories(),
pluginArtifactRepositories );
}
//TODO: need to integrate the effective scope and refactor it out of the
MMS
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
Sat Jun 20 10:29:51 2009
@@ -17,6 +17,10 @@
List<ArtifactRepository> getRemoteRepositories();
+ ProjectBuildingRequest setPluginArtifactRepositories(
List<ArtifactRepository> pluginArtifacgRepositories );
+
+ List<ArtifactRepository> getPluginArtifactRepositories();
+
ProjectBuildingRequest setExecutionProperties( Properties
executionProperties );
Properties getExecutionProperties();
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=786790&r1=786789&r2=786790&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Sat Jun 20 10:29:51 2009
@@ -235,6 +235,8 @@
// </mirrors>
request.setRemoteRepositories( repositorySystem.getMirrors(
request.getRemoteRepositories() ) );
+
+ request.setPluginArtifactRepositories( repositorySystem.getMirrors(
request.getPluginArtifactRepositories() ) );
}
// ------------------------------------------------------------------------
