diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 873730bb35d6..5a50dd0f1ea2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -142,9 +142,7 @@ dependencies { optional("org.infinispan:infinispan-jcache") optional("org.infinispan:infinispan-spring6-embedded") optional("org.influxdb:influxdb-java") - optional("org.jooq:jooq") { - exclude group: "javax.xml.bind", module: "jaxb-api" - } + optional("org.jooq:jooq") optional("org.liquibase:liquibase-core") { exclude group: "javax.xml.bind", module: "jaxb-api" } @@ -175,7 +173,6 @@ dependencies { optional("org.springframework.data:spring-data-envers") { exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.persistence", module: "javax.persistence-api" - exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec" } optional("org.springframework.data:spring-data-jpa") @@ -198,9 +195,7 @@ dependencies { optional("org.springframework.pulsar:spring-pulsar-reactive") optional("org.springframework.security:spring-security-acl") optional("org.springframework.security:spring-security-config") - optional("org.springframework.security:spring-security-data") { - exclude group: "javax.xml.bind", module: "jaxb-api" - } + optional("org.springframework.security:spring-security-data") optional("org.springframework.security:spring-security-messaging") optional("org.springframework.security:spring-security-oauth2-authorization-server") optional("org.springframework.security:spring-security-oauth2-client") diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 87a99024488b..00bb4a3a53a4 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -110,7 +110,6 @@ dependencies { implementation("org.hibernate.orm:hibernate-jcache") { exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.persistence", module: "javax.persistence-api" - exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec" } implementation("org.htmlunit:htmlunit") { @@ -118,9 +117,7 @@ dependencies { exclude group: "xml-apis", module: "xml-apis" } implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("org.jooq:jooq") { - exclude group: "javax.xml.bind", module: "jaxb-api" - } + implementation("org.jooq:jooq") implementation("org.mockito:mockito-core") implementation("org.mongodb:mongodb-driver-sync") implementation("org.postgresql:r2dbc-postgresql") @@ -145,7 +142,6 @@ dependencies { implementation("org.springframework.data:spring-data-envers") { exclude group: "javax.activation", module: "javax.activation-api" exclude group: "javax.persistence", module: "javax.persistence-api" - exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec" } implementation("org.springframework.data:spring-data-jpa") diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle index c5a856d8fb6e..cdfed4985aa1 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle @@ -20,9 +20,7 @@ dependencies { api("org.skyscreamer:jsonassert") api("org.springframework:spring-core") api("org.springframework:spring-test") - api("org.xmlunit:xmlunit-core") { - exclude group: "javax.xml.bind", module: "jaxb-api" - } + api("org.xmlunit:xmlunit-core") } checkRuntimeClasspathForConflicts { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 4e078f780bb7..7f03b0d718e1 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -106,9 +106,7 @@ dependencies { testImplementation("org.eclipse:yasson") testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.hsqldb:hsqldb") - testImplementation("org.jooq:jooq") { - exclude group: "javax.xml.bind", module: "jaxb-api" - } + testImplementation("org.jooq:jooq") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.platform:junit-platform-engine") testImplementation("org.junit.platform:junit-platform-launcher") diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index fb8fff7b9fc9..b731fb9348d3 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -70,9 +70,7 @@ dependencies { optional("org.hamcrest:hamcrest-library") optional("org.hibernate.orm:hibernate-core") optional("org.hibernate.validator:hibernate-validator") - optional("org.jooq:jooq") { - exclude(group: "javax.xml.bind", module: "jaxb-api") - } + optional("org.jooq:jooq") optional("org.liquibase:liquibase-core") { exclude(group: "javax.xml.bind", module: "jaxb-api") } @@ -148,7 +146,6 @@ dependencies { testRuntimeOnly("org.testcontainers:jdbc") { exclude group: "javax.annotation", module: "javax.annotation-api" - exclude group: "javax.xml.bind", module: "jaxb-api" } tomcatDistribution("org.apache.tomcat:tomcat:${tomcatVersion}@zip")