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

Merge branch '2.4.x'

Browse Source 
Closes gh-25506
This commit is contained in:
Stephane Nicoll
2021-03-05 10:03:42 +01:00
parent 37dcb90876 2682b3803a
commit 76d0a7f8ba
8 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java
View File

@@ -98,7 +98,7 @@ abstract class AbstractArchiveIntegrationTests {
private JarAssert(File actual) {
super(actual, JarAssert.class);
assertThat(actual.exists());
assertThat(actual).exists();
}
JarAssert doesNotHaveEntryWithName(String name) {

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrati
@BeforeEach
void setUp() {
assertThat(registry.isRunning());
assertThat(registry.isRunning()).isTrue();
this.dockerClient = registry.getDockerClient();
this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
}