Merge pull request psi-probe#2948 from hazendaz/fix-spring

Fix issues related to site discovered after release of 4.1.0
hazendaz · Dec 3, 2023 · ceba846 · ceba846
2 parents a6a3cc1 + 0b3c327
commit ceba846
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 80 deletions.
diff --git 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>
@@ -1445,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>

diff --git 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
    *

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>