Author: jdcasey
Date: Tue Apr 13 20:51:13 2010
New Revision: 933777
URL: http://svn.apache.org/viewvc?rev=933777&view=rev
Log:
[MJAVADOC-280] Reinstating invoker.properties-driven ITs for second and fourth
tests of -280, in order to avoid two-stage invoker plugin execution.
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
(with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties
(with props)
Modified:
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-2/verify.bsh
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
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=933777&r1=933776&r2=933777&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 20:51:13 2010
@@ -3,8 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>MJAVADOC-280-2-distro</artifactId>
<name>MJAVADOC-280-2-distro</name>
@@ -33,7 +37,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>@javadocPluginVersion@</version>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>javadoc-jars</id>
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties?rev=933777&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
Tue Apr 13 20:51:13 2010
@@ -0,0 +1,5 @@
+invoker.goals.1 = clean install
+invoker.project.1 = MJAVADOC-280-2-projects
+
+invoker.goals.2 = clean package
+invoker.project.2 = MJAVADOC-280-2-distro
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
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=933777&r1=933776&r2=933777&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 20:51:13 2010
@@ -6,8 +6,12 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <!-- <javadocPluginVersion>2.6.2-SNAPSHOT</javadocPluginVersion> -->
+ <modules>
+ <module>MJAVADOC-280-2-projects</module>
+ <module>MJAVADOC-280-2-distro</module>
+ </modules>
+
+ <!-- <properties>
<javadocPluginVersion>@pom.version@</javadocPluginVersion>
</properties>
@@ -83,5 +87,5 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build> -->
</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh?rev=933777&r1=933776&r2=933777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/verify.bsh
Tue Apr 13 20:51:13 2010
@@ -1,6 +1,6 @@
import java.io.File;
-File distroTarget = new File( basedir, "target/MJAVADOC-280-2-distro/target" );
+File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target" );
File apidocs = new File( distroTarget, "apidocs" );
File testApidocs = new File( distroTarget, "testapidocs" );
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml?rev=933777&r1=933776&r2=933777&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
Tue Apr 13 20:51:13 2010
@@ -3,8 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>MJAVADOC-280-4-distro</artifactId>
<name>MJAVADOC-280-4-distro</name>
@@ -34,7 +38,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>@javadocPluginVersion@</version>
+ <version>@pom.version@</version>
<executions>
<execution>
<id>javadoc-jars</id>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml?rev=933777&r1=933776&r2=933777&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
Tue Apr 13 20:51:13 2010
@@ -2,9 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
<artifactId>MJAVADOC-280-4-projects</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <name>MJAVADOC-280-4-projects</name>
<packaging>pom</packaging>
<dependencies>
@@ -26,7 +31,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>@javadocPluginVersion@</version>
+ <version>@pom.version@</version>
<configuration>
<tags>
<tag><name>.foo</name><placement>optm</placement><head>Foo:</head></tag>
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties?rev=933777&view=auto
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties
(added)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties
Tue Apr 13 20:51:13 2010
@@ -0,0 +1,5 @@
+invoker.goals.1 = clean install
+invoker.project.1 = MJAVADOC-280-4-projects
+
+invoker.goals.2 = clean package
+invoker.project.2 = MJAVADOC-280-4-distro
Propchange:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
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=933777&r1=933776&r2=933777&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 20:51:13 2010
@@ -6,8 +6,12 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <!-- <javadocPluginVersion>2.6.2-SNAPSHOT</javadocPluginVersion> -->
+ <modules>
+ <module>MJAVADOC-280-4-projects</module>
+ <module>MJAVADOC-280-4-distro</module>
+ </modules>
+
+ <!-- <properties>
<javadocPluginVersion>@pom.version@</javadocPluginVersion>
</properties>
@@ -83,5 +87,5 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build> -->
</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh?rev=933777&r1=933776&r2=933777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
Tue Apr 13 20:51:13 2010
@@ -1,6 +1,6 @@
import java.io.File;
-File distroTarget = new File( basedir, "target/MJAVADOC-280-4-distro/target" );
+File distroTarget = new File( basedir, "MJAVADOC-280-4-distro/target" );
File apidocs = new File( distroTarget, "apidocs" );
File testApidocs = new File( distroTarget, "testapidocs" );
