Fix: Jersey alignment rule points to wrong BOM (#141)

Author: jjohannes

CHANGELOG.md

@@ -1,7 +1,10 @@
 # JVM Dependency Conflict Resolution Gradle plugin - Changelog
 
+## Version 2.1.1
+* [Fix] [#141](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/141) Jersey alignment rule points to wrong BOM
+
 ## Version 2.1
-* [New] [102](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/102) Global consistent resolution feature
+* [New] [#102](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/102) Global consistent resolution feature
 * [New Rule] [#125](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/125) mysql:mysql-connector-java / com.mysql:mysql-connector-j (Thanks [Eduardo Acosta Miguens](https://github.com/eduacostam)!)
 * [New Rule] [#131](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/131) org.json:json / com.vaadin.external.google:android-json (Thanks [Piotr Kubowicz](https://github.com/pkubowicz)!)
 * [New Rule] [#22](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/22) Alignment: Asm, Jersey, Jetty, SSHD (Thanks [Florian Dreier](https://github.com/DreierF)!)

samples/sample-alignment/build.gradle.kts

@@ -1,5 +1,7 @@
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition
+
 plugins {
-    id("org.gradlex.jvm-dependency-conflict-detection")
+    id("org.gradlex.jvm-dependency-conflict-resolution")
     id("java-library")
 }
 
@@ -14,3 +16,9 @@ dependencies {
     implementation("org.glassfish.jersey.core:jersey-common:3.1.0")
     implementation("org.glassfish.jersey.media:jersey-media-json-jackson:3.0.6")
 }
+
+jvmDependencyConflicts {
+    conflictResolution {
+        select(CapabilityDefinition.JAKARTA_ACTIVATION_API, "com.sun.activation:jakarta.activation")
+    }
+}

samples/sample-alignment/build.out

@@ -77,12 +77,15 @@ compileClasspath - Compile classpath for source set 'main'.
 |    +--- jakarta.annotation:jakarta.annotation-api:2.1.1
 |    +--- jakarta.inject:jakarta.inject-api:2.0.1
 |    +--- org.glassfish.hk2:osgi-resource-locator:1.0.3
-|    \--- org.eclipse.jetty:jetty-bom:3.1.0 -> 11.0.13 (*)
-\--- org.glassfish.jersey.media:jersey-media-json-jackson:3.0.6
-     +--- org.glassfish.jersey.core:jersey-common:3.0.6 -> 3.1.0 (*)
-     +--- org.glassfish.jersey.ext:jersey-entity-filtering:3.0.6
-     |    +--- jakarta.ws.rs:jakarta.ws.rs-api:3.0.0 -> 3.1.0
-     |    \--- org.eclipse.jetty:jetty-bom:3.0.6 -> 11.0.13 (*)
+|    \--- org.glassfish.jersey:jersey-bom:3.1.0
+|         +--- org.glassfish.jersey.core:jersey-common:3.1.0 (c)
+|         +--- org.glassfish.jersey.media:jersey-media-json-jackson:3.1.0 (c)
+|         \--- org.glassfish.jersey.ext:jersey-entity-filtering:3.1.0 (c)
+\--- org.glassfish.jersey.media:jersey-media-json-jackson:3.0.6 -> 3.1.0
+     +--- org.glassfish.jersey.core:jersey-common:3.1.0 (*)
+     +--- org.glassfish.jersey.ext:jersey-entity-filtering:3.1.0
+     |    +--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
+     |    \--- org.glassfish.jersey:jersey-bom:3.1.0 (*)
      +--- com.fasterxml.jackson.core:jackson-annotations:2.13.3
      |    \--- com.fasterxml.jackson:jackson-bom:2.13.3
      |         +--- com.fasterxml.jackson.core:jackson-annotations:2.13.3 (c)
@@ -100,6 +103,6 @@ compileClasspath - Compile classpath for source set 'main'.
      |    +--- com.fasterxml.jackson.core:jackson-databind:2.13.3 (*)
      |    +--- com.sun.activation:jakarta.activation:2.0.1
      |    \--- com.fasterxml.jackson:jackson-bom:2.13.3 (*)
-     +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
-     |    \--- com.sun.activation:jakarta.activation:2.0.1
-     \--- org.eclipse.jetty:jetty-bom:3.0.6 -> 11.0.13 (*)
+     +--- jakarta.xml.bind:jakarta.xml.bind-api:4.0.0
+     |    \--- jakarta.activation:jakarta.activation-api:2.1.0 -> com.sun.activation:jakarta.activation:2.0.1
+     \--- org.glassfish.jersey:jersey-bom:3.1.0 (*)

samples/sample-all/build.gradle.kts

@@ -1,4 +1,4 @@
-import  org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition
 
 plugins {
     id("org.gradlex.jvm-dependency-conflict-resolution")

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

@@ -33,7 +33,7 @@ public enum AlignmentDefinition {
             "org.ow2.asm:asm-util",
             "org.ow2.asm:asm-commons"
     ),
-    JERSEY("org.eclipse.jetty:jetty-bom", AlignmentDefinitionRule.class,
+    JERSEY("org.glassfish.jersey:jersey-bom", AlignmentDefinitionRule.class,
             "org.glassfish.jersey.core:jersey-common",
             "org.glassfish.jersey.core:jersey-client",
             "org.glassfish.jersey.core:jersey-server",