Rename packages according to new Plugin IDs

gradlex-org · Apr 5, 2024 · 5bab569 · 5bab569
1 parent e8d5383
commit 5bab569
Show file tree

Hide file tree

Showing 96 changed files with 269 additions and 340 deletions.
diff --git a/README.MD b/README.MD
@@ -11,7 +11,7 @@ The `org.gradlex.jvm-dependency-conflict-resolution` plugin offers a compact lan
 ## What is a 'Capability' in Gradle and why should I care?
 
 The videos below explain the concept of Capability Conflicts and why they can help you to avoid "dependency hell" in your project.
-With this plugin, you enable Gradle to detect and automatically resolved typical capability conflicts in the JVM Ecosystem.
+With this plugin, you enable Gradle to detect and automatically resolved typical capability conflicts in the JVM ecosystem.
 
 [<img src="https://onepiecesoftware.github.io/img/videos/29.png" width="320">](https://www.youtube.com/watch?v=KocTqF0hO_8&list=PLWQK2ZdV4Yl2k2OmC_gsjDpdIBTN0qqkE)
 [<img src="https://onepiecesoftware.github.io/img/videos/11.png" width="320">](https://www.youtube.com/watch?v=5g20kbbqBFk&list=PLWQK2ZdV4Yl2k2OmC_gsjDpdIBTN0qqkE)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,7 +27,7 @@ tasks.withType<Javadoc>().configureEach {
 
 pluginPublishConventions {
     id("org.gradlex.jvm-dependency-conflict-resolution")
-    implementationClass("org.gradlex.javaecosystem.conflict.resolution.JvmDependencyConflictResolutionPlugin")
+    implementationClass("org.gradlex.jvm.dependency.conflict.resolution.JvmDependencyConflictResolutionPlugin")
     displayName("JVM Conflict Resolution Gradle Plugin")
     description("Convenient dependency conflict management for Jave projects.")
     tags("dependency", "dependencies", "dependency-management", "capabilities", "java", "logging",
@@ -56,7 +56,7 @@ gradlePlugin {
     plugins {
         create("jvm-dependency-conflict-detection") {
             id = "org.gradlex.jvm-dependency-conflict-detection"
-            implementationClass = "org.gradlex.javaecosystem.conflict.detection.JvmDependencyConflictDetectionPlugin"
+            implementationClass = "org.gradlex.jvm.dependency.conflict.detection.JvmDependencyConflictDetectionPlugin"
             displayName = "JVM Conflict Detection Gradle Plugin"
             description = "Adds Capabilities to well-known Components hosted on Maven Central."
         }
@@ -89,6 +89,7 @@ testing.suites.named<JvmTestSuite>("test") {
         testTask {
             maxParallelForks = 4
             inputs.dir(layout.projectDirectory.dir("samples"))
+            inputs.dir("src/docs/samples")
         }
     }
 }

diff --git a/gradle/plugins/documentation/src/main/kotlin/gradlexbuild.exemplar-conventions.gradle.kts b/gradle/plugins/documentation/src/main/kotlin/gradlexbuild.exemplar-conventions.gradle.kts
diff --git a/...n/src/main/kotlin/gradlexbuild.jvm-dependency-conflict-detection-documentation.gradle.kts b/...n/src/main/kotlin/gradlexbuild.jvm-dependency-conflict-detection-documentation.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     id("java")
     id("gradlexbuild.lifecycle")
     id("gradlexbuild.asciidoctor-conventions")
-    id("gradlexbuild.exemplar-conventions")
 }
 
 val checkSamplesForCompleteness = tasks.register<SamplesCompletenessCheck>("checkSamplesForCompleteness") {

diff --git a/...n/src/main/kotlin/gradlexbuild/jvm/dependency/conflict/documentation/CapabilityListing.kt b/...n/src/main/kotlin/gradlexbuild/jvm/dependency/conflict/documentation/CapabilityListing.kt
@@ -21,7 +21,7 @@ abstract class CapabilityListing : DefaultTask() {
     fun update() {
         val classesUrls = pluginClasses.files.map { it.toURI().toURL() }
         val loader = URLClassLoader("pluginClasspath", classesUrls.toTypedArray(), ComponentMetadataRule::class.java.classLoader)
-        val definitions = loader.loadClass("org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition")
+        val definitions = loader.loadClass("org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition")
 
         val allCapabilities = definitions.enumConstants.map { rule ->
             val capability = definitions.getDeclaredMethod("getCapability").invoke(rule) as String

diff --git a/...ain/kotlin/gradlexbuild/jvm/dependency/conflict/documentation/SamplesCompletenessCheck.kt b/...ain/kotlin/gradlexbuild/jvm/dependency/conflict/documentation/SamplesCompletenessCheck.kt
@@ -27,7 +27,7 @@ abstract class SamplesCompletenessCheck : DefaultTask() {
                 classesUrls.toTypedArray(),
                 ComponentMetadataRule::class.java.classLoader
             )
-            val definitions = loader.loadClass("org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition")
+            val definitions = loader.loadClass("org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition")
 
             val missing = definitions.enumConstants.map { rule ->
                 val modules = definitions.getDeclaredMethod("getModules").invoke(rule) as List<*>

diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts
@@ -1,4 +1,4 @@
-import  org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition
+import  org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition
 
 plugins {
     id("org.gradlex.jvm-dependency-conflict-resolution")

diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
@@ -27,7 +27,7 @@ In the videos below, https://github.com/jjohannes[Jendrik] explains the concept
 image:https://onepiecesoftware.github.io/img/videos/29.png[width=400,link=https://www.youtube.com/watch?v=KocTqF0hO_8&list=PLWQK2ZdV4Yl2k2OmC_gsjDpdIBTN0qqkE]
 image:https://onepiecesoftware.github.io/img/videos/11.png[width=400,link=https://www.youtube.com/watch?v=5g20kbbqBFk&list=PLWQK2ZdV4Yl2k2OmC_gsjDpdIBTN0qqkE]
 
-NOTE: With this series of plugins, you enable your build to detect and automatically resolve typical capability conflicts in the JVM Ecosystem.
+NOTE: With this series of plugins, you enable your build to detect and automatically resolve typical capability conflicts in the JVM ecosystem.
 
 == Plugins
 
@@ -40,7 +40,7 @@ The benefits described above are achieved through three different plugins:
 This plugin can be applied as a `Settings` or a `Project` plugin.
 
 `org.gradlex.jvm-dependency-conflict-resolution`::
-<<resolution-plugin,This plugin>> adds opinionated capability resolutions to conflicting API or implementation libraries in the Java ecosystem.
+<<resolution-plugin,This plugin>> adds opinionated capability resolutions to conflicting API or implementation libraries in the JVM ecosystem.
 This plugin can be applied as a `Project` plugin.
 It adds a DSL to configure resolution strategies, select logging implementations, and fix/enhance metadata of published components.
 

diff --git a/src/docs/asciidoc/parts/detection.adoc b/src/docs/asciidoc/parts/detection.adoc
@@ -140,7 +140,7 @@ If you encounter more cases, please...
 If you use this plugin and think it is missing a rule for a well-known component (or that a rule is incomplete/wrong), please let us know by
 
 - https://github.com/gradlex-org/jvm-dependency-conflict-resolution/blob/main/issues/new[Opening an Issue]
-- https://github.com/gradlex-org/jvm-dependency-conflict-resolution/pulls[Providing a PR] - for this you should look at the https://github.com/gradlex-org/jvm-dependency-conflict-resolution/blob/main/src/main/java/org.gradlex/javaecosystem/capabilities/rules[existing rules] and follow the same patterns for new rules
+- https://github.com/gradlex-org/jvm-dependency-conflict-resolution/pulls[Providing a PR] - for this you should look at the https://github.com/gradlex-org/jvm-dependency-conflict-resolution/blob/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java[existing rules] and follow the same patterns for new rules
 
 Please make sure, you clearly state which **Capability** it is about and which **Components** provide the Capability.
 

diff --git a/src/main/java/org/gradlex/javaecosystem/conflict/resolution/rules/package-info.java b/src/main/java/org/gradlex/javaecosystem/conflict/resolution/rules/package-info.java
diff --git a/...JvmDependencyConflictDetectionPlugin.java → ...JvmDependencyConflictDetectionPlugin.java b/...JvmDependencyConflictDetectionPlugin.java → ...JvmDependencyConflictDetectionPlugin.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection;
+package org.gradlex.jvm.dependency.conflict.detection;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.dsl.ComponentMetadataHandler;
 import org.gradle.api.initialization.Settings;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.util.GradleVersion;
-import org.gradlex.javaecosystem.conflict.detection.rules.AlignmentDefinition;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition;
+import org.gradlex.jvm.dependency.conflict.detection.rules.AlignmentDefinition;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition;
 
 public class JvmDependencyConflictDetectionPlugin implements Plugin<ExtensionAware> {
 

diff --git a/...stem/conflict/detection/package-info.java → ...ency/conflict/detection/package-info.java b/...stem/conflict/detection/package-info.java → ...ency/conflict/detection/package-info.java
@@ -15,6 +15,6 @@
  */
 
 @NonNullApi
-package org.gradlex.javaecosystem.conflict.detection;
+package org.gradlex.jvm.dependency.conflict.detection;
 
 import org.gradle.api.NonNullApi;
diff --git a/.../detection/rules/AlignmentDefinition.java → .../detection/rules/AlignmentDefinition.java b/.../detection/rules/AlignmentDefinition.java → .../detection/rules/AlignmentDefinition.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules;
+package org.gradlex.jvm.dependency.conflict.detection.rules;
 
-import org.gradlex.javaecosystem.conflict.detection.rules.logging.Log4J2Alignment;
-import org.gradlex.javaecosystem.conflict.detection.rules.logging.Slf4J2Alignment;
-import org.gradlex.javaecosystem.conflict.detection.rules.logging.Slf4JAlignment;
+import org.gradlex.jvm.dependency.conflict.detection.rules.logging.Log4J2Alignment;
+import org.gradlex.jvm.dependency.conflict.detection.rules.logging.Slf4J2Alignment;
+import org.gradlex.jvm.dependency.conflict.detection.rules.logging.Slf4JAlignment;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...ection/rules/AlignmentDefinitionRule.java → ...ection/rules/AlignmentDefinitionRule.java b/...ection/rules/AlignmentDefinitionRule.java → ...ection/rules/AlignmentDefinitionRule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules;
+package org.gradlex.jvm.dependency.conflict.detection.rules;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ComponentMetadataContext;

diff --git a/...detection/rules/CapabilityDefinition.java → ...detection/rules/CapabilityDefinition.java b/...detection/rules/CapabilityDefinition.java → ...detection/rules/CapabilityDefinition.java
@@ -14,46 +14,46 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules;
+package org.gradlex.jvm.dependency.conflict.detection.rules;
 
-import org.gradlex.javaecosystem.conflict.detection.rules.aopalliance.AopallianceRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.guava.GuavaListenableFutureRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaActivationApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaActivationImplementationRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaAnnotationApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaMailApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaServletApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaWebsocketApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaWebsocketClientApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JakartaWsRsApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxActivationApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxAnnotationApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxEjbApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxElApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxInjectApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxJsonApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxJwsApisRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxMailApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxPersistenceApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxServletApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxServletJspRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxServletJstlRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxSoapApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxTransactionApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxValidationApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxWebsocketApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxWsRsApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxXmlBindApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.jakarta.JavaxXmlWsApiRule;
-import org.gradlex.javaecosystem.conflict.detection.rules.logging.LoggingModuleIdentifiers;
-import org.gradlex.javaecosystem.conflict.resolution.DefaultResolutionStrategy;
+import org.gradlex.jvm.dependency.conflict.detection.rules.aopalliance.AopallianceRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.guava.GuavaListenableFutureRule;
+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.JakartaMailApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaServletApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaWebsocketApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaWebsocketClientApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JakartaWsRsApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxActivationApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxAnnotationApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxEjbApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxElApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxInjectApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxJsonApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxJwsApisRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxMailApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxPersistenceApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxServletApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxServletJspRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxServletJstlRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxSoapApiRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.jakarta.JavaxTransactionApiRule;
+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;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.gradlex.javaecosystem.conflict.resolution.DefaultResolutionStrategy.FIRST_MODULE;
-import static org.gradlex.javaecosystem.conflict.resolution.DefaultResolutionStrategy.HIGHEST_VERSION;
-import static org.gradlex.javaecosystem.conflict.resolution.DefaultResolutionStrategy.NONE;
+import static org.gradlex.jvm.dependency.conflict.resolution.DefaultResolutionStrategy.FIRST_MODULE;
+import static org.gradlex.jvm.dependency.conflict.resolution.DefaultResolutionStrategy.HIGHEST_VERSION;
+import static org.gradlex.jvm.dependency.conflict.resolution.DefaultResolutionStrategy.NONE;
 
 public enum CapabilityDefinition {
 

diff --git a/...ction/rules/CapabilityDefinitionRule.java → ...ction/rules/CapabilityDefinitionRule.java b/...ction/rules/CapabilityDefinitionRule.java → ...ction/rules/CapabilityDefinitionRule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules;
+package org.gradlex.jvm.dependency.conflict.detection.rules;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ComponentMetadataContext;

diff --git a/...FixedVersionCapabilityDefinitionRule.java → ...FixedVersionCapabilityDefinitionRule.java b/...FixedVersionCapabilityDefinitionRule.java → ...FixedVersionCapabilityDefinitionRule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules;
+package org.gradlex.jvm.dependency.conflict.detection.rules;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;

diff --git a/...on/rules/aopalliance/AopallianceRule.java → ...on/rules/aopalliance/AopallianceRule.java b/...on/rules/aopalliance/AopallianceRule.java → ...on/rules/aopalliance/AopallianceRule.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules.aopalliance;
+package org.gradlex.jvm.dependency.conflict.detection.rules.aopalliance;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinitionRule;
-import org.gradlex.javaecosystem.conflict.detection.util.VersionNumber;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinitionRule;
+import org.gradlex.jvm.dependency.conflict.detection.util.VersionNumber;
 
 import javax.inject.Inject;
 

diff --git a/...ction/rules/aopalliance/package-info.java → ...ction/rules/aopalliance/package-info.java b/...ction/rules/aopalliance/package-info.java → ...ction/rules/aopalliance/package-info.java
@@ -15,6 +15,6 @@
  */
 
 @NonNullApi
-package org.gradlex.javaecosystem.conflict.detection.rules.aopalliance;
+package org.gradlex.jvm.dependency.conflict.detection.rules.aopalliance;
 
 import org.gradle.api.NonNullApi;
diff --git a/...ules/guava/GuavaListenableFutureRule.java → ...ules/guava/GuavaListenableFutureRule.java b/...ules/guava/GuavaListenableFutureRule.java → ...ules/guava/GuavaListenableFutureRule.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules.guava;
+package org.gradlex.jvm.dependency.conflict.detection.rules.guava;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.VariantMetadata;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinitionRule;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinitionRule;
 
 import javax.inject.Inject;
 

diff --git a/...t/detection/rules/guava/package-info.java → ...t/detection/rules/guava/package-info.java b/...t/detection/rules/guava/package-info.java → ...t/detection/rules/guava/package-info.java
@@ -15,6 +15,6 @@
  */
 
 @NonNullApi
-package org.gradlex.javaecosystem.conflict.detection.rules.guava;
+package org.gradlex.jvm.dependency.conflict.detection.rules.guava;
 
 import org.gradle.api.NonNullApi;
diff --git a/...les/jakarta/JakartaActivationApiRule.java → ...les/jakarta/JakartaActivationApiRule.java b/...les/jakarta/JakartaActivationApiRule.java → ...les/jakarta/JakartaActivationApiRule.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.gradlex.javaecosystem.conflict.detection.rules.jakarta;
+package org.gradlex.jvm.dependency.conflict.detection.rules.jakarta;
 
 import org.gradle.api.artifacts.CacheableRule;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinition;
-import org.gradlex.javaecosystem.conflict.detection.rules.CapabilityDefinitionRule;
-import org.gradlex.javaecosystem.conflict.detection.util.VersionNumber;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinition;
+import org.gradlex.jvm.dependency.conflict.detection.rules.CapabilityDefinitionRule;
+import org.gradlex.jvm.dependency.conflict.detection.util.VersionNumber;
 
 import javax.inject.Inject;