Skip to content

Commit 4258953

Browse files
committed
Ensure that building the SNI test apps produces Java 17 bytecode
See gh-41980
1 parent d756bf4 commit 4258953

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-client-app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ plugins {
55

66
apply plugin: "io.spring.dependency-management"
77

8+
java {
9+
sourceCompatibility = '17'
10+
targetCompatibility = '17'
11+
}
12+
813
repositories {
914
maven { url "file:${rootDir}/../int-test-maven-repository"}
1015
mavenCentral()

spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-reactive-app/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
22

33
plugins {
44
id "java"
5-
id "org.springframework.boot" version "3.3.0-SNAPSHOT"
5+
id "org.springframework.boot"
66
}
77

88
apply plugin: "io.spring.dependency-management"
99

10+
java {
11+
sourceCompatibility = '17'
12+
targetCompatibility = '17'
13+
}
14+
1015
repositories {
1116
maven { url "file:${rootDir}/../int-test-maven-repository"}
1217
mavenCentral()

spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-servlet-app/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
22

33
plugins {
44
id "java"
5-
id "org.springframework.boot" version "3.3.0-SNAPSHOT"
5+
id "org.springframework.boot"
66
}
77

88
apply plugin: "io.spring.dependency-management"
99

10+
java {
11+
sourceCompatibility = '17'
12+
targetCompatibility = '17'
13+
}
14+
1015
repositories {
1116
maven { url "file:${rootDir}/../int-test-maven-repository"}
1217
mavenCentral()

spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/src/intTest/java/org/springframework/boot/sni/SniIntegrationTests.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Map;
2222

2323
import org.awaitility.Awaitility;
24+
import org.awaitility.core.ConditionTimeoutException;
2425
import org.junit.jupiter.params.ParameterizedTest;
2526
import org.junit.jupiter.params.provider.CsvSource;
2627
import org.testcontainers.containers.GenericContainer;
@@ -56,7 +57,13 @@ class SniIntegrationTests {
5657
void home(String webStack, String server) {
5758
try (ApplicationContainer serverContainer = new ServerApplicationContainer(webStack, server)) {
5859
serverContainer.start();
59-
Awaitility.await().atMost(Duration.ofSeconds(60)).until(serverContainer::isRunning);
60+
try {
61+
Awaitility.await().atMost(Duration.ofSeconds(60)).until(serverContainer::isRunning);
62+
}
63+
catch (ConditionTimeoutException ex) {
64+
System.out.println(serverContainer.getLogs());
65+
throw ex;
66+
}
6067
String serverLogs = serverContainer.getLogs();
6168
assertThat(serverLogs).contains(SERVER_START_MESSAGES.get(server));
6269
try (ApplicationContainer clientContainer = new ClientApplicationContainer()) {

0 commit comments

Comments
 (0)