Browse Source

Remove checks for Java 9 compatibility in build.gradle files

See gh-30335
pull/30415/head
dreis2211 4 years ago committed by Stephane Nicoll
parent
commit
be981e45d1
  1. 1
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
  2. 4
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jpa/build.gradle
  3. 4
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/build.gradle
  4. 4
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle

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

@ -40,5 +40,4 @@ task buildApp(type: GradleBuild) { @@ -40,5 +40,4 @@ task buildApp(type: GradleBuild) {
intTest {
dependsOn buildApp
enabled = !JavaVersion.current().java9Compatible
}

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

@ -9,9 +9,7 @@ dependencies { @@ -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"

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

@ -9,9 +9,7 @@ dependencies { @@ -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"

4
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" @@ -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"))
}

Loading…
Cancel
Save