Author: jdcasey
Date: Tue Apr 13 19:41:52 2010
New Revision: 933764
URL: http://svn.apache.org/viewvc?rev=933764&view=rev
Log:
[MJAVADOC-280] Fixing ITs. There was a problem where projects within the 280
test structures weren't being interpolated properly. This seems to be related
to the invoker plugin interpolating ONLY the direct pom.xml it's pointed at,
and leaving the ones we actually care about in these cases untouched.
Also, including the pattern for MJAVADOC-275 integration test to run.
Removed:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=933764&r1=933763&r2=933764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Tue Apr 13 19:41:52 2010
@@ -417,6 +417,7 @@ under the License.
<pomInclude>**/MJAVADOC-257/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-259/pom.xml</pomInclude>
<pomInclude>**/MJAVADOC-262/pom.xml</pomInclude>
+ <pomInclude>MJAVADOC-275/pom.xml</pomInclude>
<pomInclude>MJAVADOC-280-*/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml?rev=933764&r1=933763&r2=933764&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
Tue Apr 13 19:41:52 2010
@@ -33,7 +33,6 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!-- <version>2.6.2-SNAPSHOT</version> -->
<version>@javadocPluginVersion@</version>
<executions>
<execution>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml?rev=933764&r1=933763&r2=933764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/pom.xml Tue
Apr 13 19:41:52 2010
@@ -5,12 +5,6 @@
<artifactId>MJAVADOC-280-2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <modules>
- <!-- enable discovery and filtering of these POMs -->
- <module>MJAVADOC-280-2-projects</module>
- <module>MJAVADOC-280-2-distro</module>
- </modules>
<properties>
<!-- <javadocPluginVersion>2.6.2-SNAPSHOT</javadocPluginVersion> -->
@@ -49,12 +43,13 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<configuration>
<localRepositoryPath>${project.basedir}/../../local-repo</localRepositoryPath>
<streamLogs>true</streamLogs>
<suppressSummaries>true</suppressSummaries>
<debug>true</debug>
+
<settingsFile>${project.basedir}/../interpolated-settings.xml</settingsFile>
</configuration>
<executions>
<execution>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml?rev=933764&r1=933763&r2=933764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml Tue
Apr 13 19:41:52 2010
@@ -43,12 +43,13 @@
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<configuration>
<localRepositoryPath>${project.basedir}/../../local-repo</localRepositoryPath>
<streamLogs>true</streamLogs>
<suppressSummaries>true</suppressSummaries>
<debug>true</debug>
+
<settingsFile>${project.basedir}/../interpolated-settings.xml</settingsFile>
</configuration>
<executions>
<execution>
