Skip to content

Commit f08dcab

Browse files
SimonTaylorSimonTaylor
authored
Merge pull request #46 from spt-development/feature/spring-boot-3.4.4-upgrade
Updated dependencies to align with Spring Boot 3.4.4
2 parents c18dac1 + 3428030 commit f08dcab

File tree

4 files changed

+36
-33
lines changed

4 files changed

+36
-33
lines changed

‎.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ jobs:
3838
- name: Run Maven - JDK 21
3939
run: ./mvnw clean verify -B
4040

41-
- name: Set up JDK 23
41+
- name: Set up JDK 24
4242
uses: oracle-actions/setup-java@v1
4343
with:
4444
website: jdk.java.net
45-
release: 23
45+
release: 24
4646

47-
- name: Run Maven - JDK 23
47+
- name: Run Maven - JDK 24
4848
run: ./mvnw clean verify -Pall-quality-gates -B
4949

50-
- name: Set up JDK 23 (MDC Disabled)
50+
- name: Set up JDK 24 (MDC Disabled)
5151
uses: oracle-actions/setup-java@v1
5252
with:
5353
website: jdk.java.net
54-
release: 23
54+
release: 24
5555

5656
- name: Run Maven - MDC disabled
5757
run: ./mvnw clean verify -Dspring.profiles.active=mdc-disabled -Pall-quality-gates -B

‎.github/workflows/latest-versions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111

12-
- name: Set up JDK 23
12+
- name: Set up JDK 24
1313
uses: oracle-actions/setup-java@v1
1414
with:
1515
website: jdk.java.net
16-
release: 23
16+
release: 24
1717

1818
- name: Run Maven
1919
run: ./mvnw clean versions:update-properties scm:check-local-modification -U -B

‎.github/workflows/owasp.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
${{ runner.os }}-maven-${{ steps.get-date.outputs.datetime }}
2626
${{ runner.os }}-maven-
2727
28-
- name: Set up JDK 23
28+
- name: Set up JDK 24
2929
uses: oracle-actions/setup-java@v1
3030
with:
3131
website: jdk.java.net
32-
release: 23
32+
release: 24
3333

3434
- name: Run Maven
3535
run: ./mvnw clean dependency-check:check -DnvdApiKey=${{ secrets.NVD_API_KEY }} -DnvdApiDelay=6000

‎pom.xml

+27-24
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.4.2</version>
9+
<version>3.4.4</version>
1010
<relativePath /> <!-- lookup parent from repository -->
1111
</parent>
1212

@@ -32,39 +32,39 @@
3232
<!-- Dependency versions -->
3333
<commons-collections.version>4.4</commons-collections.version>
3434
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
35-
<!-- Remove dependencyManagement entry for opentelemtry-semconv when upgrading opentelemtry-instrumentation -->
36-
<opentelemtry-instrumentation.version>2.12.0</opentelemtry-instrumentation.version>
37-
<opentelemtry-semconv.version>1.29.0-alpha</opentelemtry-semconv.version>
38-
<spt-development-audit-spring-boot.version>3.4.2</spt-development-audit-spring-boot.version>
39-
<spt-development-cid-jms-spring-boot.version>3.4.2</spt-development-cid-jms-spring-boot.version>
40-
<spt-development-cid-web-spring-boot.version>3.4.2</spt-development-cid-web-spring-boot.version>
41-
<spt-development-logging-spring-boot.version>3.4.2</spt-development-logging-spring-boot.version>
35+
<!-- Overriding Lombok version, to support JDK 24 -->
36+
<lombok.version>1.18.38</lombok.version>
37+
<opentelemtry-instrumentation.version>2.14.0</opentelemtry-instrumentation.version>
38+
<spt-development-audit-spring-boot.version>3.4.4</spt-development-audit-spring-boot.version>
39+
<spt-development-cid-jms-spring-boot.version>3.4.4</spt-development-cid-jms-spring-boot.version>
40+
<spt-development-cid-web-spring-boot.version>3.4.4</spt-development-cid-web-spring-boot.version>
41+
<spt-development-logging-spring-boot.version>3.4.4</spt-development-logging-spring-boot.version>
4242

4343
<!-- Test dependency versions -->
44-
<archunit.version>1.3.0</archunit.version>
45-
<awaitility.version>4.2.2</awaitility.version>
46-
<cucumber.version>7.20.1</cucumber.version>
47-
<junit-platform.version>1.11.4</junit-platform.version>
48-
<spt-development-test.version>3.1.15</spt-development-test.version>
49-
<testcontainers.version>1.20.4</testcontainers.version>
44+
<archunit.version>1.4.0</archunit.version>
45+
<awaitility.version>4.3.0</awaitility.version>
46+
<cucumber.version>7.22.0</cucumber.version>
47+
<junit-platform.version>1.12.1</junit-platform.version>
48+
<spt-development-test.version>3.1.16</spt-development-test.version>
49+
<testcontainers.version>1.20.6</testcontainers.version>
5050

5151
<!-- Plugin versions -->
5252
<checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
53-
<dependency-check-maven.version>12.0.1</dependency-check-maven.version>
54-
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
53+
<dependency-check-maven.version>12.1.1</dependency-check-maven.version>
54+
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
5555
<license-maven-plugin.version>2.5.0</license-maven-plugin.version>
5656
<maven-jxr-plugin.version>3.6.0</maven-jxr-plugin.version>
5757
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
5858
<maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
59-
<pitest-maven.version>1.17.4</pitest-maven.version>
60-
<spotbugs-plugin.version>4.8.6.6</spotbugs-plugin.version>
59+
<pitest-maven.version>1.19.0</pitest-maven.version>
60+
<spotbugs-plugin.version>4.9.3.0</spotbugs-plugin.version>
6161

6262
<!-- Plugin dependencies -->
63-
<checkstyle.version>10.21.2</checkstyle.version>
63+
<checkstyle.version>10.23.0</checkstyle.version>
6464
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
6565
<findbugs-sec-bug-pattern.version>1.13.0</findbugs-sec-bug-pattern.version>
66-
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
67-
<pmd.version>7.9.0</pmd.version>
66+
<pitest-junit5-plugin.version>1.2.2</pitest-junit5-plugin.version>
67+
<pmd.version>7.12.0</pmd.version>
6868
</properties>
6969

7070
<dependencyManagement>
@@ -96,10 +96,13 @@
9696
</dependency>
9797

9898
<!-- Dependencies added to avoid dependency convergence errors -->
99+
<!-- None -->
100+
101+
<!-- Overriding Lombok version, to support JDK 24 -->
99102
<dependency>
100-
<groupId>io.opentelemetry.semconv</groupId>
101-
<artifactId>opentelemetry-semconv</artifactId>
102-
<version>${opentelemtry-semconv.version}</version>
103+
<groupId>org.projectlombok</groupId>
104+
<artifactId>lombok</artifactId>
105+
<version>${lombok.version}</version>
103106
</dependency>
104107
</dependencies>
105108
</dependencyManagement>

0 commit comments

Comments
 (0)