Merge pull request #24 from spt-development/feature/spring-boot3.1.4-upgrade

Updated dependencies to align with Spring Boot 3.1.4

Author: SimonTaylor

.github/workflows/build.yml

@@ -16,16 +16,16 @@ jobs:
           distribution: 'temurin'
       - run: ./mvnw clean verify -B
 
-      - name: Set up JDK 20
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: oracle-actions/setup-java@v1
         with:
-          java-version: '20'
-          distribution: 'temurin'
+          website: jdk.java.net
+          release: 21
       - run: ./mvnw clean verify -Pall-quality-gates -B
 
-      - name: Set up JDK 20 (MDC disabled)
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21 (MDC Disabled)
+        uses: oracle-actions/setup-java@v1
         with:
-          java-version: '20'
-          distribution: 'temurin'
+          website: jdk.java.net
+          release: 21
       - run: ./mvnw clean verify -Dspring.profiles.active=mdc-disabled -Pall-quality-gates -B

.github/workflows/latest-versions.yml

@@ -9,9 +9,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 20
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: oracle-actions/setup-java@v1
         with:
-          java-version: '20'
-          distribution: 'temurin'
+          website: jdk.java.net
+          release: 21
       - run: ./mvnw clean versions:update-properties scm:check-local-modification -U -B

.github/workflows/owasp.yml

@@ -9,9 +9,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 20
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: oracle-actions/setup-java@v1
         with:
-          java-version: '20'
-          distribution: 'temurin'
+          website: jdk.java.net
+          release: 21
       - run: ./mvnw clean dependency-check:check -B

config/findbugs/exclude.xml

@@ -45,4 +45,18 @@
         <Method name="&lt;init&gt;"/>
         <Bug pattern="EI_EXPOSE_REP2" />
     </Match>
+
+    <!-- Assignment of library spring bean, no workaround to avoid warning -->
+    <Match>
+        <Class name="com.spt.development.demo.repository.AuditRepository" />
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="EI_EXPOSE_REP2" />
+    </Match>
+
+    <!-- Assignment of library spring bean, no workaround to avoid warning -->
+    <Match>
+        <Class name="com.spt.development.demo.repository.BookRepository" />
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="EI_EXPOSE_REP2" />
+    </Match>
 </FindBugsFilter>

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.3</version>
+		<version>3.1.4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -35,16 +35,16 @@
 		<commons-collections.version>4.4</commons-collections.version>
 		<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 		<guava.version>32.1.2-jre</guava.version>
-		<spt-development-audit-spring-boot.version>3.1.3</spt-development-audit-spring-boot.version>
-		<spt-development-cid-jms-spring-boot.version>3.1.3</spt-development-cid-jms-spring-boot.version>
-		<spt-development-cid-web-spring-boot.version>3.1.3</spt-development-cid-web-spring-boot.version>
-		<spt-development-logging-spring-boot.version>3.1.3</spt-development-logging-spring-boot.version>
+		<spt-development-audit-spring-boot.version>3.1.4</spt-development-audit-spring-boot.version>
+		<spt-development-cid-jms-spring-boot.version>3.1.4</spt-development-cid-jms-spring-boot.version>
+		<spt-development-cid-web-spring-boot.version>3.1.4</spt-development-cid-web-spring-boot.version>
+		<spt-development-logging-spring-boot.version>3.1.4</spt-development-logging-spring-boot.version>
 
 		<!-- Test dependency versions -->
 		<awaitility.version>4.2.0</awaitility.version>
 		<cucumber.version>7.14.0</cucumber.version>
 		<junit-platform.version>1.10.0</junit-platform.version>
-		<spt-development-test.version>3.0.9</spt-development-test.version>
+		<spt-development-test.version>3.0.10</spt-development-test.version>
 		<testcontainers.version>1.19.0</testcontainers.version>
 
 		<!-- Plugin versions -->

src/main/java/com/spt/development/demo/repository/AuditRepository.java

@@ -1,6 +1,7 @@
 package com.spt.development.demo.repository;
 
 import com.spt.development.audit.spring.AuditEvent;
+import jakarta.annotation.PostConstruct;
 import lombok.NonNull;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
@@ -20,9 +21,16 @@ public class AuditRepository extends JdbcDaoSupport {
     private static final String SCHEMA = "audit";
     private static final String TABLE = "event";
 
-    private SimpleJdbcInsert simpleJdbcInsert;
+    private final DataSource dataSource;
+
+    private SimpleJdbcInsert simpleJdbcInsert = null;
 
     public AuditRepository(final DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @PostConstruct
+    public void init() {
         setDataSource(dataSource);
     }
 

src/main/java/com/spt/development/demo/repository/BookRepository.java

@@ -1,6 +1,7 @@
 package com.spt.development.demo.repository;
 
 import com.spt.development.demo.domain.Book;
+import jakarta.annotation.PostConstruct;
 import lombok.NonNull;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -20,9 +21,16 @@ public class BookRepository extends JdbcDaoSupport {
     private static final String SCHEMA = "demo";
     private static final String TABLE = "book";
 
-    private SimpleJdbcInsert simpleJdbcInsert;
+    private final DataSource dataSource;
+
+    private SimpleJdbcInsert simpleJdbcInsert = null;
 
     public BookRepository(final DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @PostConstruct
+    public void init() {
         setDataSource(dataSource);
     }
 

src/test/java/com/spt/development/demo/repository/AuditRepositoryTest.java

@@ -88,6 +88,7 @@ void create_validAuditEvent_shouldConvertToInsert() {
 
     private AuditRepository createRepository(AuditRepositoryArgs args) {
         final AuditRepository repository = new AuditRepository(args.dataSource);
+        repository.init();
 
         ReflectionTestUtils.setField(repository, "simpleJdbcInsert", args.simpleJdbcInsert);
 

src/test/java/com/spt/development/demo/repository/BookRepositoryTest.java

@@ -25,6 +25,7 @@ void setJdbcTemplate_nullTemplateWhenSimpleJdbcInsertNotSet_shouldThrowException
 
     private BookRepository createRepository(BookRepositoryArgs args) {
         final BookRepository repository = new BookRepository(args.dataSource);
+        repository.init();
 
         ReflectionTestUtils.setField(repository, "simpleJdbcInsert", args.simpleJdbcInsert);