Skip to content

Commit c3be4dd

Browse files
committed
Add 'woodstox:wstx-lgpl' to WOODSTOX rule
1 parent fcf1a43 commit c3be4dd

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

samples/sample-all-deactivated/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ dependencies {
250250
implementation("stax:stax-api:1.0.1")
251251
implementation("velocity:velocity:1.4")
252252
implementation("woodstox:wstx-asl:2.9.3")
253+
implementation("woodstox:wstx-lgpl:3.2.7")
253254

254-
implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326
255-
256-
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
255+
// moved down: https://github.com/gradle/gradle/issues/22326
256+
implementation("com.google.collections:google-collections:1.0")
257257
}

samples/sample-all/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ dependencies {
253253
implementation("stax:stax-api:1.0.1")
254254
implementation("velocity:velocity:1.4")
255255
implementation("woodstox:wstx-asl:2.9.3")
256+
implementation("woodstox:wstx-lgpl:3.2.7")
256257

257-
implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326
258-
259-
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
258+
// moved down: https://github.com/gradle/gradle/issues/22326
259+
implementation("com.google.collections:google-collections:1.0")
260260
}
261261

262262
jvmDependencyConflicts {

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ public enum CapabilityDefinition {
274274
"org.codehaus.woodstox:woodstox-core-lgpl",
275275
"org.codehaus.woodstox:wstx-asl",
276276
"org.codehaus.woodstox:wstx-lgpl",
277-
"woodstox:wstx-asl"
277+
"woodstox:wstx-asl",
278+
"woodstox:wstx-lgpl"
278279
),
279280
JAKARTA_ACTIVATION_API(HIGHEST_VERSION, JakartaActivationApiRule.class,
280281
"jakarta.activation:jakarta.activation-api",

0 commit comments

Comments
 (0)