Skip to content

Commit a410e9f

Browse files
authored
adopt maven plugin development from gradle x (#2423 closes #2395)
2 parents fd5970c + cdb609e commit a410e9f

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

gradle/java-publish.gradle

+11-6
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,22 @@ model {
107107
artifactId project.ext.artifactId
108108
version project.version
109109

110+
def projectExtArtifactId = project.ext.artifactId
111+
def projectDescription = project.description
112+
def projectOrg = project.org
113+
def rootProjectName = rootProject.name
114+
110115
pom.withXml {
111116
// add MavenCentral requirements to the POM
112117
asNode().children().last() + {
113118
resolveStrategy = Closure.DELEGATE_FIRST
114-
name project.ext.artifactId
115-
description project.description
116-
url "https://github.com/${project.org}/${rootProject.name}"
119+
name projectExtArtifactId
120+
description projectDescription
121+
url "https://github.com/${projectOrg}/${rootProjectName}"
117122
scm {
118-
url "https://github.com/${project.org}/${rootProject.name}"
119-
connection "scm:git:https://github.com/${project.org}/${rootProject.name}.git"
120-
developerConnection "scm:git:ssh:git@github.com/${project.org}/${rootProject.name}.git"
123+
url "https://github.com/${projectOrg}/${rootProjectName}"
124+
connection "scm:git:https://github.com/${projectOrg}/${rootProjectName}.git"
125+
developerConnection "scm:git:ssh:git@github.com/${projectOrg}/${rootProjectName}.git"
121126
}
122127
licenses {
123128
if (isExt) {

plugin-maven/CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
44

55
## [Unreleased]
66
* Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))
7+
* Adopt new version of `maven-plugin-development` from GradleX ([#2395](https://github.com/diffplug/spotless/pull/2395))
78

89
## [2.44.2] - 2025-01-14
910
* Eclipse-based tasks can now handle parallel configuration ([#2389](https://github.com/diffplug/spotless/issues/2389))

plugin-maven/build.gradle

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask
2-
import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
1+
import org.gradlex.maven.plugin.development.task.GenerateHelpMojoSourcesTask
2+
import org.gradlex.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
33

44
plugins {
5-
// https://www.benediktritter.de/maven-plugin-development/#release-history
6-
id 'de.benediktritter.maven-plugin-development' version '0.4.3'
5+
// https://github.com/gradlex-org/maven-plugin-development
6+
id 'org.gradlex.maven-plugin-development' version '1.0.3'
77
}
88

99
apply from: rootProject.file('gradle/changelog.gradle')
@@ -19,13 +19,6 @@ mavenPlugin {
1919
description = project.description
2020
}
2121

22-
tasks.withType(GenerateMavenPluginDescriptorTask).configureEach {
23-
notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
24-
}
25-
tasks.withType(GenerateHelpMojoSourcesTask).configureEach {
26-
notCompatibleWithConfigurationCache('https://github.com/britter/maven-plugin-development/issues/8')
27-
}
28-
2922
String VER_MAVEN_API = '3.0'
3023
String VER_ECLIPSE_AETHER = '1.1.0'
3124
String VER_PLEXUS_RESOURCES = '1.3.0'

0 commit comments

Comments
 (0)