Merge branch '4.1.x'

snicoll · snicoll · commit 07267cc20aad · 2025-06-05T15:35:51.000+02:00
diff --git a/gradle/plugins/conventions-plugin/build.gradle b/gradle/plugins/conventions-plugin/build.gradle
@@ -14,6 +14,9 @@ dependencies {
 	checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
 	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 
+	implementation("com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion")
+	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion")
+
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.assertj:assertj-core:${assertJVersion}")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
@@ -28,11 +31,6 @@ gradlePlugin {
 	}
 }
 
-dependencies {
-	implementation("com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion")
-	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion")
-}
-
 tasks.named('test') {
 	useJUnitPlatform()
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ dependencies {`
`14`	`14`	`checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")`
`15`	`15`	`checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")`
`16`	`16`
	`17`	`+ implementation("com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion")`
	`18`	`+ implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion")`
	`19`	`+`
`17`	`20`	`testImplementation("org.junit.jupiter:junit-jupiter")`
`18`	`21`	`testImplementation("org.assertj:assertj-core:${assertJVersion}")`
`19`	`22`	`testRuntimeOnly("org.junit.platform:junit-platform-launcher")`
`@@ -28,11 +31,6 @@ gradlePlugin {`
`28`	`31`	`}`
`29`	`32`	`}`
`30`	`33`
`31`		`-dependencies {`
`32`		`- implementation("com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion")`
`33`		`- implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion")`
`34`		`-}`
`35`		`-`
`36`	`34`	`tasks.named('test') {`
`37`	`35`	`useJUnitPlatform()`
`38`	`36`	`}`