Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Version 2.4
* [Fix] [#238](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/238) Patch DSL now works for dependencies with non-standard variant names (e.g. com.google.guava).
* [Fix] [#251](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/251) jakarta.xml.ws:jakarta.xml.ws-api no longer clashes with jakarta.jws:jakarta.jws-api for versions <= 4.0
* [Deprecation] [#251](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/251) Deprecate GuavaComponentRule in favor of more general patch DSL.

## Version 2.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public JakartaJwsApiRule(CapabilityDefinition rule) {

@Override
protected boolean shouldApply(ModuleVersionIdentifier id) {
if (id.getName().equals("jakarta.xml.ws:jakarta.xml.ws-api")) {
if (id.getName().equals("jakarta.xml.ws-api")) {
return VersionNumber.parse(getVersion(id)).compareTo(VersionNumber.parse(JWS_MERGER_VERSION)) >= 0;
}
return true;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.gradlex.jvm.dependency.conflict.test.issues

import org.gradlex.jvm.dependency.conflict.test.fixture.GradleBuild
import spock.lang.Issue
import spock.lang.Specification

@Issue("https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/243")
class Issue243Test extends Specification {

@Delegate
GradleBuild build = new GradleBuild()

def "works for older versions"() {
given:
buildFile << """
plugins {
id("org.gradlex.jvm-dependency-conflict-detection")
id("java-library")
}

repositories {
mavenCentral()
}

dependencies {
implementation("jakarta.xml.ws:jakarta.xml.ws-api:3.0.1")
implementation("jakarta.jws:jakarta.jws-api:3.0.0")
}
"""

expect:
dependenciesCompile().output.contains '''
compileClasspath - Compile classpath for source set 'main'.
+--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1
| +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
| | \\--- com.sun.activation:jakarta.activation:2.0.1
| +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1
| | \\--- com.sun.activation:jakarta.activation:2.0.1
| \\--- jakarta.jws:jakarta.jws-api:3.0.0
\\--- jakarta.jws:jakarta.jws-api:3.0.0
'''
}
}
Loading