Merge branch 'refs/heads/main' into move-to-openrewrite

refactorfirst · Nov 17, 2024 · 807337c · 807337c
2 parents f0d8411 + 02daec4
commit 807337c
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 184 deletions.
diff --git a/change-proneness-ranker/pom.xml b/change-proneness-ranker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.hjug.refactorfirst.changepronenessranker</groupId>

diff --git a/circular-reference-detector/pom.xml b/circular-reference-detector/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hjug.refactorfirst</groupId>
 		<artifactId>refactor-first</artifactId>
-		<version>0.6.2-SNAPSHOT</version>
+		<version>0.6.3-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.hjug.refactorfirst.circularreferencedetector</groupId>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/cost-benefit-calculator/pom.xml b/cost-benefit-calculator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.hjug.refactorfirst.costbenefitcalculator</groupId>

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>coverage</artifactId>

diff --git a/effort-ranker/pom.xml b/effort-ranker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.hjug.refactorfirst.effortranker</groupId>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.hjug.refactorfirst.testresources</groupId>
             <artifactId>test-resources</artifactId>
-            <version>0.6.2-SNAPSHOT</version>
+            <version>0.6.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/graph-data-generator/pom.xml b/graph-data-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.hjug.refactorfirst.graphdatagenerator</groupId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.hjug.refactorfirst.costbenefitcalculator</groupId>
             <artifactId>cost-benefit-calculator</artifactId>
-            <version>0.6.2-SNAPSHOT</version>
+            <version>0.6.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.hjug.refactorfirst</groupId>
     <artifactId>refactor-first</artifactId>
-    <version>0.6.2-SNAPSHOT</version>
+    <version>0.6.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/refactorfirst/RefactorFirst</url>
@@ -69,7 +69,7 @@
         <sonar.organization>jimbethancourt-github</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
-        <maven.core.version>3.9.4</maven.core.version>
+        <maven.core.version>3.9.9</maven.core.version>
     </properties>
 
     <modules>
@@ -140,7 +140,7 @@
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit</artifactId>
-                <version>6.7.0.202309050840-r</version>
+                <version>6.10.0.202406032230-r</version>
                 <scope>compile</scope>
             </dependency>
 
@@ -183,7 +183,6 @@
 
 
     <dependencies>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -338,21 +337,6 @@
                 </executions>
                 -->
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.owasp</groupId>-->
-<!--                <artifactId>dependency-check-maven</artifactId>-->
-<!--                <version>6.1.0</version>-->
-<!--                <configuration>-->
-<!--                    <failBuildOnCVSS>8.0</failBuildOnCVSS>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>check</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
             <!--TODO: Add the SNYK plugin-->
             <!-- https://github.com/snyk/snyk-maven-plugin -->
 
@@ -395,6 +379,28 @@
 
 
     <profiles>
+        <profile>
+            <id>local</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>6.1.0</version>
+                        <configuration>
+                            <failBuildOnCVSS>8.0</failBuildOnCVSS>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>snapshot-release</id>
             <build>

diff --git a/refactor-first-maven-plugin/pom.xml b/refactor-first-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hjug.refactorfirst</groupId>
         <artifactId>refactor-first</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.hjug.refactorfirst.plugin</groupId>
@@ -22,28 +22,6 @@
             <groupId>org.hjug.refactorfirst.report</groupId>
             <artifactId>report</artifactId>
         </dependency>
-        <!-- Doxia -->
-        <!-- Needed since maven-reporting-impl brings in Struts 1.3.8 jars that have CVSS > 8 -->
-        <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-sink-api</artifactId>
-            <version>2.0.0-M6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-decoration-model</artifactId>
-            <version>2.0.0-M6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-core</artifactId>
-            <version>2.0.0-M7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-site-renderer</artifactId>
-            <version>2.0.0-M11</version>
-        </dependency>
 
         <!-- Maven Reporting -->
         <dependency>
@@ -52,35 +30,37 @@
             <version>${maven.core.version}</version>
         </dependency>
 
-        <!-- Maven Reporting -->
         <dependency>
             <groupId>org.apache.maven.reporting</groupId>
             <artifactId>maven-reporting-impl</artifactId>
-            <version>3.2.0</version>
+            <version>4.0.0</version>
+            <exclusions>
+                <!-- Remediates xz-1.9.jar: CVE-2022-1271 -->
+                <!-- Unused transitive dependency -->
+                <exclusion>
+                    <groupId>org.tukaani</groupId>
+                    <artifactId>xz</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.reporting</groupId>
             <artifactId>maven-reporting-api</artifactId>
-            <version>3.1.1</version>
+            <version>4.0.0</version>
         </dependency>
 
         <!-- plugin API and plugin-tools -->
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.5.2</version>
+            <version>3.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.1</version>
+            <version>3.15.1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-shared-utils</artifactId>
-            <version>3.3.3</version>
-        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -92,12 +72,12 @@
         <plugins>
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>3.1.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.15.1</version>
                 <configuration>
                     <goalPrefix>refactor-first</goalPrefix>
                 </configuration>