From d0e2749666eee6e3d5548350743f3d1eccd86ae3 Mon Sep 17 00:00:00 2001
From: Jendrik Johannes <jendrik.johannes@gmail.com>
Date: Mon, 24 Jun 2024 12:47:59 +0200
Subject: [PATCH] Use 'jvm-dependency-conflict-resolution' as 3rd party plugin
 example

---
 gradle/libs.versions.toml                                     | 2 +-
 gradle/platform/build.gradle.kts                              | 4 ++--
 gradle/plugins/java-convention/build.gradle.kts               | 2 +-
 .../src/main/kotlin/com.example.java.gradle.kts               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 62ae153..401ee5d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,4 +12,4 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
 junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 
 # Gradle plugin dependencies
-gradlex-java-ecosystem-capabilities = { module = "org.gradlex:java-ecosystem-capabilities"}
+gradlex-jvm-dependency-conflict-resolution = { module = "org.gradlex:jvm-dependency-conflict-resolution"}
diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts
index 824cc1d..8d264a0 100644
--- a/gradle/platform/build.gradle.kts
+++ b/gradle/platform/build.gradle.kts
@@ -21,8 +21,8 @@ dependencies {
         api(libs.junit.api) {
             version { prefer("5.6.2") }
         }
-        api(libs.gradlex.java.ecosystem.capabilities) {
-            version { prefer("1.1") }
+        api(libs.gradlex.jvm.dependency.conflict.resolution) {
+            version { prefer("2.1.1") }
         }
     }
 }
diff --git a/gradle/plugins/java-convention/build.gradle.kts b/gradle/plugins/java-convention/build.gradle.kts
index ea35427..dd5af5c 100644
--- a/gradle/plugins/java-convention/build.gradle.kts
+++ b/gradle/plugins/java-convention/build.gradle.kts
@@ -9,5 +9,5 @@ dependencies {
 
     implementation(platform("com.example.idiomatic.gradle:platform"))
     implementation(libs.guava) // example of using a standard Java library in your plugins
-    implementation(libs.gradlex.java.ecosystem.capabilities) // example of using a Gradle community plugin
+    implementation(libs.gradlex.jvm.dependency.conflict.resolution) // example of using a Gradle community plugin
 }
diff --git a/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts b/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts
index f56d6ab..f079105 100644
--- a/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts
+++ b/gradle/plugins/java-convention/src/main/kotlin/com.example.java.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("com.example.unit-testing")
     id("com.example.end2end-testing")
     id("com.example.jacoco")
-    id("org.gradlex.java-ecosystem-capabilities")
+    id("org.gradlex.jvm-dependency-conflict-detection")
 }
 
 dependencies {