diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index d6f0afa5a0..99879e6b2e 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -107,17 +107,22 @@ model { artifactId project.ext.artifactId version project.version + def projectExtArtifactId = project.ext.artifactId + def projectDescription = project.description + def projectOrg = project.org + def rootProjectName = rootProject.name + pom.withXml { // add MavenCentral requirements to the POM asNode().children().last() + { resolveStrategy = Closure.DELEGATE_FIRST - name project.ext.artifactId - description project.description - url "https://github.com/${project.org}/${rootProject.name}" + name projectExtArtifactId + description projectDescription + url "https://github.com/${projectOrg}/${rootProjectName}" scm { - url "https://github.com/${project.org}/${rootProject.name}" - connection "scm:git:https://github.com/${project.org}/${rootProject.name}.git" - developerConnection "scm:git:ssh:git@github.com/${project.org}/${rootProject.name}.git" + url "https://github.com/${projectOrg}/${rootProjectName}" + connection "scm:git:https://github.com/${projectOrg}/${rootProjectName}.git" + developerConnection "scm:git:ssh:git@github.com/${projectOrg}/${rootProjectName}.git" } licenses { if (isExt) { diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index aacb203c53..c737b29a43 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406)) +* Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395)) ## [2.44.2] - 2025-01-14 * Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389)) diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle index edef810a62..7932d4a007 100644 --- a/plugin-maven/build.gradle +++ b/plugin-maven/build.gradle @@ -1,9 +1,9 @@ -import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask -import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask +import org.gradlex.maven.plugin.development.task.GenerateHelpMojoSourcesTask +import org.gradlex.maven.plugin.development.task.GenerateMavenPluginDescriptorTask plugins { - // https://www.benediktritter.de/maven-plugin-development/#release-history - id 'de.benediktritter.maven-plugin-development' version '0.4.3' + // https://github.com/gradlex-org/maven-plugin-development + id 'org.gradlex.maven-plugin-development' version '1.0.3' } apply from: rootProject.file('gradle/changelog.gradle') @@ -19,13 +19,6 @@ mavenPlugin { description = project.description } -tasks.withType(GenerateMavenPluginDescriptorTask).configureEach { - notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8') -} -tasks.withType(GenerateHelpMojoSourcesTask).configureEach { - notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8') -} - String VER_MAVEN_API = '3.0' String VER_ECLIPSE_AETHER = '1.1.0' String VER_PLEXUS_RESOURCES = '1.3.0'