Hey, After your commit the assembly plugin started to fail for me again. when and how is the aspect activated? I'm rather clueless regarding aspects so sorry if that's obvious from code.
Milos On Dec 17, 2007 9:04 PM, <[EMAIL PROTECTED]> wrote: > Author: jdcasey > Date: Mon Dec 17 12:04:45 2007 > New Revision: 604980 > > URL: http://svn.apache.org/viewvc?rev=604980&view=rev > Log: > Moving field restored for backward compat out into a maven-project > specific out into a compat aspect, like the one used in core itself for the > plugin manager and lifecycle executor. > > Added: > > > maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/ > > > maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/Maven20xProjectCompatAspect.aj > Modified: > > > maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java > > Added: > maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/Maven20xProjectCompatAspect.aj > URL: > http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/Maven20xProjectCompatAspect.aj?rev=604980&view=auto > > ============================================================================== > --- > maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/Maven20xProjectCompatAspect.aj > (added) > +++ > maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/compat/Maven20xProjectCompatAspect.aj > Mon Dec 17 12:04:45 2007 > @@ -0,0 +1,15 @@ > +package org.apache.maven.project.aspect.compat; > + > +import org.apache.maven.project.DefaultMavenProjectBuilder; > + > +import java.util.HashMap; > +import java.util.Map; > + > +public privileged aspect Maven20xProjectCompatAspect > +{ > + > + //DO NOT USE, it is here only for backward compatibility reasons. The > existing > + // maven-assembly-plugin (2.2-beta-1) is accessing it via reflection. > + private Map DefaultMavenProjectBuilder.processedProjectCache = new > HashMap(); > + > +} > > Modified: > maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java > URL: > http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=604980&r1=604979&r2=604980&view=diff > > ============================================================================== > --- > maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java > (original) > +++ > maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java > Mon Dec 17 12:04:45 2007 > @@ -162,11 +162,6 @@ > > public static final String MAVEN_MODEL_VERSION = "4.0.0"; > > - //DO NOT USE, it is here only for backward compatibility reasons. The > existing > - // maven-assembly-plugin (2.2-beta-1) is accessing it via reflection. > - private Map processedProjectCache = new HashMap(); > - > - > public void initialize() > { > modelReader = new MavenXpp3Reader(); > > >
