Skip to content

Commit be981e4

Browse files
dreis2211snicoll
authored andcommitted
Remove checks for Java 9 compatibility in build.gradle files
See gh-30335
1 parent 2088381 commit be981e4

File tree

4 files changed

+3
-10
lines changed
  • spring-boot-tests

4 files changed

+3
-10
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ task buildApp(type: GradleBuild) {
4040

4141
intTest {
4242
dependsOn buildApp
43-
enabled = !JavaVersion.current().java9Compatible
4443
}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ dependencies {
99
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-freemarker"))
1010
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
1111
implementation("jakarta.persistence:jakarta.persistence-api")
12-
if (JavaVersion.current().java9Compatible) {
13-
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
14-
}
12+
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
1513
implementation("org.hibernate:hibernate-core-jakarta") {
1614
exclude group: "javax.activation", module: "javax.activation-api"
1715
exclude group: "javax.persistence", module: "javax.persistence-api"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ dependencies {
99
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
1010
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc"))
1111
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
12-
if (JavaVersion.current().java9Compatible) {
13-
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
14-
}
12+
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
1513
implementation("org.liquibase:liquibase-core") {
1614
exclude group: "javax.activation", module: "javax.activation-api"
1715
exclude group: "javax.xml.bind", module: "jaxb-api"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ description = "Spring Boot web Groovy Templates smoke test"
88
dependencies {
99
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates"))
1010
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-validation"))
11-
if (JavaVersion.current().java9Compatible) {
12-
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
13-
}
11+
implementation("jakarta.xml.bind:jakarta.xml.bind-api")
1412

1513
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
1614
}

0 commit comments

Comments
 (0)