Merge pull request #1028 from hazendaz/master

Move the build part onto doxia 2 (usage is still doxia 1)

Author: hazendaz

pom.xml

@@ -196,12 +196,13 @@
         <plexusVelocityVersion>2.2.0</plexusVelocityVersion>
         <plexusXmlVersion>3.0.1</plexusXmlVersion>
 
-        <dependency-check.plugin note="11.0.0+ requires doxia 2">10.0.4</dependency-check.plugin>
-        <fluido.version note="2.0.0+ requires doxia 2">1.12.0</fluido.version>
-        <pluginPluginVersion note="3.15.0+ requires doxia 2">3.14.0</pluginPluginVersion>
-        <project-info.plugin note="3.7.0+ requires doxia 2">3.6.2</project-info.plugin>
-        <site.plugin note="3.20.0+ requires doxia 2">3.12.1</site.plugin>
-        <versions.plugin note="2.18.0+ requires doxia 2">2.17.1</versions.plugin>
+        <!-- TODO: Run latest dependency check as prior is throwing errors. Remove after next parent update. -->
+        <dependency-check.plugin>12.1.0</dependency-check.plugin>
+
+        <!-- TODO: For running plugin, continue to use site plugin 3.12.1 -->
+        <site.doxia1.plugin note="3.21.0+ requires doxia 2">3.12.1</site.doxia1.plugin>
+
+        <pluginPluginVersion>3.15.1</pluginPluginVersion>
 
         <l10nPluginVersion>1.1.0</l10nPluginVersion>
         <codenarcPluginVersion>0.22-1</codenarcPluginVersion>
@@ -644,18 +645,6 @@
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.doxia</groupId>
-                            <artifactId>doxia-sink-api</artifactId>
-                            <version>${doxiaVersion}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>

src/it/common.xml

@@ -125,7 +125,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>@site.plugin@</version>
+          <version>@site.doxia1.plugin@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

src/it/empty/pom.xml

@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@site.plugin@</version>
+        <version>@site.doxia1.plugin@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

src/it/multi-build/pom.xml

@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@site.plugin@</version>
+        <version>@site.doxia1.plugin@</version>
       </plugin>
     </plugins>
   </build>

src/it/skipEmpty/pom.xml

@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@site.plugin@</version>
+        <version>@site.doxia1.plugin@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

src/site/site.xml

@@ -16,18 +16,15 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
-    name="SpotBugs Maven Plugin">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name>SpotBugs Maven Plugin</name>
-  </bannerLeft>
+  <bannerLeft name="SpotBugs Maven Plugin" />
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.1</version>
   </skin>
 
   <custom>
@@ -75,4 +72,4 @@
     </menu>
     <menu ref="reports" />
   </body>
-</project>
+</site>