Skip to content

Commit 8af4f30

Browse files
committed
Use metadata rules instead of excludes
...to not publish the excludes.
1 parent 6c06110 commit 8af4f30

File tree

1 file changed

+37
-49
lines changed

1 file changed

+37
-49
lines changed

build.gradle.kts

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,43 @@ import org.gradle.util.internal.VersionNumber
55
version = "0.2"
66

77
dependencies {
8-
compileOnly("org.apache.maven:maven-core:3.9.11") {
9-
exclude("com.google.guava", "failureaccess")
10-
exclude("com.google.guava", "guava")
11-
exclude("com.google.inject", "guice")
12-
exclude("javax.inject", "javax.inject")
13-
exclude("org.apache.maven", "maven-artifact")
14-
exclude("org.apache.maven", "maven-builder-support")
15-
exclude("org.apache.maven", "maven-model-builder")
16-
exclude("org.apache.maven", "maven-plugin-api")
17-
exclude("org.apache.maven", "maven-repository-metadata")
18-
exclude("org.apache.maven", "maven-resolver-provider")
19-
exclude("org.apache.maven", "maven-settings")
20-
exclude("org.apache.maven", "maven-settings-builder")
21-
exclude("org.apache.maven.resolver", "maven-resolver-api")
22-
exclude("org.apache.maven.resolver", "maven-resolver-impl")
23-
exclude("org.apache.maven.resolver", "maven-resolver-spi")
24-
exclude("org.apache.maven.resolver", "maven-resolver-util")
25-
exclude("org.apache.maven.shared", "maven-shared-utils")
26-
exclude("org.codehaus.plexus", "plexus-component-annotations")
27-
exclude("org.eclipse.sisu", "org.eclipse.sisu.inject")
28-
exclude("org.eclipse.sisu", "org.eclipse.sisu.plexus")
29-
exclude("org.slf4j", "slf4j-api")
30-
}
31-
testImplementation("io.takari.maven.plugins:takari-plugin-integration-testing:3.1.1") {
32-
exclude("com.google.guava", "failureaccess")
33-
exclude("com.google.guava", "guava")
34-
exclude("com.google.inject", "guice")
35-
exclude("io.takari.m2e.workspace", "org.eclipse.m2e.workspace.cli")
36-
exclude("javax.inject", "javax.inject")
37-
exclude("org.apache.commons", "commons-compress")
38-
exclude("org.apache.maven", "maven-artifact")
39-
exclude("org.apache.maven", "maven-builder-support")
40-
exclude("org.apache.maven", "maven-model-builder")
41-
exclude("org.apache.maven", "maven-plugin-api")
42-
exclude("org.apache.maven", "maven-repository-metadata")
43-
exclude("org.apache.maven", "maven-resolver-provider")
44-
exclude("org.apache.maven", "maven-settings")
45-
exclude("org.apache.maven", "maven-settings-builder")
46-
exclude("org.apache.maven.resolver", "maven-resolver-api")
47-
exclude("org.apache.maven.resolver", "maven-resolver-impl")
48-
exclude("org.apache.maven.resolver", "maven-resolver-spi")
49-
exclude("org.apache.maven.resolver", "maven-resolver-util")
50-
exclude("org.apache.maven.shared", "maven-shared-utils")
51-
exclude("org.codehaus.plexus", "plexus-component-annotations")
52-
exclude("org.eclipse.sisu", "org.eclipse.sisu.inject")
53-
exclude("org.eclipse.sisu", "org.eclipse.sisu.plexus")
54-
exclude("org.slf4j", "slf4j-api")
55-
exclude("org.slf4j", "slf4j-simple")
56-
}
8+
compileOnly("org.apache.maven:maven-core:3.9.11")
9+
testImplementation("io.takari.maven.plugins:takari-plugin-integration-testing:3.1.1")
10+
}
11+
12+
jvmDependencyConflicts.patch {
13+
listOf(
14+
"org.apache.maven:maven-core",
15+
"io.takari.maven.plugins:takari-plugin-testing",
16+
"io.takari.maven.plugins:takari-plugin-integration-testing",
17+
)
18+
.forEach {
19+
module(it) {
20+
removeDependency("com.google.guava:failureaccess")
21+
removeDependency("com.google.guava:guava")
22+
removeDependency("com.google.inject:guice")
23+
removeDependency("io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli")
24+
removeDependency("javax.inject:javax.inject")
25+
removeDependency("org.apache.maven.resolver:maven-resolver-api")
26+
removeDependency("org.apache.maven.resolver:maven-resolver-impl")
27+
removeDependency("org.apache.maven.resolver:maven-resolver-spi")
28+
removeDependency("org.apache.maven.resolver:maven-resolver-util")
29+
removeDependency("org.apache.maven.shared:maven-shared-utils")
30+
removeDependency("org.apache.maven:maven-artifact")
31+
removeDependency("org.apache.maven:maven-builder-support")
32+
removeDependency("org.apache.maven:maven-model-builder")
33+
removeDependency("org.apache.maven:maven-plugin-api")
34+
removeDependency("org.apache.maven:maven-repository-metadata")
35+
removeDependency("org.apache.maven:maven-resolver-provider")
36+
removeDependency("org.apache.maven:maven-settings")
37+
removeDependency("org.apache.maven:maven-settings-builder")
38+
removeDependency("org.codehaus.plexus:plexus-component-annotations")
39+
removeDependency("org.eclipse.sisu:org.eclipse.sisu.inject")
40+
removeDependency("org.eclipse.sisu:org.eclipse.sisu.plexus")
41+
removeDependency("org.slf4j:slf4j-api")
42+
removeDependency("org.slf4j:slf4j-simple")
43+
}
44+
}
5745
}
5846

5947
publishingConventions {

0 commit comments

Comments
 (0)