Merge pull request #30335 from dreis2211

* pr/30335:
  Remove checks for Java 9 compatibility in build.gradle files

Closes gh-30335
pull/30415/head
Stephane Nicoll 3 years ago
commit 9d20178105

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

@ -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-freemarker"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("jakarta.persistence:jakarta.persistence-api") 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") { implementation("org.hibernate:hibernate-core-jakarta") {
exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.activation", module: "javax.activation-api"
exclude group: "javax.persistence", module: "javax.persistence-api" exclude group: "javax.persistence", module: "javax.persistence-api"

@ -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-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) 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") { implementation("org.liquibase:liquibase-core") {
exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.activation", module: "javax.activation-api"
exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "javax.xml.bind", module: "jaxb-api"

@ -8,9 +8,7 @@ description = "Spring Boot web Groovy Templates smoke test"
dependencies { 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-groovy-templates"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-validation")) 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")) testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }

Loading…
Cancel
Save