From b5a2d39518dfe1fe4dfba09d694b19461b6ef79f Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Mon, 25 Aug 2025 15:50:15 +0300
Subject: [PATCH] Bump Spring Boot to 3.5.5 (#2621)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .github/workflows/release.yaml                   |  2 +-
 .github/workflows/reusable_workflow_verify.yaml  |  2 +-
 .../org/eclipse/hawkbit/sdk/HawkbitClient.java   | 16 +++++++++-------
 pom.xml                                          |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 912709565..417933c64 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -117,7 +117,7 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Run build javadoc, verify (test)
-        run: mvn verify javadoc:jar -PgenerateTestReport -Drevision=${{ inputs.revision }} --batch-mode
+        run: mvn verify javadoc:jar -DdetectOfflineLinks=false -PgenerateTestReport -Drevision=${{ inputs.revision }} --batch-mode
 
       - name: "Deploy ${{ inputs.revision }}"
         run: mvn deploy -DskipTests -Ppublish -Drevision=${{ inputs.revision }} -DskipPublishing=${{ inputs.dry_run }} --batch-mode
diff --git a/.github/workflows/reusable_workflow_verify.yaml b/.github/workflows/reusable_workflow_verify.yaml
index 4c4d0cef1..f9f276846 100644
--- a/.github/workflows/reusable_workflow_verify.yaml
+++ b/.github/workflows/reusable_workflow_verify.yaml
@@ -62,4 +62,4 @@ jobs:
         run: mvn license:check -PcheckLicense --batch-mode
 
       - name: Run tests & javadoc
-        run: mvn clean verify javadoc:javadoc -PgenerateTestReport ${{ inputs.maven_properties }} --batch-mode
\ No newline at end of file
+        run: mvn clean verify javadoc:javadoc -DdetectOfflineLinks=false -PgenerateTestReport ${{ inputs.maven_properties }} --batch-mode
\ No newline at end of file
diff --git a/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java b/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java
index d7002697b..6a7c3a201 100644
--- a/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java
+++ b/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java
@@ -90,16 +90,17 @@ import org.springframework.web.multipart.MultipartFile;
 public class HawkbitClient {
 
     private static final String AUTHORIZATION = "Authorization";
+    // @formatter:off
     public static final BiFunction<Tenant, Controller, RequestInterceptor> DEFAULT_REQUEST_INTERCEPTOR_FN =
             (tenant, controller) -> controller == null
                     ? template ->
-                            template.header(
-                                    AUTHORIZATION,
-                                    "Basic " + Base64.getEncoder().encodeToString(
-                                            (Objects.requireNonNull(tenant.getUsername(), "User is null!") +
-                                                    ":" +
-                                                    Objects.requireNonNull(tenant.getPassword(), "Password is not available!"))
-                                            .getBytes(StandardCharsets.ISO_8859_1)))
+                        template.header(
+                                AUTHORIZATION,
+                                "Basic " + Base64.getEncoder().encodeToString(
+                                        (Objects.requireNonNull(tenant.getUsername(), "User is null!") +
+                                                ":" +
+                                                Objects.requireNonNull(tenant.getPassword(), "Password is not available!"))
+                                        .getBytes(StandardCharsets.ISO_8859_1)))
                     : template -> {
                         if (!ObjectUtils.isEmpty(tenant.getGatewayToken())) {
                             template.header(AUTHORIZATION, "GatewayToken " + tenant.getGatewayToken());
@@ -107,6 +108,7 @@ public class HawkbitClient {
                             template.header(AUTHORIZATION, "TargetToken " + controller.getSecurityToken());
                         } // else do not send authentication, no auth or certificate based
                     };
+    // @formatter:on
     private static final ErrorDecoder DEFAULT_ERROR_DECODER_0 = new ErrorDecoder.Default();
     public static final ErrorDecoder DEFAULT_ERROR_DECODER = (methodKey, response) -> {
         final Exception e = DEFAULT_ERROR_DECODER_0.decode(methodKey, response);
diff --git a/pom.xml b/pom.xml
index 378db2e47..977420456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
     </parent>
 
     <groupId>org.eclipse.hawkbit</groupId>
@@ -49,7 +49,7 @@
         <java.client.version>17</java.client.version>
 
         <!-- must be the same as the parent version -->
-        <spring.boot.version>3.5.4</spring.boot.version>
+        <spring.boot.version>3.5.5</spring.boot.version>
         <spring.cloud.version>2025.0.0</spring.cloud.version>
         <springdoc-openapi.version>2.8.10</springdoc-openapi.version>
         <spring.plugin.core.version>3.0.0</spring.plugin.core.version>