Skip to content

Commit 2d14d6d

Browse files
committed
Fix maven-plugin dependencies.
1 parent 526adf2 commit 2d14d6d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

plugin-maven/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
66
### Changed
77
* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+.
88
### Fixed
9+
* Fix plugin dependencies. Transitive Plexus Classworlds include can lead to exceptions when resolving dependencies of Spotless plugins ([#397] https://github.com/diffplug/spotless/issues/397).
910
* Revert change from 2.17.2 regarding [skip bug](https://github.com/diffplug/spotless/pull/969) because fixing the skip bug caused inconsistent behavior between `check.skip` and `apply.skip`.
1011
* [skip bug](https://github.com/diffplug/spotless/issues/968) if ratchetFrom is specified, the build will still fail in if no Git repository is found, even if `skip` is true (new fix).
1112

plugin-maven/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ dependencies {
6969
implementation "com.diffplug.spotless:spotless-lib-extra:${libVersion}"
7070
}
7171

72-
implementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"
72+
implementation("org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}") {
73+
exclude group: 'classworld', module: 'classworld'
74+
}
7375
constraints {
7476
implementation("org.codehaus.plexus:plexus-utils:3.4.1") {
7577
because("version pulled by plexus-resources has a functional-bug affecting " +
@@ -80,7 +82,6 @@ dependencies {
8082
compileOnly "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}"
8183
compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${VER_MAVEN_API}"
8284
compileOnly "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
83-
compileOnly "org.eclipse.aether:aether-util:${VER_ECLIPSE_AETHER}"
8485

8586
implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
8687
implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"

0 commit comments

Comments
 (0)