From be981e45d12b0fc362f14e9e822ee5caecb2bb76 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sun, 20 Mar 2022 08:39:02 +0100 Subject: [PATCH] Remove checks for Java 9 compatibility in build.gradle files See gh-30335 --- .../spring-boot-launch-script-tests/build.gradle | 1 - .../spring-boot-smoke-test-jpa/build.gradle | 4 +--- .../spring-boot-smoke-test-liquibase/build.gradle | 4 +--- .../spring-boot-smoke-test-web-groovy-templates/build.gradle | 4 +--- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index 59f77e797d..fc08e3080e 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -40,5 +40,4 @@ task buildApp(type: GradleBuild) { intTest { dependsOn buildApp - enabled = !JavaVersion.current().java9Compatible } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle index 724003bc4b..5594b7e850 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle @@ -9,9 +9,7 @@ dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-freemarker")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation("jakarta.persistence:jakarta.persistence-api") - if (JavaVersion.current().java9Compatible) { - implementation("jakarta.xml.bind:jakarta.xml.bind-api") - } + implementation("jakarta.xml.bind:jakarta.xml.bind-api") implementation("org.hibernate:hibernate-core-jakarta") { exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.persistence", module: "javax.persistence-api" diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle index de2548df6e..1126e59d0b 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle @@ -9,9 +9,7 @@ dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) - if (JavaVersion.current().java9Compatible) { - implementation("jakarta.xml.bind:jakarta.xml.bind-api") - } + implementation("jakarta.xml.bind:jakarta.xml.bind-api") implementation("org.liquibase:liquibase-core") { exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.xml.bind", module: "jaxb-api" diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle index 88e11842cb..b56cb257af 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle @@ -8,9 +8,7 @@ description = "Spring Boot web Groovy Templates smoke test" dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-validation")) - if (JavaVersion.current().java9Compatible) { - implementation("jakarta.xml.bind:jakarta.xml.bind-api") - } + implementation("jakarta.xml.bind:jakarta.xml.bind-api") testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) }