Skip to content

Commit cd88b26

Browse files
SimonTaylorSimonTaylor
authored
Merge pull request #23 from spt-development/feature/spring-boot-3.2.0-upgrade
2 parents 2d7f620 + 469ab1e commit cd88b26

File tree

6 files changed

+40
-26
lines changed

6 files changed

+40
-26
lines changed

‎.github/workflows/owasp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
with:
1515
website: jdk.java.net
1616
release: 21
17-
- run: ./mvnw clean install dependency-check:check -DskipTests -B
17+
- run: ./mvnw clean install dependency-check:check -DnvdApiKey= -B

‎documentation/releases/release-3.2.0.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Dependencies
2+
3+
* Aligned dependencies with [Spring Boot 3.2.0](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.2-Release-Notes#dependency-upgrades).

‎pom.xml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>com.spt-development</groupId>
55
<artifactId>spt-development-logging-spring-boot</artifactId>
6-
<version>3.1.6-SNAPSHOT</version>
6+
<version>3.2.0-SNAPSHOT</version>
77

88
<name>logging-spring-boot</name>
99
<description>Library for integrating spt-development/spt-development-logging-spring into a Spring Boot application.</description>
@@ -40,37 +40,37 @@
4040
<maven.min.version>3.9.4</maven.min.version>
4141

4242
<!-- Dependency versions -->
43-
<spring-boot.version>3.1.5</spring-boot.version>
43+
<spring-boot.version>3.2.0</spring-boot.version>
4444
<spt-cid.version>2.0.12</spt-cid.version>
45-
<spt-logging-spring.version>3.0.11</spt-logging-spring.version>
45+
<spt-logging-spring.version>3.0.12</spt-logging-spring.version>
4646

4747
<!-- Plugin versions -->
48-
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
49-
<checkstyle-maven-plugin.version>3.3.0</checkstyle-maven-plugin.version>
50-
<dependency-check-maven.version>8.4.1</dependency-check-maven.version>
51-
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
52-
<findbugs-sec-bug-pattern.version>1.12.0</findbugs-sec-bug-pattern.version>
48+
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
49+
<checkstyle-maven-plugin.version>3.3.1</checkstyle-maven-plugin.version>
50+
<dependency-check-maven.version>9.0.2</dependency-check-maven.version>
5351
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
54-
<license-maven-plugin.version>2.2.0</license-maven-plugin.version>
52+
<license-maven-plugin.version>2.3.0</license-maven-plugin.version>
5553
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
56-
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
54+
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
5755
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
5856
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
59-
<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
60-
<maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
61-
<maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
57+
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
58+
<maven-jxr-plugin.version>3.3.1</maven-jxr-plugin.version>
59+
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
6260
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
6361
<maven-scm-plugin.version>2.0.1</maven-scm-plugin.version>
6462
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
65-
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
63+
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
6664
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
67-
<pitest-maven.version>1.15.1</pitest-maven.version>
68-
<spotbugs.version>4.7.3.6</spotbugs.version>
69-
<versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>
65+
<pitest-maven.version>1.15.3</pitest-maven.version>
66+
<spotbugs.version>4.8.1.0</spotbugs.version>
67+
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
7068

7169
<!-- Plugin dependencies -->
72-
<checkstyle.version>10.12.4</checkstyle.version>
73-
<pitest-junit5-plugin.version>1.2.0</pitest-junit5-plugin.version>
70+
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
71+
<findbugs-sec-bug-pattern.version>1.12.0</findbugs-sec-bug-pattern.version>
72+
<checkstyle.version>10.12.5</checkstyle.version>
73+
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
7474
</properties>
7575

7676
<dependencyManagement>
@@ -308,6 +308,9 @@
308308
<artifactId>dependency-check-maven</artifactId>
309309
<version>${dependency-check-maven.version}</version>
310310
<configuration>
311+
<!-- NVD API Key obtained from https://nvd.nist.gov/developers/request-an-api-key -->
312+
<nvdApiKey>${nvdApiKey}</nvdApiKey>
313+
311314
<!-- Assembly analyzer disabled because we don't have any .NET code/dlls -->
312315
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
313316
<!-- Node and retirejs analyzer disabled, because any js floating around isn't part of the main app -->

‎spt-development-logging-spring-boot-autoconfigure/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.spt-development</groupId>
77
<artifactId>spt-development-logging-spring-boot</artifactId>
8-
<version>3.1.6-SNAPSHOT</version>
8+
<version>3.2.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spt-development-logging-spring-boot-autoconfigure</artifactId>

‎spt-development-logging-spring-boot-starter/config/owasp/suppress.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3-
<!-- Low risk and not wanting to deviate from a Spring Boot dependency -->
3+
<!-- Not wanting to deviate from a Spring Boot dependency -->
44
<suppress>
55
<notes><![CDATA[
6-
file name: snakeyaml-1.33.jar
6+
file name: logback-classic-1.4.11.jar
77
]]></notes>
8-
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
9-
<vulnerabilityName>CVE-2022-1471</vulnerabilityName>
8+
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
9+
<vulnerabilityName>CVE-2023-6378</vulnerabilityName>
10+
</suppress>
11+
<!-- Not wanting to deviate from a Spring Boot dependency -->
12+
<suppress>
13+
<notes><![CDATA[
14+
file name: logback-core-1.4.11.jar
15+
]]></notes>
16+
<packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
17+
<vulnerabilityName>CVE-2023-6378</vulnerabilityName>
1018
</suppress>
1119
</suppressions>

‎spt-development-logging-spring-boot-starter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.spt-development</groupId>
77
<artifactId>spt-development-logging-spring-boot</artifactId>
8-
<version>3.1.6-SNAPSHOT</version>
8+
<version>3.2.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spt-development-logging-spring-boot-starter</artifactId>

0 commit comments

Comments
 (0)