Skip to content

Commit d268cb5

Browse files
#116 #119 Fix Doxia issues
- #116 Fixed Doxia issues by upgrading maven-reporting-api and maven-reporting-impl versions - #119 Updated vulnerable dependencies or excluded their vulnerable transitive dependencies - Updated Maven api & plugin dependency versions
1 parent 03b29ed commit d268cb5

File tree

2 files changed

+31
-52
lines changed

2 files changed

+31
-52
lines changed

pom.xml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<sonar.organization>jimbethancourt-github</sonar.organization>
7070
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
7171

72-
<maven.core.version>3.9.4</maven.core.version>
72+
<maven.core.version>3.9.9</maven.core.version>
7373
</properties>
7474

7575
<modules>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>org.eclipse.jgit</groupId>
142142
<artifactId>org.eclipse.jgit</artifactId>
143-
<version>6.7.0.202309050840-r</version>
143+
<version>6.10.0.202406032230-r</version>
144144
<scope>compile</scope>
145145
</dependency>
146146

@@ -183,7 +183,6 @@
183183

184184

185185
<dependencies>
186-
187186
<dependency>
188187
<groupId>org.mockito</groupId>
189188
<artifactId>mockito-core</artifactId>
@@ -338,21 +337,21 @@
338337
</executions>
339338
-->
340339
</plugin>
341-
<!-- <plugin>-->
342-
<!-- <groupId>org.owasp</groupId>-->
343-
<!-- <artifactId>dependency-check-maven</artifactId>-->
344-
<!-- <version>6.1.0</version>-->
345-
<!-- <configuration>-->
346-
<!-- <failBuildOnCVSS>8.0</failBuildOnCVSS>-->
347-
<!-- </configuration>-->
348-
<!-- <executions>-->
349-
<!-- <execution>-->
350-
<!-- <goals>-->
351-
<!-- <goal>check</goal>-->
352-
<!-- </goals>-->
353-
<!-- </execution>-->
354-
<!-- </executions>-->
355-
<!-- </plugin>-->
340+
<plugin>
341+
<groupId>org.owasp</groupId>
342+
<artifactId>dependency-check-maven</artifactId>
343+
<version>6.1.0</version>
344+
<configuration>
345+
<failBuildOnCVSS>8.0</failBuildOnCVSS>
346+
</configuration>
347+
<executions>
348+
<execution>
349+
<goals>
350+
<goal>check</goal>
351+
</goals>
352+
</execution>
353+
</executions>
354+
</plugin>
356355
<!--TODO: Add the SNYK plugin-->
357356
<!-- https://github.com/snyk/snyk-maven-plugin -->
358357

refactor-first-maven-plugin/pom.xml

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@
2222
<groupId>org.hjug.refactorfirst.report</groupId>
2323
<artifactId>report</artifactId>
2424
</dependency>
25-
<!-- Doxia -->
26-
<!-- Needed since maven-reporting-impl brings in Struts 1.3.8 jars that have CVSS > 8 -->
27-
<dependency>
28-
<groupId>org.apache.maven.doxia</groupId>
29-
<artifactId>doxia-sink-api</artifactId>
30-
<version>2.0.0-M6</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.apache.maven.doxia</groupId>
34-
<artifactId>doxia-decoration-model</artifactId>
35-
<version>2.0.0-M6</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.apache.maven.doxia</groupId>
39-
<artifactId>doxia-core</artifactId>
40-
<version>2.0.0-M7</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.apache.maven.doxia</groupId>
44-
<artifactId>doxia-site-renderer</artifactId>
45-
<version>2.0.0-M11</version>
46-
</dependency>
4725

4826
<!-- Maven Reporting -->
4927
<dependency>
@@ -52,35 +30,37 @@
5230
<version>${maven.core.version}</version>
5331
</dependency>
5432

55-
<!-- Maven Reporting -->
5633
<dependency>
5734
<groupId>org.apache.maven.reporting</groupId>
5835
<artifactId>maven-reporting-impl</artifactId>
59-
<version>3.2.0</version>
36+
<version>4.0.0</version>
37+
<exclusions>
38+
<!-- Remediates xz-1.9.jar: CVE-2022-1271 -->
39+
<!-- Unused transitive dependency -->
40+
<exclusion>
41+
<groupId>org.tukaani</groupId>
42+
<artifactId>xz</artifactId>
43+
</exclusion>
44+
</exclusions>
6045
</dependency>
6146
<dependency>
6247
<groupId>org.apache.maven.reporting</groupId>
6348
<artifactId>maven-reporting-api</artifactId>
64-
<version>3.1.1</version>
49+
<version>4.0.0</version>
6550
</dependency>
6651

6752
<!-- plugin API and plugin-tools -->
6853
<dependency>
6954
<groupId>org.apache.maven</groupId>
7055
<artifactId>maven-plugin-api</artifactId>
71-
<version>3.5.2</version>
56+
<version>3.9.9</version>
7257
</dependency>
7358
<dependency>
7459
<groupId>org.apache.maven.plugin-tools</groupId>
7560
<artifactId>maven-plugin-annotations</artifactId>
76-
<version>3.6.1</version>
61+
<version>3.15.1</version>
7762
<scope>provided</scope>
7863
</dependency>
79-
<dependency>
80-
<groupId>org.apache.maven.shared</groupId>
81-
<artifactId>maven-shared-utils</artifactId>
82-
<version>3.3.3</version>
83-
</dependency>
8464

8565
<dependency>
8666
<groupId>com.fasterxml.jackson.core</groupId>
@@ -92,12 +72,12 @@
9272
<plugins>
9373
<plugin>
9474
<artifactId>maven-install-plugin</artifactId>
95-
<version>2.5.2</version>
75+
<version>3.1.3</version>
9676
</plugin>
9777
<plugin>
9878
<groupId>org.apache.maven.plugins</groupId>
9979
<artifactId>maven-plugin-plugin</artifactId>
100-
<version>3.9.0</version>
80+
<version>3.15.1</version>
10181
<configuration>
10282
<goalPrefix>refactor-first</goalPrefix>
10383
</configuration>

0 commit comments

Comments
 (0)