Skip to content

Commit bcce803

Browse files
committed
refactor: cleanup dependencies
1 parent 5730ceb commit bcce803

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ maven-resolver-bom = { module = "org.apache.maven.resolver:maven-resolver", vers
3434
maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic" } # version from bom
3535
maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl" } # version from bom
3636
maven-resolver-spi = { module = "org.apache.maven.resolver:maven-resolver-spi" } # version from bom
37-
maven-resolver-supplier-mvn4 = { module = "org.apache.maven.resolver:maven-resolver-supplier-mvn4" } # version from bom
37+
maven-resolver-supplier-mvn4 = { module = "org.apache.maven.resolver:maven-resolver-supplier-mvn4" } # version from bom - required to read maven structures like parent poms and more
3838
maven-resolver-transport-apache = { module = "org.apache.maven.resolver:maven-resolver-transport-apache" } # version from bom
3939
maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file" } # version from bom
4040
maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util" } # version from bom
@@ -54,8 +54,8 @@ spotless-plugin-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradl
5454

5555
[bundles]
5656
durian-libs = ["durian-core", "durian-io", "durian-collect"]
57-
maven-resolver-libs = [
58-
"maven-resolver-api",
57+
maven-resolver-api = ["maven-resolver-api"]
58+
maven-resolver-impl-libs = [
5959
"maven-resolver-spi",
6060
"maven-resolver-util",
6161
"maven-resolver-impl",

provisioner/build.gradle

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,9 @@ version = rootProject.version
66

77
dependencies {
88
// BOM to align all maven resolver versions
9-
// the first two on API, to allow user of SpotlessCliMavenProvisioner to specify repositories
109
api( platform(libs.maven.resolver.bom))
11-
// api( platform("org.apache.maven.resolver:maven-resolver:2.0.13"))
12-
// api "org.apache.maven.resolver:maven-resolver-api"
13-
api libs.maven.resolver.api
14-
// implementations needed for a working resolver, irrelevant for API consumers
15-
// implementation "org.apache.maven.resolver:maven-resolver-spi"
16-
implementation libs.maven.resolver.spi
17-
// implementation "org.apache.maven.resolver:maven-resolver-util"
18-
implementation libs.maven.resolver.util
19-
// implementation "org.apache.maven.resolver:maven-resolver-impl"
20-
implementation libs.maven.resolver.impl
21-
// implementation "org.apache.maven.resolver:maven-resolver-connector-basic"
22-
implementation libs.maven.resolver.connector.basic
23-
// implementation "org.apache.maven.resolver:maven-resolver-transport-file"
24-
implementation libs.maven.resolver.transport.file
25-
// implementation "org.apache.maven.resolver:maven-resolver-transport-apache"
26-
implementation libs.maven.resolver.transport.apache
27-
28-
// This one is required to support parent POM resolution
29-
// implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn4"
30-
implementation libs.maven.resolver.supplier.mvn4
10+
api libs.bundles.maven.resolver.api
11+
implementation libs.bundles.maven.resolver.impl.libs
3112

3213
implementation libs.bundles.spotless.libs
3314
}

0 commit comments

Comments
 (0)