Skip to content

Commit ca5507e

Browse files
committed
Merge pull request #45025 from DimaVilda
* pr/45025: Remove unnecessary excludes on javax.xml.bind:jaxb-api Closes gh-45025
2 parents 4732958 + 31daa0f commit ca5507e

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

spring-boot-project/spring-boot-autoconfigure/build.gradle

+2-7
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,7 @@ dependencies {
142142
optional("org.infinispan:infinispan-jcache")
143143
optional("org.infinispan:infinispan-spring6-embedded")
144144
optional("org.influxdb:influxdb-java")
145-
optional("org.jooq:jooq") {
146-
exclude group: "javax.xml.bind", module: "jaxb-api"
147-
}
145+
optional("org.jooq:jooq")
148146
optional("org.liquibase:liquibase-core") {
149147
exclude group: "javax.xml.bind", module: "jaxb-api"
150148
}
@@ -175,7 +173,6 @@ dependencies {
175173
optional("org.springframework.data:spring-data-envers") {
176174
exclude group: "javax.activation", module: "javax.activation-api"
177175
exclude group: "javax.persistence", module: "javax.persistence-api"
178-
exclude group: "javax.xml.bind", module: "jaxb-api"
179176
exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
180177
}
181178
optional("org.springframework.data:spring-data-jpa")
@@ -198,9 +195,7 @@ dependencies {
198195
optional("org.springframework.pulsar:spring-pulsar-reactive")
199196
optional("org.springframework.security:spring-security-acl")
200197
optional("org.springframework.security:spring-security-config")
201-
optional("org.springframework.security:spring-security-data") {
202-
exclude group: "javax.xml.bind", module: "jaxb-api"
203-
}
198+
optional("org.springframework.security:spring-security-data")
204199
optional("org.springframework.security:spring-security-messaging")
205200
optional("org.springframework.security:spring-security-oauth2-authorization-server")
206201
optional("org.springframework.security:spring-security-oauth2-client")

spring-boot-project/spring-boot-docs/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,14 @@ dependencies {
110110
implementation("org.hibernate.orm:hibernate-jcache") {
111111
exclude group: "javax.activation", module: "javax.activation-api"
112112
exclude group: "javax.persistence", module: "javax.persistence-api"
113-
exclude group: "javax.xml.bind", module: "jaxb-api"
114113
exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
115114
}
116115
implementation("org.htmlunit:htmlunit") {
117116
exclude group: "commons-logging", module: "commons-logging"
118117
exclude group: "xml-apis", module: "xml-apis"
119118
}
120119
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
121-
implementation("org.jooq:jooq") {
122-
exclude group: "javax.xml.bind", module: "jaxb-api"
123-
}
120+
implementation("org.jooq:jooq")
124121
implementation("org.mockito:mockito-core")
125122
implementation("org.mongodb:mongodb-driver-sync")
126123
implementation("org.postgresql:r2dbc-postgresql")
@@ -145,7 +142,6 @@ dependencies {
145142
implementation("org.springframework.data:spring-data-envers") {
146143
exclude group: "javax.activation", module: "javax.activation-api"
147144
exclude group: "javax.persistence", module: "javax.persistence-api"
148-
exclude group: "javax.xml.bind", module: "jaxb-api"
149145
exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
150146
}
151147
implementation("org.springframework.data:spring-data-jpa")

spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ dependencies {
2020
api("org.skyscreamer:jsonassert")
2121
api("org.springframework:spring-core")
2222
api("org.springframework:spring-test")
23-
api("org.xmlunit:xmlunit-core") {
24-
exclude group: "javax.xml.bind", module: "jaxb-api"
25-
}
23+
api("org.xmlunit:xmlunit-core")
2624
}
2725

2826
checkRuntimeClasspathForConflicts {

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ dependencies {
106106
testImplementation("org.eclipse:yasson")
107107
testImplementation("org.hibernate.validator:hibernate-validator")
108108
testImplementation("org.hsqldb:hsqldb")
109-
testImplementation("org.jooq:jooq") {
110-
exclude group: "javax.xml.bind", module: "jaxb-api"
111-
}
109+
testImplementation("org.jooq:jooq")
112110
testImplementation("org.junit.jupiter:junit-jupiter")
113111
testImplementation("org.junit.platform:junit-platform-engine")
114112
testImplementation("org.junit.platform:junit-platform-launcher")

spring-boot-project/spring-boot/build.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ dependencies {
7070
optional("org.hamcrest:hamcrest-library")
7171
optional("org.hibernate.orm:hibernate-core")
7272
optional("org.hibernate.validator:hibernate-validator")
73-
optional("org.jooq:jooq") {
74-
exclude(group: "javax.xml.bind", module: "jaxb-api")
75-
}
73+
optional("org.jooq:jooq")
7674
optional("org.liquibase:liquibase-core") {
7775
exclude(group: "javax.xml.bind", module: "jaxb-api")
7876
}
@@ -148,7 +146,6 @@ dependencies {
148146

149147
testRuntimeOnly("org.testcontainers:jdbc") {
150148
exclude group: "javax.annotation", module: "javax.annotation-api"
151-
exclude group: "javax.xml.bind", module: "jaxb-api"
152149
}
153150

154151
tomcatDistribution("org.apache.tomcat:tomcat:${tomcatVersion}@zip")

0 commit comments

Comments
 (0)