[MJAVADOC-784] Upgrade to Doxia 2.0.0 Milestone Stack

pom.xml

@@ -112,8 +112,7 @@ under the License.
   <properties>
     <javaVersion>8</javaVersion>
     <mavenVersion>3.6.3</mavenVersion>
-    <doxiaVersion>1.11.1</doxiaVersion>
-    <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
+    <doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>
     <wagonVersion>3.5.3</wagonVersion>
     <resolverVersion>1.4.1</resolverVersion>
     <!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
@@ -123,10 +122,10 @@ under the License.
     <compilerPluginVersion>3.11.0</compilerPluginVersion>
     <sourcePluginVersion>3.3.0</sourcePluginVersion>
     <enforcerPluginVersion>3.4.1</enforcerPluginVersion>
-    <pluginPluginVersion>3.10.1</pluginPluginVersion>
+    <pluginPluginVersion>3.14.0</pluginPluginVersion>
     <jarPluginVersion>3.3.0</jarPluginVersion>
-    <sitePluginVersion>3.12.1</sitePluginVersion>
-    <projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
+    <sitePluginVersion>3.20.0</sitePluginVersion>
+    <projectInfoReportsPluginVersion>3.7.0</projectInfoReportsPluginVersion>
     <project.build.outputTimestamp>2024-07-17T13:27:38Z</project.build.outputTimestamp>
     <slf4jVersion>1.7.36</slf4jVersion>
   </properties>
@@ -201,7 +200,14 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
+      <version>4.0.0-M12</version>
+    </dependency>
+    <!-- for Javadoc purposes -->
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-impl</artifactId>
+      <version>4.0.0-M15</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -228,21 +234,20 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
-      <version>${doxiaVersion}</version>
+      <version>2.0.0-M12</version>
     </dependency>
 
     <!-- Doxia-sitetools -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxia-sitetoolsVersion}</version>
-      <exclusions>
-        <exclusion>
-          <!-- MJAVADOC-726 -->
-          <groupId>org.apache.velocity</groupId>
-          <artifactId>velocity-tools</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>${doxiaSitetoolsVersion}</version>
+    </dependency>
+    <!-- Doxia-sitetools -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-integration-tools</artifactId>
+      <version>${doxiaSitetoolsVersion}</version>
     </dependency>
 
     <!-- wagon -->

src/it/projects/MJAVADOC-110/verify.bsh

@@ -1,54 +1,54 @@
-
-/*
- * 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.*;
-
-boolean result = true;
-
-try
-{
-    File target = new File( basedir, "target" );
-    if ( !target.exists() || !target.isDirectory() )
-    {
-        System.err.println( "target file is missing or a directory." );
-        return false;
-    }
-
-    File apidocs = new File( target, "site/apidocs" );
-    if ( !apidocs.exists() || !apidocs.isDirectory() )
-    {
-        System.err.println( "target/site/apidocs file is missing or a directory." );
-        return false;
-    }
-
-    File htmlFile = new File( apidocs, "Test.html" );
-    if ( !htmlFile.isFile() )
-    {
-        System.err.println( "target/site/apidocs/Test.html file is missing or a a file." );
-        return false;
-    }
-}
-catch( IOException e )
-{
-    e.printStackTrace();
-    result = false;
-}
-
-return result;
+
+/*
+ * 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.*;
+
+boolean result = true;
+
+try
+{
+    File target = new File( basedir, "target" );
+    if ( !target.exists() || !target.isDirectory() )
+    {
+        System.err.println( "target file is missing or 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 a directory." );
+        return false;
+    }
+
+    File htmlFile = new File( apidocs, "Test.html" );
+    if ( !htmlFile.isFile() )
+    {
+        System.err.println( "target/reports/apidocs/Test.html file is missing or a a file." );
+        return false;
+    }
+}
+catch( IOException e )
+{
+    e.printStackTrace();
+    result = false;
+}
+
+return result;

src/it/projects/MJAVADOC-126/verify.bsh

@@ -1,58 +1,58 @@
-
-/*
- * 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.*;
-
-File target = new File( basedir, "test/target" );
-if ( !target.isDirectory() )
-{
-    System.err.println( "target is missing or not a directory." );
-    return false;
-}
-
-File apidocs = new File( basedir, "test/target/site/apidocs" );
-if ( !apidocs.isDirectory() )
-{
-    System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
-    return false;
-}
-
-File file1 = new File( apidocs, "file1.txt" );
-if ( !file1.isFile() )
-{
-    System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
-    return false;
-}
-
-File file2 = new File( apidocs, "file2.txt" );
-if ( !file2.isFile() )
-{
-    System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
-    return false;
-}
-
-File metainf = new File( apidocs, "META-INF" );
-if ( metainf.isDirectory() )
-{
-    System.err.println( metainf.getAbsolutePath() + " exists." );
-    return false;
-}
-
-return true;
+
+/*
+ * 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.*;
+
+File target = new File( basedir, "test/target" );
+if ( !target.isDirectory() )
+{
+    System.err.println( "target is missing or not a directory." );
+    return false;
+}
+
+File apidocs = new File( basedir, "test/target/reports/apidocs" );
+if ( !apidocs.isDirectory() )
+{
+    System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
+    return false;
+}
+
+File file1 = new File( apidocs, "file1.txt" );
+if ( !file1.isFile() )
+{
+    System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
+    return false;
+}
+
+File file2 = new File( apidocs, "file2.txt" );
+if ( !file2.isFile() )
+{
+    System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
+    return false;
+}
+
+File metainf = new File( apidocs, "META-INF" );
+if ( metainf.isDirectory() )
+{
+    System.err.println( metainf.getAbsolutePath() + " exists." );
+    return false;
+}
+
+return true;