You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/03/08 15:26:36 UTC
svn commit: r634974 - in
/maven/plugin-tools/trunk/maven-plugin-tools-javadoc: pom.xml
src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
src/test/resources/unit/javadoc/javadoc-plugin-config.xml
Author: vsiveton
Date: Sat Mar 8 06:26:35 2008
New Revision: 634974
URL: http://svn.apache.org/viewvc?rev=634974&view=rev
Log:
MPLUGIN-82: Fix test for javadoc tools
Submitted by: Benjamin Bentmann
Reviewed by: Vincent Siveton
o applied
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=634974&r1=634973&r2=634974&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Sat Mar 8 06:26:35 2008
@@ -104,6 +104,30 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>it-test</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.testOutputDirectory}/unit" encoding="ISO-8859-1" overwrite="true">
+ <fileset dir="${basedir}/src/test/resources/unit" includes="**/*.xml"/>
+ <filterset>
+ <filter token="project.version" value="${project.version}"/>
+ </filterset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -112,6 +136,9 @@
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <finalName>${project.build.finalName}-it</finalName>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -127,7 +154,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <file>${project.build.directory}/${project.build.finalName}-it.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java?rev=634974&r1=634973&r2=634974&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java Sat Mar 8 06:26:35 2008
@@ -105,7 +105,7 @@
public void testMojoTaglets()
throws Exception
{
- File testPom = new File( getBasedir(), "src/test/resources/unit/javadoc/javadoc-plugin-config.xml" );
+ File testPom = new File( getBasedir(), "target/test-classes/unit/javadoc/javadoc-plugin-config.xml" );
PlexusConfiguration pluginConfiguration = extractPluginConfiguration( "maven-javadoc-plugin", testPom );
JavadocReport mojo = (JavadocReport) lookupMojo( "org.apache.maven.plugins", "maven-javadoc-plugin", "2.3",
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml?rev=634974&r1=634973&r2=634974&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml Sat Mar 8 06:26:35 2008
@@ -114,7 +114,7 @@
<tagletArtifact>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>@project.version@</version>
</tagletArtifact>
</configuration>
</plugin>