Merge branch 'junit-team:main' into file_source_reuse

Author: lslonina

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ asciidoctor-plugins = "4.0.5" # Check if workaround in documentation.gradle.kts
 assertj = "3.27.4"
 bnd = "7.1.0"
 checkstyle = "11.0.1"
-eclipse = "4.36.0"
+eclipse = "4.37.0"
 jackson = "2.20.0"
 jacoco = "0.8.13"
 jmh = "1.37"

gradle/plugins/japicmp/src/main/kotlin/junitbuild.japicmp.gradle.kts

@@ -14,6 +14,7 @@ plugins {
 }
 
 val extension = extensions.create<JApiCmpExtension>("japicmp").apply {
+	enabled.convention(true)
 	acceptedIncompatibilities.apply {
 		val acceptedBreakingChangesFile = rootProject.layout.projectDirectory.file("gradle/config/japicmp/accepted-breaking-changes.txt")
 		if (acceptedBreakingChangesFile.asFile.exists()) {
@@ -32,6 +33,7 @@ val extension = extensions.create<JApiCmpExtension>("japicmp").apply {
 }
 
 val downloadPreviousReleaseJar by tasks.registering(Download::class) {
+	onlyIf { extension.enabled.get() }
 	val previousVersion = extension.previousVersion.get()
 	src("https://repo1.maven.org/maven2/${project.group.toString().replace(".", "/")}/${project.name}/$previousVersion/${project.name}-$previousVersion.jar")
 	dest(layout.buildDirectory.dir("japicmp"))
@@ -40,6 +42,7 @@ val downloadPreviousReleaseJar by tasks.registering(Download::class) {
 }
 
 val checkBackwardCompatibility by tasks.registering(JapicmpTask::class) {
+	onlyIf { extension.enabled.get() }
 	oldClasspath.from(downloadPreviousReleaseJar.map { it.outputFiles })
 	newClasspath.from(tasks.jar)
 	onlyModified = true

gradle/plugins/japicmp/src/main/kotlin/junitbuild/japicmp/JApiCmpExtension.kt

@@ -5,6 +5,8 @@ import org.gradle.api.provider.SetProperty
 
 abstract class JApiCmpExtension {
 
+    abstract val enabled: Property<Boolean>
+
     abstract val previousVersion: Property<String>
 
     abstract val acceptedIncompatibilities: SetProperty<String>

gradle/plugins/japicmp/src/main/kotlin/junitbuild/japicmp/UnacceptedIncompatibilityRule.kt

@@ -1,7 +1,9 @@
 package junitbuild.japicmp
 
+import japicmp.model.JApiBehavior
 import japicmp.model.JApiClass
 import japicmp.model.JApiCompatibility
+import japicmp.model.JApiField
 import japicmp.model.JApiImplementedInterface
 import me.champeau.gradle.japicmp.report.Violation
 import me.champeau.gradle.japicmp.report.stdrules.AbstractRecordingSeenMembers
@@ -20,10 +22,22 @@ class UnacceptedIncompatibilityRule(params: Map<String, String>): AbstractRecord
             // The changes about the interface's methods will be reported already
             return null
         }
+        if (isInNewClass(element)) {
+            return null
+        }
         return if (!element.isBinaryCompatible) {
             Violation.notBinaryCompatible(element, severitySource.determineSeverity(element))
         } else if (!element.isSourceCompatible) {
             Violation.any(element, severitySource.determineSeverity(element), "Is not source compatible")
         } else null
     }
+
+    private fun isInNewClass(element: JApiCompatibility): Boolean {
+        return when (element) {
+            is JApiClass -> element.oldClass.isEmpty
+            is JApiBehavior -> isInNewClass(element.getjApiClass())
+            is JApiField -> isInNewClass(element.getjApiClass())
+            else -> false
+        }
+    }
 }

junit-jupiter/junit-jupiter.gradle.kts

@@ -15,6 +15,6 @@ dependencies {
 	osgiVerification(projects.junitPlatformLauncher)
 }
 
-tasks.checkBackwardCompatibility {
+japicmp {
 	enabled = false // already checked by individual projects
 }

junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

@@ -22,16 +22,17 @@ dependencies {
 	osgiVerification(libs.openTestReporting.tooling.spi)
 }
 
+japicmp {
+	enabled = false // already checked by individual projects
+}
+
 tasks {
 	jar {
 		manifest {
 			attributes("Automatic-Module-Name" to "org.junit.platform.console.standalone")
 			attributes("Main-Class" to "org.junit.platform.console.ConsoleLauncher")
 		}
 	}
-	checkBackwardCompatibility {
-		enabled = false // already checked by individual projects
-	}
 	val shadowedArtifactsFile by registering(WriteArtifactsFile::class) {
 		from(configurations.shadowedClasspath)
 		outputFile = layout.buildDirectory.file("shadowed-artifacts")

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -244,7 +244,7 @@ val test by testing.suites.getting(JvmTestSuite::class) {
 						preferredMaxDuration = Duration.ofMillis(500)
 					}
 				}
-				jvmArgumentProviders += JavaHomeDir(project, 17, develocity.testDistribution.enabled)
+
 				jvmArgumentProviders += JavaHomeDir(project, 17, develocity.testDistribution.enabled)
 
 				val gradleJavaVersion = 21