Author: sisbell
Date: Wed Sep 10 21:16:40 2008
New Revision: 694109
URL: http://svn.apache.org/viewvc?rev=694109&view=rev
Log:
Removed dynamic injection of pom build during project construction. Deleted
aspects.
Removed:
maven/components/trunk/maven-core/src/main/aspect/
maven/components/trunk/maven-embedder/src/main/aspect/
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=694109&r1=694108&r2=694109&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Wed Sep 10 21:16:40 2008
@@ -104,12 +104,6 @@
<version>1.0-alpha-1</version>
<scope>test</scope>
</dependency>
-
- <!-- Needed for backward compat aspect. -->
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -129,19 +123,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
-
- <executions>
- <execution>
- <id>weave-compat</id>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=694109&r1=694108&r2=694109&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Wed Sep 10 21:16:40 2008
@@ -78,29 +78,6 @@
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-aspects</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <aspectLibraries>
- <aspectLibrary>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </aspectLibrary>
- </aspectLibraries>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<profiles>
<profile>
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=694109&r1=694108&r2=694109&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
Wed Sep 10 21:16:40 2008
@@ -184,13 +184,6 @@
project.setFile( projectDescriptor );
project = buildInternal( project.getModel(), config,
projectDescriptor, project.getParentFile(), true );
-
- Build build = project.getBuild();
- // NOTE: setting this script-source root before path translation,
because
- // the plugin tools compose basedir and scriptSourceRoot into a
single file.
- project.addScriptSourceRoot( build.getScriptSourceDirectory() );
- project.addCompileSourceRoot( build.getSourceDirectory() );
- project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
project.setFile( projectDescriptor );
setBuildOutputDirectoryOnParent( project );
@@ -479,19 +472,8 @@
projectDir = pomFile.getAbsoluteFile().getParentFile();
}
- Build dynamicBuild = model.getBuild();
- if ( dynamicBuild != null )
- {
- model.setBuild( ModelUtils.cloneBuild( dynamicBuild ) );
- }
model = modelInterpolator.interpolate( model, projectDir, config,
getLogger().isDebugEnabled() );
- if ( dynamicBuild != null && model.getBuild() != null )
- {
- mergeDeterministicBuildElements( model.getBuild(), dynamicBuild );
- model.setBuild( dynamicBuild );
- }
-
// We will return a different project object using the new model
(hence the need to return a project, not just modify the parameter)
MavenProject project = new MavenProject( model, artifactFactory,
mavenTools, repositoryHelper, this, config );
@@ -504,59 +486,6 @@
return project;
}
- // TODO: Remove this!
- @SuppressWarnings("unchecked")
- private void mergeDeterministicBuildElements( Build interpolatedBuild,
Build dynamicBuild )
- {
- List<Plugin> dPlugins = dynamicBuild.getPlugins();
-
- if ( dPlugins != null )
- {
- List<Plugin> iPlugins = interpolatedBuild.getPlugins();
-
- for ( int i = 0; i < dPlugins.size(); i++ )
- {
- Plugin dPlugin = dPlugins.get( i );
- Plugin iPlugin = iPlugins.get( i );
-
- dPlugin.setGroupId( iPlugin.getGroupId() );
- dPlugin.setArtifactId( iPlugin.getArtifactId() );
- dPlugin.setVersion( iPlugin.getVersion() );
-
- dPlugin.setDependencies( iPlugin.getDependencies() );
- }
- }
-
- PluginManagement dPluginMgmt = dynamicBuild.getPluginManagement();
-
- if ( dPluginMgmt != null )
- {
- PluginManagement iPluginMgmt =
interpolatedBuild.getPluginManagement();
- dPlugins = dPluginMgmt.getPlugins();
- if ( dPlugins != null )
- {
- List<Plugin> iPlugins = iPluginMgmt.getPlugins();
-
- for ( int i = 0; i < dPlugins.size(); i++ )
- {
- Plugin dPlugin = dPlugins.get( i );
- Plugin iPlugin = iPlugins.get( i );
-
- dPlugin.setGroupId( iPlugin.getGroupId() );
- dPlugin.setArtifactId( iPlugin.getArtifactId() );
- dPlugin.setVersion( iPlugin.getVersion() );
-
- dPlugin.setDependencies( iPlugin.getDependencies() );
- }
- }
- }
-
- if ( dynamicBuild.getExtensions() != null )
- {
- dynamicBuild.setExtensions( interpolatedBuild.getExtensions() );
- }
- }
-
private MavenProject getSuperProject( ProjectBuilderConfiguration config,
File projectDescriptor,
boolean isReactorProject )
throws ProjectBuildingException
