From ab4d80463fefe578bfc31ecf431bfe5f7acfa8e2 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Dec 2023 14:25:05 -0500
Subject: [PATCH 1/5] [ci] fix javadoc

---
 psi-probe-core/src/main/java/psiprobe/tools/JmxTools.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/psi-probe-core/src/main/java/psiprobe/tools/JmxTools.java b/psi-probe-core/src/main/java/psiprobe/tools/JmxTools.java
index 1d0a933f44..60c60f67de 100644
--- a/psi-probe-core/src/main/java/psiprobe/tools/JmxTools.java
+++ b/psi-probe-core/src/main/java/psiprobe/tools/JmxTools.java
@@ -156,7 +156,7 @@ public static int getIntAttr(MBeanServer mbeanServer, ObjectName objectName,
   /**
    * Gets the int attribute. Default to default value if not found.
    *
-   * @param cds the cds
+   * @param compositeData the compsite data
    * @param name the name
    * @param defaultValue the default value
    *

From 53d4908d399e1f3b9dccc8e4cac75f11a4c0804b Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Dec 2023 14:27:16 -0500
Subject: [PATCH 2/5] [pom] REmove jdeps plugin from site as not a reporting
 plugin

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 01bc1b7270..7eda8cb3df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1405,10 +1405,6 @@
 
     <reporting>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jdeps-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>

From 728564db41814bf31ea6f0d9b0651d6dac651959 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Dec 2023 14:33:20 -0500
Subject: [PATCH 3/5] [pom] Fix deprecated pmd configuration

---
 pom.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7eda8cb3df..c92f68651f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1441,9 +1441,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <aggregate>true</aggregate>
-                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>aggregate-cpd</report>
+                            <report>aggregate-pmd</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

From 0f48c6fa002996590af41ec5046864a0dd42a603 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Dec 2023 14:39:53 -0500
Subject: [PATCH 4/5] [site] Use new site model 2.0.0 and fix tomcat image link
 as it changed locations

---
 psi-probe-core/src/site/site.xml     | 16 +++++++---------
 psi-probe-rest/src/site/site.xml     | 16 +++++++---------
 psi-probe-tomcat10/src/site/site.xml | 16 +++++++---------
 psi-probe-tomcat11/src/site/site.xml | 16 +++++++---------
 psi-probe-tomcat85/src/site/site.xml | 16 +++++++---------
 psi-probe-tomcat9/src/site/site.xml  | 16 +++++++---------
 psi-probe-web/src/site/site.xml      | 16 +++++++---------
 src/site/site.xml                    | 16 +++++++---------
 8 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/psi-probe-core/src/site/site.xml b/psi-probe-core/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-core/src/site/site.xml
+++ b/psi-probe-core/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-rest/src/site/site.xml b/psi-probe-rest/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-rest/src/site/site.xml
+++ b/psi-probe-rest/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-tomcat10/src/site/site.xml b/psi-probe-tomcat10/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-tomcat10/src/site/site.xml
+++ b/psi-probe-tomcat10/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-tomcat11/src/site/site.xml b/psi-probe-tomcat11/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-tomcat11/src/site/site.xml
+++ b/psi-probe-tomcat11/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-tomcat85/src/site/site.xml b/psi-probe-tomcat85/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-tomcat85/src/site/site.xml
+++ b/psi-probe-tomcat85/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-tomcat9/src/site/site.xml b/psi-probe-tomcat9/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-tomcat9/src/site/site.xml
+++ b/psi-probe-tomcat9/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/psi-probe-web/src/site/site.xml b/psi-probe-web/src/site/site.xml
index 668300ca09..99bef44c33 100644
--- a/psi-probe-web/src/site/site.xml
+++ b/psi-probe-web/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -38,4 +36,4 @@
         </links>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/src/site/site.xml b/src/site/site.xml
index 51d0e2dfff..57434f8020 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -11,15 +11,13 @@
     PURPOSE.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
-    <bannerLeft>
-        <src>/images/psi-probe-banner.jpg</src>
-        <href>https://github.com/psi-probe/psi-probe</href>
+<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 href="https://github.com/psi-probe/psi-probe">
+        <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
-    <bannerRight>
-        <src>https://tomcat.apache.org/images/tomcat.png</src>
-        <href>https://tomcat.apache.org/</href>
+    <bannerRight href="https://tomcat.apache.org/">
+        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
@@ -41,4 +39,4 @@
         </menu>
         <menu ref="reports" />
     </body>
-</project>
+</site>

From 0b3c327fce8d915747de37992e4213279c70d852 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 3 Dec 2023 14:41:48 -0500
Subject: [PATCH 5/5] [site] Fix attribute

---
 psi-probe-core/src/site/site.xml     | 2 +-
 psi-probe-rest/src/site/site.xml     | 2 +-
 psi-probe-tomcat10/src/site/site.xml | 2 +-
 psi-probe-tomcat11/src/site/site.xml | 2 +-
 psi-probe-tomcat85/src/site/site.xml | 2 +-
 psi-probe-tomcat9/src/site/site.xml  | 2 +-
 psi-probe-web/src/site/site.xml      | 2 +-
 src/site/site.xml                    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/psi-probe-core/src/site/site.xml b/psi-probe-core/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-core/src/site/site.xml
+++ b/psi-probe-core/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-rest/src/site/site.xml b/psi-probe-rest/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-rest/src/site/site.xml
+++ b/psi-probe-rest/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-tomcat10/src/site/site.xml b/psi-probe-tomcat10/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-tomcat10/src/site/site.xml
+++ b/psi-probe-tomcat10/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-tomcat11/src/site/site.xml b/psi-probe-tomcat11/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-tomcat11/src/site/site.xml
+++ b/psi-probe-tomcat11/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-tomcat85/src/site/site.xml b/psi-probe-tomcat85/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-tomcat85/src/site/site.xml
+++ b/psi-probe-tomcat85/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-tomcat9/src/site/site.xml b/psi-probe-tomcat9/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-tomcat9/src/site/site.xml
+++ b/psi-probe-tomcat9/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/psi-probe-web/src/site/site.xml b/psi-probe-web/src/site/site.xml
index 99bef44c33..cbefc86b6a 100644
--- a/psi-probe-web/src/site/site.xml
+++ b/psi-probe-web/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
diff --git a/src/site/site.xml b/src/site/site.xml
index 57434f8020..5cd324dda7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,7 +17,7 @@
         <image src="/images/psi-probe-banner.jpg" />
     </bannerLeft>
     <bannerRight href="https://tomcat.apache.org/">
-        <image src"https://tomcat.apache.org/res/images/tomcat.png" />
+        <image src="https://tomcat.apache.org/res/images/tomcat.png" />
     </bannerRight>
     <skin>
         <groupId>org.apache.maven.skins</groupId>