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/05/23 12:54:32 UTC
svn commit: r659497 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180:
module1/pom.xml pom.xml verify.bsh
Author: vsiveton
Date: Fri May 23 03:54:32 2008
New Revision: 659497
URL: http://svn.apache.org/viewvc?rev=659497&view=rev
Log:
o add a JDK 1.5 profile to run this IT
o fixed bsh
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/module1/pom.xml
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=659497&r1=659496&r2=659497&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 Fri May 23 03:54:32 2008
@@ -1,37 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
- <parent>
- <artifactId>MJAVADOC-180</artifactId>
- <groupId>edu.jhu.library</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+
+ <parent>
+ <artifactId>MJAVADOC-180</artifactId>
<groupId>edu.jhu.library</groupId>
- <artifactId>module1</artifactId>
- <name>module1</name>
<version>1.0-SNAPSHOT</version>
-
- <dependencies>
-
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
+ </parent>
+
+ <groupId>edu.jhu.library</groupId>
+ <artifactId>module1</artifactId>
+ <name>module1</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
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=659497&r1=659496&r2=659497&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 Fri May 23 03:54:32 2008
@@ -26,72 +26,79 @@
<version>1.0-SNAPSHOT</version>
<name>MJAVADOC-180</name>
- <modules>
- <module>module1</module>
- </modules>
+ <profiles>
+ <profile>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
- <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>
+ <modules>
+ <module>module1</module>
+ </modules>
- <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>
+ <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>
+ </profile>
+ </profiles>
</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=659497&r1=659496&r2=659497&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 Fri May 23 03:54:32 2008
@@ -24,6 +24,12 @@
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() )
{