Merge pull request #52 from orchitech/feat-aggregate-reports

Add aggregate Maven reports.
WrenSecurity · Feb 23, 2024 · d5a68cc · d5a68cc
2 parents dfdd591 + 9eba165
commit d5a68cc
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 36 deletions.
diff --git a/commons-bom/src/site/site.xml b/commons-bom/src/site/site.xml
@@ -36,6 +36,10 @@
     <version position="right" />
 
     <body>
+        <head>
+            <![CDATA[<link rel="icon" href="/wrensec-commons/favicon.ico" />]]>
+        </head>
+
         <breadcrumbs>
             <item name="Wren Security" href="https://wrensecurity.org" />
             <item name="Commons" href="../index.html" />

diff --git a/doc-maven/doc-maven-plugin/pom.xml b/doc-maven/doc-maven-plugin/pom.xml
@@ -349,19 +349,6 @@
 
     <reporting>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.2</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>jxr</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -91,6 +91,7 @@
         <pgpVerifyKeysVersion>1.7.6</pgpVerifyKeysVersion>
         <wrenBuildToolsVersion>1.2.0</wrenBuildToolsVersion>
         <pmdPluginVersion>3.21.2</pmdPluginVersion>
+        <jxrPluginVersion>3.3.2</jxrPluginVersion>
     </properties>
 
     <dependencyManagement>
@@ -146,6 +147,43 @@
 
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstylePluginVersion}</version>
+
+                <configuration>
+                    <failsOnError>false</failsOnError>
+                </configuration>
+
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <inherited>false</inherited>
+
+                        <reports>
+                            <report>checkstyle-aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>${jxrPluginVersion}</version>
+
+                <reportSets>
+                    <reportSet>
+                        <id>default</id>
+
+                        <reports>
+                            <report>jxr-no-fork</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -155,6 +193,7 @@
                     <reportSet>
                         <id>aggregate</id>
                         <inherited>false</inherited>
+
                         <reports>
                             <!-- execute within the same session to correctly resolve local plugin deps -->
                             <report>aggregate-pmd-no-fork</report>

diff --git a/rest/json-resource-examples/pom.xml b/rest/json-resource-examples/pom.xml
@@ -140,22 +140,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.0.0</version>
-
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>jxr</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
diff --git a/self-service/forgerock-selfservice-example-ui/pom.xml b/self-service/forgerock-selfservice-example-ui/pom.xml
@@ -76,7 +76,7 @@
 
                 <executions>
                     <execution>
-                        <phase>prepare-package</phase>
+                        <phase>generate-resources</phase>
 
                         <goals>
                             <goal>resources</goal>
@@ -92,7 +92,7 @@
                 <executions>
                     <execution>
                         <id>unpack</id>
-                        <phase>prepare-package</phase>
+                        <phase>generate-resources</phase>
 
                         <goals>
                             <goal>unpack</goal>
@@ -113,7 +113,7 @@
 
                     <execution>
                         <id>copy-dependencies-less</id>
-                        <phase>prepare-package</phase>
+                        <phase>generate-resources</phase>
 
                         <goals>
                             <goal>copy-dependencies</goal>
@@ -137,7 +137,7 @@
                 <executions>
                     <execution>
                         <id>prepare-working-dir</id>
-                        <phase>prepare-package</phase>
+                        <phase>generate-resources</phase>
 
                         <goals>
                             <goal>single</goal>
@@ -155,7 +155,7 @@
 
                     <execution>
                         <id>build-final-zip</id>
-                        <phase>package</phase>
+                        <phase>compile</phase>
 
                         <goals>
                             <goal>single</goal>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -36,6 +36,10 @@
     <version position="right" />
 
     <body>
+        <head>
+            <![CDATA[<link rel="icon" href="/wrensec-commons/favicon.ico" />]]>
+        </head>
+
         <breadcrumbs>
             <item name="Wren Security" href="https://wrensecurity.org" />
             <item name="Commons" href="index.html" />