You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/14 21:28:09 UTC
svn commit: r686001 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180:
module1/pom.xml module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
pom.xml verify.bsh
Author: bentmann
Date: Thu Aug 14 12:28:09 2008
New Revision: 686001
URL: http://svn.apache.org/viewvc?rev=686001&view=rev
Log:
o Made IT run on Java 1.4+
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/verify.bsh
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml?rev=686001&r1=686000&r2=686001&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml Thu Aug 14 12:28:09 2008
@@ -42,7 +42,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java?rev=686001&r1=686000&r2=686001&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java Thu Aug 14 12:28:09 2008
@@ -1,7 +1,6 @@
package edu.jhu.library;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import junit.framework.TestCase;
import org.dbunit.database.IDatabaseConnection;
/**
@@ -12,11 +11,11 @@
* To change this template use File | Settings | File Templates.
*/
public class Mjavadoc180Test
+ extends TestCase
{
/**
* This is some test javadoc. This test method has a phony dependency on DB Unit.
*/
- @Test
public void testMJAVADOC180()
{
IDatabaseConnection phony = null;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml?rev=686001&r1=686000&r2=686001&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml Thu Aug 14 12:28:09 2008
@@ -26,92 +26,62 @@
<version>1.0-SNAPSHOT</version>
<name>MJAVADOC-180</name>
- <profiles>
- <profile>
- <activation>
- <jdk>1.5</jdk>
- </activation>
+ <modules>
+ <module>module1</module>
+ </modules>
- <modules>
- <module>module1</module>
- </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ </plugins>
+ </build>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>@pom.version@</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>@pom.version@</version>
- <inherited>true</inherited>
- <configuration>
- <debug>true</debug>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <!-- to workaround MJAVADOC-180, aggregate must be false -->
- <aggregate>true</aggregate>
- <show>protected</show>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <repositories>
- <repository>
- <id>codehaus.snapshots</id>
- <name>CodeHaus Snapshots</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- </profile>
- </profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ <inherited>true</inherited>
+ <configuration>
+ <debug>true</debug>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <!-- to workaround MJAVADOC-180, aggregate must be false -->
+ <aggregate>true</aggregate>
+ <show>protected</show>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/verify.bsh?rev=686001&r1=686000&r2=686001&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/verify.bsh (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/verify.bsh Thu Aug 14 12:28:09 2008
@@ -24,12 +24,6 @@
try
{
- if ( !System.getProperty( "java.specification.version" ).equals( "1.5" ) )
- {
- System.out.println( "JDK is not 1.5. Ignore this BSH." );
- return true;
- }
-
File target = new File( basedir, "target" );
if ( !target.exists() || !target.isDirectory() )
{