You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/08/12 17:08:20 UTC
svn commit: r685176 - in
/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src:
main/java/org/apache/maven/project/
test/java/org/apache/maven/project/workspace/
Author: sisbell
Date: Tue Aug 12 08:08:20 2008
New Revision: 685176
URL: http://svn.apache.org/viewvc?rev=685176&view=rev
Log:
Caching change: temporarily removed existing caching of pom due to incompatibility with project builder.
Removed:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/workspace/
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=685176&r1=685175&r2=685176&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Tue Aug 12 08:08:20 2008
@@ -385,7 +385,7 @@
ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
- MavenProject project = projectWorkspace.getProject( projectDescriptor );
+ MavenProject project = null;//projectWorkspace.getProject( projectDescriptor );
if ( project == null )
{
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=685176&r1=685175&r2=685176&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Tue Aug 12 08:08:20 2008
@@ -179,10 +179,10 @@
setArtifacts( Collections.unmodifiableSet( project.getArtifacts() ) );
}
- if ( project.getPluginArtifacts() != null )
- {
- setPluginArtifacts( Collections.unmodifiableSet( project.getPluginArtifacts() ) );
- }
+ // if ( project.getPluginArtifacts() != null )
+ // {
+ // setPluginArtifacts( Collections.unmodifiableSet( project.getPluginArtifacts() ) );
+ // }
if ( project.getReportArtifacts() != null )
{
@@ -1145,17 +1145,13 @@
return artifactMap;
}
- public void setPluginArtifacts( Set pluginArtifacts )
- {
- this.pluginArtifacts = pluginArtifacts;
-
- pluginArtifactMap = null;
- }
-
public Set getPluginArtifacts()
{
+ if(pluginArtifacts != null) {
+ return pluginArtifacts;
+ }
Set pa = new HashSet();
- if(pluginArtifacts == null && artifactFactory != null) {
+ if(artifactFactory != null) {
List plugins = getBuildPlugins();
for ( Iterator i = plugins.iterator(); i.hasNext(); )
{
@@ -1189,16 +1185,13 @@
}
}
pluginArtifacts = pa;
+ pluginArtifactMap = null;
return pluginArtifacts;
}
public Map getPluginArtifactMap()
{
- if ( pluginArtifactMap == null )
- {
- pluginArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getPluginArtifacts() );
- }
-
+ pluginArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getPluginArtifacts() );
return pluginArtifactMap;
}