Merge branch 'main' into renovate/spring-core

Author: jjohannes

samples/sample-all-deactivated/settings.gradle.kts

@@ -9,6 +9,13 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        maven("https://maven.jzy3d.org/releases") {
+            mavenContent {
+                includeModule("org.jzy3d", "jGL")
+                includeModule("org.jzy3d", "jzy3d-jGL")
+                includeModule("org.jzy3d", "jzy3d-jGL-awt")
+            }
+        }
         maven("https://maven.scijava.org/content/groups/public") {
             mavenContent {
                 includeGroup("org.jzy3d")

samples/sample-all/settings.gradle.kts

@@ -9,6 +9,13 @@ pluginManagement {
 
 dependencyResolutionManagement {
     repositories {
+        maven("https://maven.jzy3d.org/releases") {
+            mavenContent {
+                includeModule("org.jzy3d", "jGL")
+                includeModule("org.jzy3d", "jzy3d-jGL")
+                includeModule("org.jzy3d", "jzy3d-jGL-awt")
+            }
+        }
         maven("https://maven.scijava.org/content/groups/public") {
             mavenContent {
                 includeGroup("org.jzy3d")

src/test/groovy/org/gradlex/jvm/dependency/conflict/test/JarOverlapTest.groovy

@@ -45,9 +45,19 @@ class JarOverlapTest extends Specification {
         def project = ProjectBuilder.builder().build()
         def dependencies = project.dependencies
         project.plugins.apply("jvm-ecosystem")
+        project.repositories.maven {
+            url = "https://maven.jzy3d.org/releases"
+            mavenContent {
+                it.includeModule("org.jzy3d", "jGL")
+                it.includeModule("org.jzy3d", "jzy3d-jGL")
+                it.includeModule("org.jzy3d", "jzy3d-jGL-awt")
+            }
+        }
         project.repositories.maven {
             url = "https://maven.scijava.org/content/groups/public"
-            mavenContent { it.includeGroup("org.jzy3d") }
+            mavenContent {
+                it.includeGroup("org.jzy3d")
+            }
         }
         project.repositories.mavenCentral {
             it.metadataSources.artifact() // woodstox/wstx-lgpl/3.2.7