Skip to content

Commit 8fcac6c

Browse files
jjohannesjjohannes
committed
Add JAKARTA_JWS_API rule
This was not properly separated from JAVAX_JWS_API.
1 parent d7b4388 commit 8fcac6c

File tree

4 files changed

+31
-32
lines changed

4 files changed

+31
-32
lines changed

‎samples/sample-all-deactivated/build.out‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ compileClasspath - Compile classpath for source set 'main'.
5555
+--- jakarta.validation:jakarta.validation-api:2.0.1 FAILED
5656
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.1 FAILED
5757
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 FAILED
58-
+--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 FAILED
58+
+--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
59+
| \--- jakarta.activation:jakarta.activation-api:1.2.2 FAILED
5960
+--- jakarta.xml.soap:jakarta.xml.soap-api:1.4.2 FAILED
6061
+--- jakarta.xml.ws:jakarta.xml.ws-api:2.3.3 FAILED
6162
+--- javassist:javassist:3.12.1.GA FAILED
@@ -88,7 +89,8 @@ compileClasspath - Compile classpath for source set 'main'.
8889
+--- javax.websocket:javax.websocket-client-api:1.0 FAILED
8990
+--- javax.ws.rs:javax.ws.rs-api:2.1.1 FAILED
9091
+--- javax.ws.rs:jsr311-api:1.1.1 FAILED
91-
+--- javax.xml.bind:jaxb-api:2.3.1 FAILED
92+
+--- javax.xml.bind:jaxb-api:2.3.1
93+
| \--- javax.activation:javax.activation-api:1.2.0 FAILED
9294
+--- javax.xml.soap:javax.xml.soap-api:1.4.0 FAILED
9395
+--- javax.xml.stream:stax-api:1.0 FAILED
9496
+--- javax.xml.ws:jaxws-api:2.3.1 FAILED
@@ -251,4 +253,6 @@ compileClasspath - Compile classpath for source set 'main'.
251253
+--- woodstox:wstx-lgpl:3.2.7 FAILED
252254
\--- com.google.collections:google-collections:1.0 FAILED
253255

256+
(*) - Indicates repeated occurrences of a transitive dependency subtree. Gradle expands transitive dependency subtrees only once per project; repeat occurrences only display the root of the subtree, followed by this annotation.
257+
254258
A web-based, searchable dependency report is available by adding the --scan option.

‎samples/sample-all/build.out‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,12 @@ compileClasspath - Compile classpath for source set 'main'.
7878
+--- jakarta.el:jakarta.el-api:4.0.0
7979
+--- jakarta.inject:jakarta.inject-api:1.0.5 -> com.jwebmp:javax.inject:1.1
8080
+--- jakarta.json:jakarta.json-api:1.1.6
81-
+--- jakarta.jws:jakarta.jws-api:3.0.0
81+
+--- jakarta.jws:jakarta.jws-api:3.0.0 -> jakarta.xml.ws:jakarta.xml.ws-api:3.0.1
82+
| +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
83+
| | \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
84+
| +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1
85+
| | \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
86+
| \--- jakarta.jws:jakarta.jws-api:3.0.0 -> jakarta.xml.ws:jakarta.xml.ws-api:3.0.1 (*)
8287
+--- jakarta.mail:jakarta.mail-api:2.1.0 (*)
8388
+--- jakarta.persistence:jakarta.persistence-api:3.0.0
8489
+--- jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7
@@ -89,14 +94,9 @@ compileClasspath - Compile classpath for source set 'main'.
8994
+--- jakarta.websocket:jakarta.websocket-api:2.1.1
9095
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.1
9196
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
92-
+--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
93-
| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
94-
+--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1
95-
| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
96-
+--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1
97-
| +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*)
98-
| +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 (*)
99-
| \--- jakarta.jws:jakarta.jws-api:3.0.0
97+
+--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*)
98+
+--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 (*)
99+
+--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1 (*)
100100
+--- javassist:javassist:3.12.1.GA -> org.javassist:javassist:3.29.1-GA
101101
+--- javax.activation:activation:1.1.1 -> javax.activation:javax.activation-api:1.2.0
102102
+--- javax.activation:javax.activation-api:1.2.0
@@ -109,7 +109,11 @@ compileClasspath - Compile classpath for source set 'main'.
109109
+--- javax.el:javax.el-api:3.0.0
110110
+--- javax.inject:javax.inject:1 -> com.jwebmp:javax.inject:1.1
111111
+--- javax.json:javax.json-api:1.1.4 -> jakarta.json:jakarta.json-api:1.1.6
112-
+--- javax.jws:javax.jws-api:1.1
112+
+--- javax.jws:javax.jws-api:1.1 -> javax.xml.ws:jaxws-api:2.3.1
113+
| +--- javax.xml.bind:jaxb-api:2.3.1
114+
| | \--- javax.activation:javax.activation-api:1.2.0
115+
| +--- javax.xml.soap:javax.xml.soap-api:1.4.0
116+
| \--- javax.annotation:javax.annotation-api:1.3.2
113117
+--- javax.mail:javax.mail-api:1.4.7 -> com.sun.mail:javax.mail:1.6.2 (*)
114118
+--- javax.mail:mail:1.4.7 -> com.sun.mail:javax.mail:1.6.2 (*)
115119
+--- javax.persistence:javax.persistence-api:2.2
@@ -128,14 +132,10 @@ compileClasspath - Compile classpath for source set 'main'.
128132
+--- javax.websocket:javax.websocket-client-api:1.0 -> org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2
129133
+--- javax.ws.rs:javax.ws.rs-api:2.1.1
130134
+--- javax.ws.rs:jsr311-api:1.1.1 -> javax.ws.rs:javax.ws.rs-api:2.1.1
131-
+--- javax.xml.bind:jaxb-api:2.3.1
132-
| \--- javax.activation:javax.activation-api:1.2.0
135+
+--- javax.xml.bind:jaxb-api:2.3.1 (*)
133136
+--- javax.xml.soap:javax.xml.soap-api:1.4.0
134137
+--- javax.xml.stream:stax-api:1.0 -> stax:stax-api:1.0.1
135-
+--- javax.xml.ws:jaxws-api:2.3.1
136-
| +--- javax.xml.bind:jaxb-api:2.3.1 (*)
137-
| +--- javax.xml.soap:javax.xml.soap-api:1.4.0
138-
| \--- javax.annotation:javax.annotation-api:1.3.2
138+
+--- javax.xml.ws:jaxws-api:2.3.1 (*)
139139
+--- jboss:javassist:3.8.0.GA -> org.javassist:javassist:3.29.1-GA
140140
+--- junit:junit-dep:4.8 -> junit:junit:4.12
141141
| \--- org.hamcrest:hamcrest-core:1.3 -> org.hamcrest:hamcrest:2.2

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaActivationApiRule;
2222
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaActivationImplementationRule;
2323
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaAnnotationApiRule;
24+
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaJwsApisRule;
2425
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaMailApiRule;
2526
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaServletApiRule;
2627
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaWebsocketApiRule;
@@ -43,8 +44,6 @@
4344
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxValidationApiRule;
4445
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxWebsocketApiRule;
4546
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxWsRsApiRule;
46-
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxXmlBindApiRule;
47-
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxXmlWsApiRule;
4847
import org.gradlex.jvm.dependency.conflict.detection.rules.logging.LoggingModuleIdentifiers;
4948
import org.gradlex.jvm.dependency.conflict.resolution.DefaultResolutionStrategy;
5049

@@ -362,7 +361,9 @@ public enum CapabilityDefinition {
362361
),
363362
JAVAX_JWS_API(HIGHEST_VERSION, JavaxJwsApisRule.class,
364363
"javax.jws:javax.jws-api",
365-
"jakarta.jws:jakarta.jws-api"
364+
"javax.xml.ws:jaxws-api",
365+
"jakarta.jws:jakarta.jws-api",
366+
"jakarta.xml.ws:jakarta.xml.ws-api"
366367
),
367368
JAVAX_MAIL_API(HIGHEST_VERSION, JavaxMailApiRule.class,
368369
"com.sun.mail:mailapi", // API only
@@ -445,12 +446,8 @@ public enum CapabilityDefinition {
445446
"jakarta.ws.rs:jakarta.ws.rs-api",
446447
"javax.ws.rs:javax.ws.rs-api"
447448
),
448-
JAVAX_XML_BIND_API(HIGHEST_VERSION, JavaxXmlBindApiRule.class,
449-
"javax.xml.bind:jaxb-api",
450-
"jakarta.xml.bind:jakarta.xml.bind-api"
451-
),
452-
JAVAX_XML_WS_API(HIGHEST_VERSION, JavaxXmlWsApiRule.class,
453-
"javax.xml.ws:jaxws-api",
449+
JAKARTA_JWS_API(HIGHEST_VERSION, JakartaJwsApisRule.class,
450+
"jakarta.jws:jakarta.jws-api",
454451
"jakarta.xml.ws:jakarta.xml.ws-api"
455452
),
456453

‎src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/jakarta/JavaxXmlBindApiRule.java‎ renamed to ‎src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/jakarta/JakartaJwsApisRule.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,15 @@
2525
import javax.inject.Inject;
2626

2727
@CacheableRule
28-
public abstract class JavaxXmlBindApiRule extends CapabilityDefinitionRule {
29-
30-
static final String FIRST_JAKARTA_VERSION = "3.0.0";
28+
public abstract class JakartaJwsApisRule extends CapabilityDefinitionRule {
3129

3230
@Inject
33-
public JavaxXmlBindApiRule(CapabilityDefinition rule) {
31+
public JakartaJwsApisRule(CapabilityDefinition rule) {
3432
super(rule);
3533
}
3634

3735
@Override
3836
protected boolean shouldApply(ModuleVersionIdentifier id) {
39-
return VersionNumber.parse(id.getVersion()).compareTo(VersionNumber.parse(FIRST_JAKARTA_VERSION)) < 0;
37+
return VersionNumber.parse(getVersion(id)).compareTo(VersionNumber.parse(JavaxJwsApisRule.FIRST_JAKARTA_VERSION)) >= 0;
4038
}
4139
}

0 commit comments

Comments
 (0)