This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit c45f26a3a362f81f4aedeb39b804d0215b9961c0
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 4 14:01:27 2026 +0000

    Combine duplicate ITs and assert what site-failOnError checks
    
    MJAVADOC-642 runs the POM and the command-line offline variant in one 
project;
    MJAVADOC-620 installs both libraries once instead of the shared parent 
twice.
---
 .../app/pom.xml                                    |  6 +++
 .../app/src/main/java/TestUsage.java               | 13 +++--
 .../invoker.properties                             |  8 +--
 .../lib => MJAVADOC-620/lib-nodot}/pom.xml         |  0
 .../lib-nodot}/src/main/java/somepackage/Test.java |  0
 .../lib => MJAVADOC-620/lib-toplevel}/pom.xml      |  3 +-
 .../lib-toplevel}/src/main/java/Test.java          |  0
 .../pom.xml                                        |  0
 .../Main.java => MJAVADOC-620/verify.groovy}       | 31 ++++-------
 .../MJAVADOC-620_no-dot-in-version/app/pom.xml     | 37 -------------
 .../invoker.properties                             | 22 --------
 .../MJAVADOC-620_no-dot-in-version/verify.groovy   | 63 ----------------------
 .../app/src/main/java/TestUsage.java               | 32 -----------
 .../MJAVADOC-620_top-level-package/pom.xml         | 53 ------------------
 .../MJAVADOC-620_top-level-package/verify.groovy   | 63 ----------------------
 src/it/projects/MJAVADOC-642/invoker.properties    |  3 +-
 src/it/projects/MJAVADOC-642/pom.xml               | 23 +++++++-
 src/it/projects/MJAVADOC-642/verify.groovy         |  3 +-
 .../MJAVADOC-642_cmdline/invoker.properties        | 18 -------
 src/it/projects/MJAVADOC-642_cmdline/pom.xml       | 54 -------------------
 .../verify.groovy                                  | 10 ++--
 21 files changed, 64 insertions(+), 378 deletions(-)

diff --git a/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml 
b/src/it/projects/MJAVADOC-620/app/pom.xml
similarity index 87%
rename from src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
rename to src/it/projects/MJAVADOC-620/app/pom.xml
index ae00f148..288f113e 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/app/pom.xml
+++ b/src/it/projects/MJAVADOC-620/app/pom.xml
@@ -30,7 +30,13 @@
     <dependency>
       <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
       <artifactId>maven-MJAVADOC620-jar</artifactId>
+      <version>1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+      <artifactId>maven-MJAVADOC620-toplevel</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
+
 </project>
\ No newline at end of file
diff --git 
a/src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java
 b/src/it/projects/MJAVADOC-620/app/src/main/java/TestUsage.java
similarity index 74%
rename from 
src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java
rename to src/it/projects/MJAVADOC-620/app/src/main/java/TestUsage.java
index e0a79b14..8c394ea6 100644
--- 
a/src/it/projects/MJAVADOC-620_no-dot-in-version/app/src/main/java/TestUsage.java
+++ b/src/it/projects/MJAVADOC-620/app/src/main/java/TestUsage.java
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import somepackage.Test;
-
 /**
- * Sample class that tries to use top-level class from a non-module JAR.
+ * Sample class that tries to use classes from non-module JARs whose version 
has no dot
+ * or whose classes are in the top-level package.
  */
 public class TestUsage
 {
@@ -31,4 +30,12 @@ public class TestUsage
     {
         return new Test();
     }
+
+    /**
+     * Sample method that uses the packaged Test class from the project whose 
version has no dot.
+     */
+    public somepackage.Test getPackagedTest()
+    {
+        return new somepackage.Test();
+    }
 }
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties 
b/src/it/projects/MJAVADOC-620/invoker.properties
similarity index 84%
rename from src/it/projects/MJAVADOC-620_top-level-package/invoker.properties
rename to src/it/projects/MJAVADOC-620/invoker.properties
index 95bc3d67..af31e7a4 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/invoker.properties
+++ b/src/it/projects/MJAVADOC-620/invoker.properties
@@ -17,6 +17,8 @@
 
 invoker.goals.1 = install
 invoker.goals.2 = install
-invoker.project.2 = lib
-invoker.goals.3 = javadoc:aggregate
-invoker.project.3 = app
+invoker.project.2 = lib-nodot
+invoker.goals.3 = install
+invoker.project.3 = lib-toplevel
+invoker.goals.4 = javadoc:aggregate
+invoker.project.4 = app
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/lib/pom.xml 
b/src/it/projects/MJAVADOC-620/lib-nodot/pom.xml
similarity index 100%
rename from src/it/projects/MJAVADOC-620_no-dot-in-version/lib/pom.xml
rename to src/it/projects/MJAVADOC-620/lib-nodot/pom.xml
diff --git 
a/src/it/projects/MJAVADOC-620_no-dot-in-version/lib/src/main/java/somepackage/Test.java
 b/src/it/projects/MJAVADOC-620/lib-nodot/src/main/java/somepackage/Test.java
similarity index 100%
rename from 
src/it/projects/MJAVADOC-620_no-dot-in-version/lib/src/main/java/somepackage/Test.java
rename to 
src/it/projects/MJAVADOC-620/lib-nodot/src/main/java/somepackage/Test.java
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml 
b/src/it/projects/MJAVADOC-620/lib-toplevel/pom.xml
similarity index 93%
rename from src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml
rename to src/it/projects/MJAVADOC-620/lib-toplevel/pom.xml
index 56e32f91..fe3da4de 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/lib/pom.xml
+++ b/src/it/projects/MJAVADOC-620/lib-toplevel/pom.xml
@@ -24,5 +24,6 @@
     <artifactId>maven-MJAVADOC-620</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>maven-MJAVADOC620-jar</artifactId>
+  <artifactId>maven-MJAVADOC620-toplevel</artifactId>
+  <version>1.0-SNAPSHOT</version>
 </project>
diff --git 
a/src/it/projects/MJAVADOC-620_top-level-package/lib/src/main/java/Test.java 
b/src/it/projects/MJAVADOC-620/lib-toplevel/src/main/java/Test.java
similarity index 100%
rename from 
src/it/projects/MJAVADOC-620_top-level-package/lib/src/main/java/Test.java
rename to src/it/projects/MJAVADOC-620/lib-toplevel/src/main/java/Test.java
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml 
b/src/it/projects/MJAVADOC-620/pom.xml
similarity index 100%
rename from src/it/projects/MJAVADOC-620_no-dot-in-version/pom.xml
rename to src/it/projects/MJAVADOC-620/pom.xml
diff --git 
a/src/it/projects/MJAVADOC-642_cmdline/src/main/java/mjavadoc642/Main.java 
b/src/it/projects/MJAVADOC-620/verify.groovy
similarity index 59%
rename from 
src/it/projects/MJAVADOC-642_cmdline/src/main/java/mjavadoc642/Main.java
rename to src/it/projects/MJAVADOC-620/verify.groovy
index 7d95048b..9e5e3874 100644
--- a/src/it/projects/MJAVADOC-642_cmdline/src/main/java/mjavadoc642/Main.java
+++ b/src/it/projects/MJAVADOC-620/verify.groovy
@@ -1,3 +1,4 @@
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -7,7 +8,7 @@
  * "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
+ *   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
@@ -17,25 +18,11 @@
  * under the License.
  */
 
-package mjavadoc642;
-
-/**
- * This is the main class.
- */
-public final class Main {
-
-    /**
-     * Mising description on auto generated constructor cause javadoc warrning.
-     */
-    Main() {}
+def options = new File( basedir, 'app/target/reports/apidocs/options' )
+assert options.isFile()
 
-    /**
-     * This is the main method.
-     *
-     * @param args The arguments
-     * @throws Exception if something goes wrong
-     */
-    public static final void main(String ... args) throws Exception {
-        System.out.println("Hello, World!");
-    }
-}
+def str = options.text
+// dependency whose version has no dot
+assert str.contains( 'maven-MJAVADOC620-jar-1-SNAPSHOT.jar' ) : 'Javadoc does 
not use the artifact with a dot-less version'
+// dependency whose class lives in the top-level package
+assert str.contains( 'maven-MJAVADOC620-toplevel-1.0-SNAPSHOT.jar' ) : 
'Javadoc does not use the artifact with a top-level class'
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml 
b/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
deleted file mode 100644
index f3f1c973..00000000
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/app/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  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/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
-    <artifactId>maven-MJAVADOC-620</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>maven-MJAVADOC-620-test</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
-      <artifactId>maven-MJAVADOC620-jar</artifactId>
-      <version>1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties 
b/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties
deleted file mode 100644
index 40b6e12e..00000000
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/invoker.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.
-
-invoker.goals.1 = install
-invoker.goals.2 = install
-invoker.project.2 = lib
-invoker.goals.3 = javadoc:aggregate
-invoker.project.3 = app
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.groovy 
b/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.groovy
deleted file mode 100644
index 7894b01d..00000000
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/*
- * 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.
- */
-
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
-    File target = new File( basedir, "app/target" );
-    if ( !target.exists() || !target.isDirectory() )
-    {
-        System.err.println( "target file is missing or not a directory." );
-        return false;
-    }
-
-    File apidocs = new File( target, "reports/apidocs" );
-    if ( !apidocs.exists() || !apidocs.isDirectory() )
-    {
-        System.err.println( "target/reports/apidocs file is missing or not a 
directory." );
-        return false;
-    }
-
-    File options = new File( apidocs, "options" );
-    if ( !options.exists() || !options.isFile() )
-    {
-        System.err.println( "target/reports/apidocs/options file is missing or 
not a file." );
-        return false;
-    }
-
-    String str = FileUtils.fileRead( options );
-
-    if ( !str.contains( "maven-MJAVADOC620-jar-1-SNAPSHOT.jar" ) )
-    {
-        System.err.println( "Javadoc doesn't use correct artifacts." );
-        return false;
-    }
-}
-catch( IOException e )
-{
-    e.printStackTrace();
-    result = false;
-}
-
-return result;
diff --git 
a/src/it/projects/MJAVADOC-620_top-level-package/app/src/main/java/TestUsage.java
 
b/src/it/projects/MJAVADOC-620_top-level-package/app/src/main/java/TestUsage.java
deleted file mode 100644
index f7c53835..00000000
--- 
a/src/it/projects/MJAVADOC-620_top-level-package/app/src/main/java/TestUsage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Sample class that tries to use top-level class from a non-module JAR.
- */
-public class TestUsage
-{
-    /**
-     * Sample method that uses the top-level Test class from the other project.
-     */
-    public Test getTest()
-    {
-        return new Test();
-    }
-}
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml 
b/src/it/projects/MJAVADOC-620_top-level-package/pom.xml
deleted file mode 100644
index 3fa8b68d..00000000
--- a/src/it/projects/MJAVADOC-620_top-level-package/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  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/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
-  <artifactId>maven-MJAVADOC-620</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Maven MJAVADOC-620 Test</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>@compilerPluginVersion@</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>@project.version@</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/verify.groovy 
b/src/it/projects/MJAVADOC-620_top-level-package/verify.groovy
deleted file mode 100644
index 8e3e757d..00000000
--- a/src/it/projects/MJAVADOC-620_top-level-package/verify.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/*
- * 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.
- */
-
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
-    File target = new File( basedir, "app/target" );
-    if ( !target.exists() || !target.isDirectory() )
-    {
-        System.err.println( "target file is missing or not a directory." );
-        return false;
-    }
-
-    File apidocs = new File( target, "reports/apidocs" );
-    if ( !apidocs.exists() || !apidocs.isDirectory() )
-    {
-        System.err.println( "target/reports/apidocs file is missing or not a 
directory." );
-        return false;
-    }
-
-    File options = new File( apidocs, "options" );
-    if ( !options.exists() || !options.isFile() )
-    {
-        System.err.println( "target/reports/apidocs/options file is missing or 
not a file." );
-        return false;
-    }
-
-    String str = FileUtils.fileRead( options );
-
-    if ( !str.contains( "maven-MJAVADOC620-jar-1.0-SNAPSHOT.jar" ) )
-    {
-        System.err.println( "Javadoc doesn't use correct artifacts." );
-        return false;
-    }
-}
-catch( IOException e )
-{
-    e.printStackTrace();
-    result = false;
-}
-
-return result;
diff --git a/src/it/projects/MJAVADOC-642/invoker.properties 
b/src/it/projects/MJAVADOC-642/invoker.properties
index 4c251c07..b41a4023 100644
--- a/src/it/projects/MJAVADOC-642/invoker.properties
+++ b/src/it/projects/MJAVADOC-642/invoker.properties
@@ -15,4 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals= package
+invoker.goals.1 = package -Poffline-in-pom
+invoker.goals.2 = -Dmaven.javadoc.offline=true package
diff --git a/src/it/projects/MJAVADOC-642/pom.xml 
b/src/it/projects/MJAVADOC-642/pom.xml
index 10ce349d..48bf0520 100644
--- a/src/it/projects/MJAVADOC-642/pom.xml
+++ b/src/it/projects/MJAVADOC-642/pom.xml
@@ -41,8 +41,6 @@
                         </goals>
                         <phase>package</phase>
                         <configuration>
-                            <offline>true</offline>
-                            <skip>false</skip>
                             <detectJavaApiLink>false</detectJavaApiLink>
                             <detectOfflineLinks>false</detectOfflineLinks>
                             <failOnWarnings>true</failOnWarnings>
@@ -52,4 +50,25 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <!-- first invocation: offline set in the POM; second invocation 
sets it with -Dmaven.javadoc.offline=true -->
+            <id>offline-in-pom</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>javadoc</id>
+                                <configuration>
+                                    <offline>true</offline>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/src/it/projects/MJAVADOC-642/verify.groovy 
b/src/it/projects/MJAVADOC-642/verify.groovy
index 05c87788..375e9e20 100644
--- a/src/it/projects/MJAVADOC-642/verify.groovy
+++ b/src/it/projects/MJAVADOC-642/verify.groovy
@@ -20,4 +20,5 @@
 def log = new File( basedir, 'build.log').text
 
 assert log.count("[DEBUG]   (f) offline = false") == 0
-assert log.count("[DEBUG]   (f) offline = true") == 1
+// once from the offline-in-pom profile, once from -Dmaven.javadoc.offline=true
+assert log.count("[DEBUG]   (f) offline = true") == 2
diff --git a/src/it/projects/MJAVADOC-642_cmdline/invoker.properties 
b/src/it/projects/MJAVADOC-642_cmdline/invoker.properties
deleted file mode 100644
index 0fe00967..00000000
--- a/src/it/projects/MJAVADOC-642_cmdline/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-invoker.goals= -Dmaven.javadoc.offline=true package
diff --git a/src/it/projects/MJAVADOC-642_cmdline/pom.xml 
b/src/it/projects/MJAVADOC-642_cmdline/pom.xml
deleted file mode 100644
index 5bb9fc68..00000000
--- a/src/it/projects/MJAVADOC-642_cmdline/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-~   Licensed 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 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.plugins.javadoc.it</groupId>
-    <artifactId>mjavadoc642</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <url>https://issues.apache.org/jira/browse/MJAVADOC-642</url>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>@project.version@</version>
-                <executions>
-                    <execution>
-                        <id>javadoc</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <skip>false</skip>
-                            <detectJavaApiLink>false</detectJavaApiLink>
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <failOnWarnings>true</failOnWarnings>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/src/it/projects/MJAVADOC-642_cmdline/verify.groovy 
b/src/it/projects/site-failOnError/verify.groovy
similarity index 64%
rename from src/it/projects/MJAVADOC-642_cmdline/verify.groovy
rename to src/it/projects/site-failOnError/verify.groovy
index 05c87788..0dd46514 100644
--- a/src/it/projects/MJAVADOC-642_cmdline/verify.groovy
+++ b/src/it/projects/site-failOnError/verify.groovy
@@ -17,7 +17,11 @@
  * under the License.
  */
 
-def log = new File( basedir, 'build.log').text
+def log = new File( basedir, 'build.log' ).text
 
-assert log.count("[DEBUG]   (f) offline = false") == 0
-assert log.count("[DEBUG]   (f) offline = true") == 1
+// javadoc fails on this project (no public class), the report logs the error 
...
+assert log.contains( 'No public or protected classes found to document.' )
+assert log.contains( '[ERROR] Error while creating javadoc report: ' )
+// ... and with failOnError=false the site build still succeeds
+assert log.contains( 'BUILD SUCCESS' )
+assert new File( basedir, 'target/site/index.html' ).isFile()

Reply via email to