Migrated to Java 25, Springboot 3.5.7

Author: petruki

.github/workflows/tf-queue.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v5
       with:
-        java-version: 21
+        java-version: 25
         distribution: 'temurin'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

README.md

@@ -22,9 +22,9 @@
 # Running
 
 **Requirements**
-- Java 11
+- Java 25
 - Kafka
-- Maven 3.8
+- Maven 3.11
 
 * * *
 

pom.xml

@@ -22,20 +22,22 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.6</version>
+		<version>3.5.7</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>21</java.version>
+		<java.version>25</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
 		<jsonwebtoken.version>0.13.0</jsonwebtoken.version>
-		<springdoc-openapi-starter-webmvc-ui.version>2.8.13</springdoc-openapi-starter-webmvc-ui.version>
-		<switcher-client.version>2.4.1</switcher-client.version>
+		<springdoc-openapi-starter-webmvc-ui.version>2.8.14</springdoc-openapi-starter-webmvc-ui.version>
+		<switcher-client.version>2.5.1</switcher-client.version>
+
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
 	</properties>
 
 	<profiles>
@@ -142,6 +144,22 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 </project>

src/main/java/com/trackerforce/queue/config/OpenAPIConfiguration.java

@@ -11,38 +11,38 @@
 @Configuration
 public class OpenAPIConfiguration {
 
-	private final ConfigProperties configProperties;
+	private final ServiceConfig.Docs docs;
 
-	public OpenAPIConfiguration(ConfigProperties configProperties) {
-		this.configProperties = configProperties;
+	public OpenAPIConfiguration(ServiceConfig serviceConfig) {
+		this.docs = serviceConfig.docs();
 	}
 
 	@Bean
 	public OpenAPI customOpenAPI() {
 		return new OpenAPI()
-				.addServersItem(new Server().url(configProperties.url()))
+				.addServersItem(new Server().url(docs.url()))
 				.info(getInfo());
 	}
 
 	private Info getInfo() {
 		return new Info()
-				.title(configProperties.title())
-				.description(configProperties.description())
-				.version(configProperties.version())
+				.title(docs.title())
+				.description(docs.description())
+				.version(docs.version())
 				.contact(getContact())
 				.license(getLicense());
 	}
 
 	private License getLicense() {
 		return new License()
-				.name(configProperties.license().type())
-				.url(configProperties.license().url());
+				.name(docs.license().type())
+				.url(docs.license().url());
 	}
 
 	private Contact getContact() {
 		return new Contact()
-				.name(configProperties.contact().author())
-				.email(configProperties.contact().email());
+				.name(docs.contact().author())
+				.email(docs.contact().email());
 	}
 
 }

…force/queue/config/ConfigProperties.java …kerforce/queue/config/ServiceConfig.javasrc/main/java/com/trackerforce/queue/config/ConfigProperties.java renamed to src/main/java/com/trackerforce/queue/config/ServiceConfig.java src/main/java/com/trackerforce/queue/config/ConfigProperties.java renamed to src/main/java/com/trackerforce/queue/config/ServiceConfig.java

@@ -2,20 +2,26 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "service.docs")
-public record ConfigProperties(
+@ConfigurationProperties(prefix = "service")
+public record ServiceConfig(
+		Docs docs
+) {
+
+	public record Docs(
 		String title,
 		String description,
 		String version,
+		String releaseTime,
 		String url,
 		License license,
 		Contact contact) {
 
-	public record License(
+		public record License(
 			String type,
-			String url) {}
+			String url) { }
 
-	public record Contact(
+		public record Contact(
 			String author,
-			String email) {}
+			String email) { }
+	}
 }

src/main/resources/snapshots/default.json

@@ -1,37 +1,35 @@
 {
-  "data": {
-    "domain": {
-      "name": "Trackerforce",
-      "version": 1632013079337,
-      "group": [
-        {
-          "name": "Services",
-          "config": [
-            {
-              "key": "ASYNC_QUEUE",
-              "strategies": [],
-              "components": [
-                "queue-service"
-              ],
-              "description": "Uses asynchronous calls to the streaming agent.",
-              "activated": false
-            },
-            {
-              "key": "ML_SERVICE",
-              "strategies": [],
-              "components": [
-                "queue-service"
-              ],
-              "description": "Invoke Machine Learning Engine Service",
-              "activated": true
-            }
-          ],
-          "description": "",
-          "activated": true
-        }
-      ],
-      "description": "",
-      "activated": true
-    }
+  "domain": {
+    "name": "Trackerforce",
+    "version": 1632013079337,
+    "group": [
+      {
+        "name": "Services",
+        "config": [
+          {
+            "key": "ASYNC_QUEUE",
+            "strategies": [],
+            "components": [
+              "queue-service"
+            ],
+            "description": "Uses asynchronous calls to the streaming agent.",
+            "activated": false
+          },
+          {
+            "key": "ML_SERVICE",
+            "strategies": [],
+            "components": [
+              "queue-service"
+            ],
+            "description": "Invoke Machine Learning Engine Service",
+            "activated": true
+          }
+        ],
+        "description": "",
+        "activated": true
+      }
+    ],
+    "description": "",
+    "activated": true
   }
 }