Skip to content

Add JAKARTA_JWS_API rule #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

Add JAKARTA_JWS_API rule #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions samples/sample-all-deactivated/build.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ compileClasspath - Compile classpath for source set 'main'.
+--- jakarta.validation:jakarta.validation-api:2.0.1 FAILED
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.1 FAILED
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 FAILED
+--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 FAILED
+--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
| \--- jakarta.activation:jakarta.activation-api:1.2.2 FAILED
+--- jakarta.xml.soap:jakarta.xml.soap-api:1.4.2 FAILED
+--- jakarta.xml.ws:jakarta.xml.ws-api:2.3.3 FAILED
+--- javassist:javassist:3.12.1.GA FAILED
Expand Down Expand Up @@ -88,7 +89,8 @@ compileClasspath - Compile classpath for source set 'main'.
+--- javax.websocket:javax.websocket-client-api:1.0 FAILED
+--- javax.ws.rs:javax.ws.rs-api:2.1.1 FAILED
+--- javax.ws.rs:jsr311-api:1.1.1 FAILED
+--- javax.xml.bind:jaxb-api:2.3.1 FAILED
+--- javax.xml.bind:jaxb-api:2.3.1
| \--- javax.activation:javax.activation-api:1.2.0 FAILED
+--- javax.xml.soap:javax.xml.soap-api:1.4.0 FAILED
+--- javax.xml.stream:stax-api:1.0 FAILED
+--- javax.xml.ws:jaxws-api:2.3.1 FAILED
Expand Down Expand Up @@ -251,4 +253,6 @@ compileClasspath - Compile classpath for source set 'main'.
+--- woodstox:wstx-lgpl:3.2.7 FAILED
\--- com.google.collections:google-collections:1.0 FAILED

(*) - 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.

A web-based, searchable dependency report is available by adding the --scan option.
32 changes: 16 additions & 16 deletions samples/sample-all/build.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ compileClasspath - Compile classpath for source set 'main'.
+--- jakarta.el:jakarta.el-api:4.0.0
+--- jakarta.inject:jakarta.inject-api:1.0.5 -> com.jwebmp:javax.inject:1.1
+--- jakarta.json:jakarta.json-api:1.1.6
+--- jakarta.jws:jakarta.jws-api:3.0.0
+--- jakarta.jws:jakarta.jws-api:3.0.0 -> 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.activation:jakarta.activation-api:2.1.1
| +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1
| | \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
| \--- jakarta.jws:jakarta.jws-api:3.0.0 -> jakarta.xml.ws:jakarta.xml.ws-api:3.0.1 (*)
+--- jakarta.mail:jakarta.mail-api:2.1.0 (*)
+--- jakarta.persistence:jakarta.persistence-api:3.0.0
+--- jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7
Expand All @@ -89,14 +94,9 @@ compileClasspath - Compile classpath for source set 'main'.
+--- jakarta.websocket:jakarta.websocket-api:2.1.1
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.1
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
+--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
+--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1
| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1
+--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1
| +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*)
| +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 (*)
| \--- jakarta.jws:jakarta.jws-api:3.0.0
+--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*)
+--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 (*)
+--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1 (*)
+--- javassist:javassist:3.12.1.GA -> org.javassist:javassist:3.29.1-GA
+--- javax.activation:activation:1.1.1 -> javax.activation:javax.activation-api:1.2.0
+--- javax.activation:javax.activation-api:1.2.0
Expand All @@ -109,7 +109,11 @@ compileClasspath - Compile classpath for source set 'main'.
+--- javax.el:javax.el-api:3.0.0
+--- javax.inject:javax.inject:1 -> com.jwebmp:javax.inject:1.1
+--- javax.json:javax.json-api:1.1.4 -> jakarta.json:jakarta.json-api:1.1.6
+--- javax.jws:javax.jws-api:1.1
+--- javax.jws:javax.jws-api:1.1 -> javax.xml.ws:jaxws-api:2.3.1
| +--- javax.xml.bind:jaxb-api:2.3.1
| | \--- javax.activation:javax.activation-api:1.2.0
| +--- javax.xml.soap:javax.xml.soap-api:1.4.0
| \--- javax.annotation:javax.annotation-api:1.3.2
+--- javax.mail:javax.mail-api:1.4.7 -> com.sun.mail:javax.mail:1.6.2 (*)
+--- javax.mail:mail:1.4.7 -> com.sun.mail:javax.mail:1.6.2 (*)
+--- javax.persistence:javax.persistence-api:2.2
Expand All @@ -128,14 +132,10 @@ compileClasspath - Compile classpath for source set 'main'.
+--- javax.websocket:javax.websocket-client-api:1.0 -> org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2
+--- javax.ws.rs:javax.ws.rs-api:2.1.1
+--- javax.ws.rs:jsr311-api:1.1.1 -> javax.ws.rs:javax.ws.rs-api:2.1.1
+--- javax.xml.bind:jaxb-api:2.3.1
| \--- javax.activation:javax.activation-api:1.2.0
+--- javax.xml.bind:jaxb-api:2.3.1 (*)
+--- javax.xml.soap:javax.xml.soap-api:1.4.0
+--- javax.xml.stream:stax-api:1.0 -> stax:stax-api:1.0.1
+--- javax.xml.ws:jaxws-api:2.3.1
| +--- javax.xml.bind:jaxb-api:2.3.1 (*)
| +--- javax.xml.soap:javax.xml.soap-api:1.4.0
| \--- javax.annotation:javax.annotation-api:1.3.2
+--- javax.xml.ws:jaxws-api:2.3.1 (*)
+--- jboss:javassist:3.8.0.GA -> org.javassist:javassist:3.29.1-GA
+--- junit:junit-dep:4.8 -> junit:junit:4.12
| \--- org.hamcrest:hamcrest-core:1.3 -> org.hamcrest:hamcrest:2.2
Expand Down
15 changes: 6 additions & 9 deletions src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaActivationApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaActivationImplementationRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaAnnotationApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaJwsApisRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaMailApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaServletApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaWebsocketApiRule;
Expand All @@ -43,8 +44,6 @@
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxValidationApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxWebsocketApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxWsRsApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxXmlBindApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxXmlWsApiRule;
import org.gradlex.jvm.dependency.conflict.detection.rules.logging.LoggingModuleIdentifiers;
import org.gradlex.jvm.dependency.conflict.resolution.DefaultResolutionStrategy;

Expand Down Expand Up @@ -362,7 +361,9 @@ public enum CapabilityDefinition {
),
JAVAX_JWS_API(HIGHEST_VERSION, JavaxJwsApisRule.class,
"javax.jws:javax.jws-api",
"jakarta.jws:jakarta.jws-api"
"javax.xml.ws:jaxws-api",
"jakarta.jws:jakarta.jws-api",
"jakarta.xml.ws:jakarta.xml.ws-api"
),
JAVAX_MAIL_API(HIGHEST_VERSION, JavaxMailApiRule.class,
"com.sun.mail:mailapi", // API only
Expand Down Expand Up @@ -445,12 +446,8 @@ public enum CapabilityDefinition {
"jakarta.ws.rs:jakarta.ws.rs-api",
"javax.ws.rs:javax.ws.rs-api"
),
JAVAX_XML_BIND_API(HIGHEST_VERSION, JavaxXmlBindApiRule.class,
"javax.xml.bind:jaxb-api",
"jakarta.xml.bind:jakarta.xml.bind-api"
),
JAVAX_XML_WS_API(HIGHEST_VERSION, JavaxXmlWsApiRule.class,
"javax.xml.ws:jaxws-api",
JAKARTA_JWS_API(HIGHEST_VERSION, JakartaJwsApisRule.class,
"jakarta.jws:jakarta.jws-api",
"jakarta.xml.ws:jakarta.xml.ws-api"
),

Expand Down
8 changes: 3 additions & 5 deletions ...on/rules/jakarta/JavaxXmlBindApiRule.java → ...ion/rules/jakarta/JakartaJwsApisRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@
import javax.inject.Inject;

@CacheableRule
public abstract class JavaxXmlBindApiRule extends CapabilityDefinitionRule {

static final String FIRST_JAKARTA_VERSION = "3.0.0";
public abstract class JakartaJwsApisRule extends CapabilityDefinitionRule {

@Inject
public JavaxXmlBindApiRule(CapabilityDefinition rule) {
public JakartaJwsApisRule(CapabilityDefinition rule) {
super(rule);
}

@Override
protected boolean shouldApply(ModuleVersionIdentifier id) {
return VersionNumber.parse(id.getVersion()).compareTo(VersionNumber.parse(FIRST_JAKARTA_VERSION)) < 0;
return VersionNumber.parse(getVersion(id)).compareTo(VersionNumber.parse(JavaxJwsApisRule.FIRST_JAKARTA_VERSION)) >= 0;
}
}
Loading