Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source 
Closes gh-34015
This commit is contained in:
Moritz Halbritter
2023-01-31 10:20:36 +01:00
parent 3a80007e89 1a9f1cd2ed
commit 23f1c896c9
23 changed files with 73 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DockerTests.java
View File

@@ -16,11 +16,12 @@
package org.springframework.boot.maven;
import java.util.Base64;
import org.junit.jupiter.api.Test;
import org.springframework.boot.buildpack.platform.docker.configuration.DockerConfiguration;
import org.springframework.boot.buildpack.platform.docker.configuration.DockerHost;
import org.springframework.util.Base64Utils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -142,7 +143,7 @@ class DockerTests {
}
String decoded(String value) {
return new String(Base64Utils.decodeFromString(value));
return new String(Base64.getDecoder().decode(value));
}
}