Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45025 from DimaVilda

Browse Source 
* pr/45025:
  Remove unnecessary excludes on javax.xml.bind:jaxb-api

Closes gh-45025
This commit is contained in:
Phillip Webb
2025-04-08 11:43:39 -07:00
parent 4732958f5c 31daa0f0d6
commit ca5507e5cf
5 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

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

6
spring-boot-project/spring-boot-docs/build.gradle
View File

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

4
spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle
View File

@@ -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 {

4
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

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

5
spring-boot-project/spring-boot/build.gradle
View File

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