chore: move maven resolver to libs.versions

Author: simschla

gradle/libs.versions.toml

@@ -6,8 +6,6 @@ diff-utils = "1.3.0"
 durian = "1.2.0"
 junit = "5.8.1"
 maven-resolver = "2.0.13"
-maven-resolver-transport-http = "1.9.24"
-maven-settings = "3.9.11"
 mockito = "5.17.0"
 native-include-cleanThat = "2.23"
 native-include-googleJavaFormat = "1.27.0"
@@ -31,14 +29,15 @@ durian-io = { module = "com.diffplug.durian:durian-io", version.ref = "durian" }
 durian-collect = { module = "com.diffplug.durian:durian-collect", version.ref = "durian" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
-maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api", version.ref = "maven-resolver" }
-maven-resolver-spi = { module = "org.apache.maven.resolver:maven-resolver-spi", version.ref = "maven-resolver" }
-maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "maven-resolver" }
-maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "maven-resolver" }
-maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
-maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver-transport-http" }
-maven-settings = { module = "org.apache.maven:maven-settings", version.ref = "maven-settings" }
-maven-settings-builder = { module = "org.apache.maven:maven-settings-builder", version.ref = "maven-settings" }
+maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api" } # version from bom
+maven-resolver-bom = { module = "org.apache.maven.resolver:maven-resolver", version.ref = "maven-resolver" }
+maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic" } # version from bom
+maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl" } # version from bom
+maven-resolver-spi = { module = "org.apache.maven.resolver:maven-resolver-spi" } # version from bom
+maven-resolver-supplier-mvn4 = { module = "org.apache.maven.resolver:maven-resolver-supplier-mvn4" } # version from bom
+maven-resolver-transport-apache = { module = "org.apache.maven.resolver:maven-resolver-transport-apache" } # version from bom
+maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file" } # version from bom
+maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util" } # version from bom
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 native-include-cleanThat = { module = "io.github.solven-eu.cleanthat:java", version.ref = "native-include-cleanThat" }
 native-include-googleJavaFormat = { module = "com.google.googlejavaformat:google-java-format", version.ref = "native-include-googleJavaFormat" }
@@ -61,9 +60,9 @@ maven-resolver-libs = [
     "maven-resolver-util",
     "maven-resolver-impl",
     "maven-resolver-connector-basic",
-    "maven-resolver-transport-http",
-    "maven-settings",
-    "maven-settings-builder"
+    "maven-resolver-transport-file",
+    "maven-resolver-transport-apache",
+    "maven-resolver-supplier-mvn4",
 ]
 native-includes = [
     "native-include-cleanThat",

provisioner/build.gradle

@@ -7,18 +7,27 @@ version = rootProject.version
 dependencies {
 	// BOM to align all maven resolver versions
 	// the first two on API, to allow user of SpotlessCliMavenProvisioner to specify repositories
-	api( platform("org.apache.maven.resolver:maven-resolver:2.0.13"))
-	api "org.apache.maven.resolver:maven-resolver-api"
+	api( platform(libs.maven.resolver.bom))
+	//	api( platform("org.apache.maven.resolver:maven-resolver:2.0.13"))
+	//	api "org.apache.maven.resolver:maven-resolver-api"
+	api libs.maven.resolver.api
 	// implementations needed for a working resolver, irrelevant for API consumers
-	implementation "org.apache.maven.resolver:maven-resolver-spi"
-	implementation "org.apache.maven.resolver:maven-resolver-util"
-	implementation "org.apache.maven.resolver:maven-resolver-impl"
-	implementation "org.apache.maven.resolver:maven-resolver-connector-basic"
-	implementation "org.apache.maven.resolver:maven-resolver-transport-file"
-	implementation "org.apache.maven.resolver:maven-resolver-transport-apache"
+	// implementation "org.apache.maven.resolver:maven-resolver-spi"
+	implementation libs.maven.resolver.spi
+	//	implementation "org.apache.maven.resolver:maven-resolver-util"
+	implementation libs.maven.resolver.util
+	//	implementation "org.apache.maven.resolver:maven-resolver-impl"
+	implementation libs.maven.resolver.impl
+	//	implementation "org.apache.maven.resolver:maven-resolver-connector-basic"
+	implementation libs.maven.resolver.connector.basic
+	//	implementation "org.apache.maven.resolver:maven-resolver-transport-file"
+	implementation libs.maven.resolver.transport.file
+	//	implementation "org.apache.maven.resolver:maven-resolver-transport-apache"
+	implementation libs.maven.resolver.transport.apache
 
 	// This one is required to support parent POM resolution
-	implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn4"
+	//	implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn4"
+	implementation libs.maven.resolver.supplier.mvn4
 
 	implementation libs.bundles.spotless.libs
 }