Bump Spring Boot to 3.5.5 (#2621)
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
run: mvn clean verify javadoc:javadoc -DdetectOfflineLinks=false -PgenerateTestReport ${{ inputs.maven_properties }} --batch-mode
|
||||
@@ -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);
|
||||
|
||||
4
pom.xml
4
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>
|
||||
|
||||
Reference in New Issue
Block a user