Author: hboutemy
Date: Tue Sep 27 22:36:04 2011
New Revision: 1176649
URL: http://svn.apache.org/viewvc?rev=1176649&view=rev
Log:
[MJAVADOC-325] enabled the IT and fixed it for Unix
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/src/main/java/Main.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/src/main/java/Main.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/src/main/java/Main.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Tue Sep 27 22:36:04 2011
@@ -380,6 +380,7 @@ under the License.
<pomInclude>MJAVADOC-280-*/pom.xml</pomInclude>
<pomInclude>site-failOnError/pom.xml</pomInclude>
<pomInclude>MJAVADOC-320/pom.xml</pomInclude>
+ <pomInclude>MJAVADOC-325/pom.xml</pomInclude>
</pomIncludes>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
Tue Sep 27 22:36:04 2011
@@ -1,41 +1,41 @@
-<?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>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275</artifactId>
- <version>0.1</version>
- </parent>
-
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-a</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
-
- <name>MJAVADOC - Module A</name>
- <description>
- Test that javadoc attachments can be build in a multi-module project where
the modules have
- inter-dependencies and have never been installed/deployed before.
- </description>
-</project>
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275-mod-a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>MJAVADOC - Module A</name>
+ <description>
+ Test that javadoc attachments can be build in a multi-module project where
the modules have
+ inter-dependencies and have never been installed/deployed before.
+ </description>
+</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/src/main/java/Main.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/src/main/java/Main.java?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/src/main/java/Main.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/src/main/java/Main.java
Tue Sep 27 22:36:04 2011
@@ -1,3 +1,3 @@
-public class Main
-{
-}
+public class Main
+{
+}
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
Tue Sep 27 22:36:04 2011
@@ -1,49 +1,49 @@
-<?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>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275</artifactId>
- <version>0.1</version>
- </parent>
-
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-b</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
-
- <name>MJAVADOC - Module B</name>
- <description>
- Test that javadoc attachments can be build in a multi-module project where
the modules have
- inter-dependencies and have never been installed/deployed before.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-a</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
-</project>
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275-mod-b</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>MJAVADOC - Module B</name>
+ <description>
+ Test that javadoc attachments can be build in a multi-module project where
the modules have
+ inter-dependencies and have never been installed/deployed before.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275-mod-a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/src/main/java/Main.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/src/main/java/Main.java?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/src/main/java/Main.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/src/main/java/Main.java
Tue Sep 27 22:36:04 2011
@@ -1,3 +1,3 @@
-public class Main
-{
-}
+public class Main
+{
+}
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
Tue Sep 27 22:36:04 2011
@@ -1,49 +1,49 @@
-<?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>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275</artifactId>
- <version>0.1</version>
- </parent>
-
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-c</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
-
- <name>MJAVADOC - Module C</name>
- <description>
- Test that javadoc attachments can be build in a multi-module project where
the modules have
- inter-dependencies and have never been installed/deployed before.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.javadoc</groupId>
- <artifactId>MJAVADOC-275-mod-b</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
-</project>
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275-mod-c</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>MJAVADOC - Module C</name>
+ <description>
+ Test that javadoc attachments can be build in a multi-module project where
the modules have
+ inter-dependencies and have never been installed/deployed before.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.javadoc</groupId>
+ <artifactId>MJAVADOC-275-mod-b</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/src/main/java/Main.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/src/main/java/Main.java?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/src/main/java/Main.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/src/main/java/Main.java
Tue Sep 27 22:36:04 2011
@@ -1,3 +1,3 @@
-public class Main
-{
-}
+public class Main
+{
+}
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh?rev=1176649&r1=1176648&r2=1176649&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/verify.bsh Tue
Sep 27 22:36:04 2011
@@ -21,32 +21,22 @@
import java.io.*;
import org.codehaus.plexus.util.*;
-boolean result = true;
+File optionsFile = new File( basedir, "target/site/apidocs/options" );
-try
+if ( !optionsFile.exists() )
{
- File optionsFile = new File( basedir, "target/site/apidocs/options" );
-
- if( !optionsFile.exists() )
- {
- System.err.println( optionsFile.getAbsolutePath() + " is missing." );
- return false;
- }
-
- String optionsContent = FileUtils.fileRead( optionsFile );
- String javaApiLink =
"-link\r\n'http://download.oracle.com/javase/1,5,0/docs/api'";
-
- if ( optionsContent.indexOf( javaApiLink ) < 0 )
- {
- System.err.println( "Options is missing the following line:" );
- System.err.println( javaApiLink );
- return false;
- }
+ System.err.println( optionsFile.getAbsolutePath() + " is missing." );
+ return false;
}
-catch( RuntimeException e )
+
+String optionsContent = FileUtils.fileRead( optionsFile );
+String javaApiLink = "'http://download.oracle.com/javase/1,5,0/docs/api'";
+
+if ( !optionsContent.contains( javaApiLink ) )
{
- e.printStackTrace();
+ System.err.println( "Options is missing the following line:" );
+ System.err.println( javaApiLink );
return false;
-}
+}
-return result;
\ No newline at end of file
+return true;
\ No newline at end of file
