Upgraded to Spring Boot 3 and java 21

Author: sptdevos

.bettercodehub.yml

@@ -10,27 +10,8 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Repository checkout
-      uses: actions/checkout@v2
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-maven-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: OWASP dependency checks
-      run: mvn dependency-check:check
-    - name: Build with Maven
-      run: mvn clean verify
-    - name: Code coverage with Codecov  
-      uses: codecov/codecov-action@v1
-
+  call-workflow:
+    uses: 42BV/42-github-workflows/.github/workflows/maven-test.yml@main
+    with:
+      java-version: 21
+    secrets: inherit

.github/workflows/maven.yml

@@ -0,0 +1,24 @@
+name: Publish package to the Maven Central Repository
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-version:
+        required: false
+        description: Release-version (not required)
+      next-version:
+        required: false
+        description: Next development-version. (not required)
+      java-version:
+        required: true
+        default: '21'
+        description: Java-version to use for the deployment.
+
+jobs:
+  call-workflow:
+    uses: 42BV/42-github-workflows/.github/workflows/maven-release.yml@main
+    secrets: inherit
+    with:
+      release-version: ${{ github.event.inputs.release-version }}
+      next-version: ${{ github.event.inputs.next-version }}
+      java-version: ${{ github.event.inputs.java-version }}

.github/workflows/release.yml

@@ -1,38 +1,27 @@
 target/
 /.DS_Store
 !.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
 /.apt_generated
 /.classpath
 /.factorypath
 /.project
 /.settings
 /.springBeans
 /bin
-
-### IntelliJ IDEA ###
 /.idea
 /*.iws
 /*.iml
 /*.ipr
-
-### NetBeans ###
 /nbproject/private/
 /build/
 /nbbuild/
 /dist/
 /nbdist/
 /.nb-gradle/
-
-### Docker Postgres Logs ###
 /docker-std-err.log
 /docker-std-out.log
-
-### JVM error logs ###
 /hs_err_*.log
-
 /.ideaDataSources/
 /dataSources/
-
-
+.java-version
+pom.xml.versionsBackup

.gitignore

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.0.0] - 2025-12-04
+
+- Upgraded to Java 21 and Spring Boot 4
+
 ## [2.0.0] - 2019-08-29
 
 - Upgraded to Java 11  

CHANGELOG.md

@@ -1,9 +1,8 @@
-[![Build Status](https://github.com/42BV/heph/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/42BV/heph/actions?query=workflow%3A%22Java+CI+with+Maven%22)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/f08863da179d410c977bbf3e143b0b1a)](https://www.codacy.com/gh/42BV/heph/dashboard?utm_source=github.com&utm_medium=referral&utm_content=42BV/heph&utm_campaign=Badge_Grade)
-[![BCH compliance](https://bettercodehub.com/edge/badge/42BV/heph?branch=master)](https://bettercodehub.com/)
-[![codecov](https://codecov.io/gh/42BV/heph/branch/master/graph/badge.svg)](https://codecov.io/gh/42BV/heph)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/nl.42/heph/badge.svg)](https://maven-badges.herokuapp.com/maven-central/nl.42/heph)
-[![Javadocs](http://javadoc.io/badge/nl.42/heph.svg)](http://javadoc.io/doc/nl.42/heph)
+[![Java CI with Maven](https://github.com/42BV/heph/actions/workflows/maven.yml/badge.svg)](https://github.com/42BV/heph/actions/workflows/maven.yml)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/f08863da179d410c977bbf3e143b0b1a)](https://app.codacy.com/gh/42BV/heph/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+[![codecov](https://codecov.io/gh/42BV/heph/graph/badge.svg?token=VMj23kHCls)](https://codecov.io/gh/42BV/heph)
+[![Maven Central](https://img.shields.io/maven-central/v/nl.42/heph.svg?color=green)](https://central.sonatype.com/artifact/nl.42/heph)
+[![Javadocs](https://www.javadoc.io/badge2/nl.42/heph/javadoc.svg)](https://www.javadoc.io/doc/nl.42/heph)
 [![Apache 2](http://img.shields.io/badge/license-Apache%202-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
 # Heph
@@ -18,7 +17,7 @@ In order to use Heph to power your testsuite, simply add the following Maven dep
 <dependency>
     <groupId>nl.42</groupId>
     <artifactId>heph</artifactId>
-    <version>2.0.1</version>
+    <version>3.0.0</version>
 </dependency>
 ```
 

README.md

@@ -40,25 +40,19 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
 
-        <!-- Dependencies -->
-        <beanmapper.version>3.1.0</beanmapper.version>
-        <database.truncator.version>1.0.0</database.truncator.version>
-        <spring-boot.version>2.4.1</spring-boot.version>
-    </properties>
+        <spring-boot.version>3.5.8</spring-boot.version>
+        <beanmapper.version>6.0.0</beanmapper.version>
+        <database.truncator.version>2.0.0</database.truncator.version>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
+        <dependency-check-maven.version>12.1.9</dependency-check-maven.version>
+        <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
+        <central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
+        <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
+        <maven-source-plugin.version>3.4.0</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -85,17 +79,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -115,36 +98,24 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <configuration>
-                        <mavenExecutorId>forked-path</mavenExecutorId>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <releaseProfiles>release</releaseProfiles>
-                        <goals>deploy</goals>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>${dependency-check-maven.version}</version>
+                <configuration>
+                    <failBuildOnCVSS>0</failBuildOnCVSS>
+                    <skipProvidedScope>true</skipProvidedScope>
+                    <skipTestScope>true</skipTestScope>
+                    <skipRuntimeScope>true</skipRuntimeScope>
+                    <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+                    <suppressionFile>owasp-suppressions.xml</suppressionFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.6</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -160,19 +131,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <version>6.0.5</version>
-                <configuration>
-                    <failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
-                    <skipProvidedScope>true</skipProvidedScope>
-                    <skipTestScope>true</skipTestScope>
-                    <skipRuntimeScope>true</skipRuntimeScope>
-                    <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
-                    <suppressionFile>owasp-suppressions.xml</suppressionFile>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -184,10 +142,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
-                        <configuration>
-                            <source>${maven.compiler.source}</source>
-                        </configuration>
+                        <version>${maven-javadoc-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -200,7 +155,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>${maven-source-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -213,7 +168,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>${maven-gpg-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -224,6 +179,15 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>${central-publishing-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

pom.xml

@@ -1,23 +1,6 @@
 # Release to Maven Central
 
-1. Create a [ticket with Sonatype](http://central.sonatype.org/pages/ossrh-guide.html)  
-(This has to be done by our maintenance department once per project).
-
-2. Install a [gpg client](http://central.sonatype.org/pages/apache-maven.html#other-prerequisites) to sign the deployment artifacts  
-(This step has obviously to be done once per client).
-
-3. Prepare the release:  
-`$ mvn release:prepare`
-
-4. Perform the release:  
-`$ mvn release:perform`
-
-5. Verify the release on Maven central:
-- Navigate to [oss.sonatype.org](https://oss.sonatype.org/)
-- Log in
-- Go to 'Staging Repositories'
-- Search on '42'
-- Select the artifact
-- Press 'close'
-- Wait for closing to finish
-- Press 'release'
+1. Run the github action "Publish package to the Maven Central Repository"
+2. Wait for the release to complete
+3. Go to https://central.sonatype.com/publishing and publish the artifact
+   (sonatype credentials in tpm)

sonatype-release-doc.md

@@ -1,9 +1,9 @@
 package nl._42.heph;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -23,7 +23,7 @@
 import nl._42.heph.domain.Person;
 import nl._42.heph.shared.AbstractSpringTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.ReflectionUtils;