Author: jvanzyl
Date: Mon Jan 9 21:16:31 2006
New Revision: 367487
URL: http://svn.apache.org/viewcvs?rev=367487&view=rev
Log:
o [MNG-1927] Correcting an error I made with POMs not in the current working
tree
o turn on it0088
o turn off it0086, and it0087 for now
Modified:
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-core-it/it0088/pom.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=367487&r1=367486&r2=367487&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Mon Jan 9
21:16:31 2006
@@ -1,5 +1,6 @@
-it0087
-it0086
+it0088
+#it0087
+#it0086
it0085
it0084
it0083
Modified: maven/components/trunk/maven-core-it/it0088/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0088/pom.xml?rev=367487&r1=367486&r2=367487&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0088/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it0088/pom.xml Mon Jan 9 21:16:31 2006
@@ -27,7 +27,7 @@
<execution>
<phase>process-resources</phase>
<configuration>
- <pomBuildDirectory>${pom.build.directory}</pomBuildDirectory>
+ <pomBuildDirectory>${project.build.directory}</pomBuildDirectory>
</configuration>
<goals>
<goal>generate-properties</goal>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=367487&r1=367486&r2=367487&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 Jan 9 21:16:31 2006
@@ -722,43 +722,6 @@
context.put( "basedir", projectDir.getAbsolutePath() );
}
- //
----------------------------------------------------------------------
- // We need to translate the paths before interpolation so that things
- // like this:
- //
- //<project>
- // ...
- // <build>
- // <plugins>
- // <plugin>
- // <groupId>org.apache.maven.plugins</groupId>
- // <artifactId>maven-core-it-plugin</artifactId>
- // <executions>
- // <execution>
- // <phase>process-resources</phase>
- // <configuration>
- //
<pomBuildDirectory>${pom.build.directory}</pomBuildDirectory>
- // </configuration>
- // <goals>
- // <goal>generate-properties</goal>
- // </goals>
- // </execution>
- // </executions>
- // </plugin>
- // </plugins>
- // </build>
- //</project>
- //
- // Are handled correctly where the ${pom.build.directory} must be path
- // translated in the POM first. So in the Super POM the
${pom.build.directory}
- // will get shifted to /some/absolute/path/target and then during the
- // interpolation phase the <pomBuildDirectory/> element up thre will
- // have the ${pom.build.directory} string swapped out and replaced with
- // /some/absolute/path/target. [MNG-1927]
- //
----------------------------------------------------------------------
-
- pathTranslator.alignToBaseDirectory( project.getModel(), projectDir );
-
model = modelInterpolator.interpolate( model, context, strict );
// interpolation is before injection, because interpolation is
off-limits in the injected variables
