Merge branch 'junit-team:main' into file_source_reuse

Author: lslonina

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
       with:
         distribution: graalvm-community
         version: 'latest'
-        java-version: '24'
+        java-version: '21'
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build
       uses: ./.github/actions/main-build

.github/workflows/release.yml

@@ -89,7 +89,7 @@ jobs:
         with:
           java-version: 24
           distribution: temurin
-      - uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
+      - uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
       - name: Update JUnit dependencies in samples
         run: java src/Updater.java ${{ inputs.releaseVersion }}
         working-directory: junit5-samples
@@ -247,7 +247,7 @@ jobs:
         with:
           java-version: 24
           distribution: temurin
-      - uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
+      - uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
       - name: Update JUnit dependencies in samples
         run: java src/Updater.java ${{ inputs.releaseVersion }}
       - name: Build samples

CONTRIBUTING.md

@@ -125,11 +125,8 @@ See [`ExtensionContext`](junit-jupiter-api/src/main/java/org/junit/jupiter/api/e
 This project uses JSpecify's annotation to indicate nullability. In general, the approach
 is as follows:
 
-- The Gradle build is set up to treat all code as being `@NullMarked`
-- The descriptor of each module is annotated with `@NullMarked` for IDEs such as IntelliJ
-  IDEA to treat code correctly.
-- Fields, parameters, return types etc. may be annotated with `@Nullable`
-- A package can be excluded (temporarily) using `@NullUnmarked`
+- All packages are annotated with `@NullMarked`
+- Types of fields, parameters, return types etc. may be annotated with `@Nullable`
 
 ### Tests
 

README.md

@@ -12,7 +12,7 @@ This repository is the home of JUnit Platform, Jupiter, and Vintage.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.13.0](https://github.com/junit-team/junit5/releases/tag/r5.13.0) (May 30, 2025)
+- General Availability (GA): [JUnit 5.13.1](https://github.com/junit-team/junit5/releases/tag/r5.13.1) (June 7, 2025)
 - Preview (Milestone/Release Candidate): [JUnit 5.13.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.13.0-RC1) (May 16, 2025)
 
 ## Documentation

documentation/src/docs/asciidoc/release-notes/release-notes-5.13.1.adoc

@@ -1,9 +1,9 @@
 [[release-notes-5.13.1]]
 == 5.13.1
 
-*Date of Release:* ❓
+*Date of Release:* June 7, 2025
 
-*Scope:* ❓
+*Scope:* Bug fixes and enhancements since 5.13.0
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/97?closed=1+[5.13.1] milestone page in the JUnit repository
@@ -13,20 +13,7 @@ on GitHub.
 [[release-notes-5.13.1-junit-platform]]
 === JUnit Platform
 
-[[release-notes-5.13.1-junit-platform-bug-fixes]]
-==== Bug Fixes
-
-* ❓
-
-[[release-notes-5.13.1-junit-platform-deprecations-and-breaking-changes]]
-==== Deprecations and Breaking Changes
-
-* ❓
-
-[[release-notes-5.13.1-junit-platform-new-features-and-improvements]]
-==== New Features and Improvements
-
-* ❓
+No changes.
 
 
 [[release-notes-5.13.1-junit-jupiter]]
@@ -45,31 +32,8 @@ on GitHub.
 * Fix support for `AnnotationBasedArgumentsProvider` implementations that override the
   deprecated `provideArguments(ExtensionContext, Annotation)` method.
 
-[[release-notes-5.13.1-junit-jupiter-deprecations-and-breaking-changes]]
-==== Deprecations and Breaking Changes
-
-* ❓
-
-[[release-notes-5.13.1-junit-jupiter-new-features-and-improvements]]
-==== New Features and Improvements
-
-* ❓
-
 
 [[release-notes-5.13.1-junit-vintage]]
 === JUnit Vintage
 
-[[release-notes-5.13.1-junit-vintage-bug-fixes]]
-==== Bug Fixes
-
-* ❓
-
-[[release-notes-5.13.1-junit-vintage-deprecations-and-breaking-changes]]
-==== Deprecations and Breaking Changes
-
-* ❓
-
-[[release-notes-5.13.1-junit-vintage-new-features-and-improvements]]
-==== New Features and Improvements
-
-* ❓
+No changes

gradle/libs.versions.toml

@@ -107,7 +107,7 @@ jreleaser = { id = "org.jreleaser", version = "1.18.0" }
 # check if workaround in gradle.properties can be removed when updating
 kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.0-RC2" }
 nullaway = { id = "net.ltgt.nullaway", version = "2.2.0" }
-openrewrite = { id = "org.openrewrite.rewrite", version = "7.7.0" }
+openrewrite = { id = "org.openrewrite.rewrite", version = "7.8.0" }
 plantuml = { id = "io.freefair.plantuml", version = "8.13.1" }
 shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
 spotless = { id = "com.diffplug.spotless", version = "7.0.4" }

junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java

@@ -450,7 +450,9 @@ public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends An
 		List<Field> fields = findAnnotatedFields(instance.getClass(), annotationType, ModifierSupport::isNotStatic,
 			HierarchyTraversalMode.TOP_DOWN);
 
-		return ReflectionUtils.readFieldValues(fields, instance);
+		@SuppressWarnings("unchecked")
+		List<@Nullable Object> result = (List<@Nullable Object>) ReflectionUtils.readFieldValues(fields, instance);
+		return result;
 	}
 
 	/**
@@ -482,7 +484,9 @@ public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends An
 		List<Field> fields = findAnnotatedFields(clazz, annotationType, ModifierSupport::isStatic,
 			HierarchyTraversalMode.TOP_DOWN);
 
-		return ReflectionUtils.readFieldValues(fields, null);
+		@SuppressWarnings("unchecked")
+		List<@Nullable Object> result = (List<@Nullable Object>) ReflectionUtils.readFieldValues(fields, null);
+		return result;
 	}
 
 	/**

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

@@ -657,7 +657,7 @@ public static <T> Try<Object> tryToReadFieldValue(Class<T> clazz, String fieldNa
 	 * @return an immutable list of the values of the specified fields; never
 	 * {@code null} but may be empty or contain {@code null} entries
 	 */
-	public static List<@Nullable Object> readFieldValues(List<Field> fields, @Nullable Object instance) {
+	public static List<?> readFieldValues(List<Field> fields, @Nullable Object instance) {
 		return readFieldValues(fields, instance, field -> true);
 	}
 
@@ -674,9 +674,7 @@ public static <T> Try<Object> tryToReadFieldValue(Class<T> clazz, String fieldNa
 	 * @return an immutable list of the values of the specified fields; never
 	 * {@code null} but may be empty or contain {@code null} entries
 	 */
-	@SuppressWarnings("NullAway")
-	public static List<@Nullable Object> readFieldValues(List<Field> fields, @Nullable Object instance,
-			Predicate<Field> predicate) {
+	public static List<?> readFieldValues(List<Field> fields, @Nullable Object instance, Predicate<Field> predicate) {
 		Preconditions.notNull(fields, "fields list must not be null");
 		Preconditions.notNull(predicate, "Predicate must not be null");
 

platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java

@@ -60,6 +60,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import org.assertj.core.api.Assertions;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -1952,7 +1953,8 @@ void readFieldValuesFromInstance() {
 
 			var values = readFieldValues(fields, new ClassWithFields());
 
-			assertThat(values).containsExactly("enigma", 3.14, "text", 2.5, null, 42, "constant", 99);
+			Assertions.<Object> assertThat(values).containsExactly("enigma", 3.14, "text", 2.5, null, 42, "constant",
+				99);
 		}
 
 		@Test
@@ -1961,7 +1963,7 @@ void readFieldValuesFromClass() {
 
 			var values = readFieldValues(fields, null);
 
-			assertThat(values).containsExactly(2.5, "constant", 99);
+			Assertions.<Object> assertThat(values).containsExactly(2.5, "constant", 99);
 		}
 
 		/**
@@ -1972,15 +1974,15 @@ void readFieldValuesFromClass() {
 		void readFieldValuesFromInterfacesAndClassesInTypeHierarchy() {
 			var fields = findFields(InterfaceWithField.class, ReflectionUtils::isStatic, TOP_DOWN);
 			var values = readFieldValues(fields, null);
-			assertThat(values).containsOnly("ifc");
+			Assertions.<Object> assertThat(values).containsOnly("ifc");
 
 			fields = findFields(SuperclassWithFieldAndFieldFromInterface.class, ReflectionUtils::isStatic, TOP_DOWN);
 			values = readFieldValues(fields, null);
-			assertThat(values).containsExactly("ifc", "super");
+			Assertions.<Object> assertThat(values).containsExactly("ifc", "super");
 
 			fields = findFields(SubclassWithFieldAndFieldFromInterface.class, ReflectionUtils::isStatic, TOP_DOWN);
 			values = readFieldValues(fields, null);
-			assertThat(values).containsExactly("ifc", "super", "sub");
+			Assertions.<Object> assertThat(values).containsExactly("ifc", "super", "sub");
 		}
 
 		@Test
@@ -1989,7 +1991,7 @@ void readFieldValuesFromInstanceWithTypeFilterForString() {
 
 			var values = readFieldValues(fields, new ClassWithFields(), isA(String.class));
 
-			assertThat(values).containsExactly("enigma", "text", null, "constant");
+			Assertions.<Object> assertThat(values).containsExactly("enigma", "text", null, "constant");
 		}
 
 		@Test
@@ -1998,7 +2000,7 @@ void readFieldValuesFromClassWithTypeFilterForString() {
 
 			var values = readFieldValues(fields, null, isA(String.class));
 
-			assertThat(values).containsExactly("constant");
+			Assertions.<Object> assertThat(values).containsExactly("constant");
 		}
 
 		@Test
@@ -2007,7 +2009,7 @@ void readFieldValuesFromInstanceWithTypeFilterForInteger() {
 
 			var values = readFieldValues(fields, new ClassWithFields(), isA(int.class));
 
-			assertThat(values).containsExactly(42);
+			Assertions.<Object> assertThat(values).containsExactly(42);
 		}
 
 		@Test
@@ -2016,7 +2018,7 @@ void readFieldValuesFromClassWithTypeFilterForInteger() {
 
 			var values = readFieldValues(fields, null, isA(Integer.class));
 
-			assertThat(values).containsExactly(99);
+			Assertions.<Object> assertThat(values).containsExactly(99);
 		}
 
 		@Test
@@ -2025,7 +2027,7 @@ void readFieldValuesFromInstanceWithTypeFilterForDouble() {
 
 			var values = readFieldValues(fields, new ClassWithFields(), isA(double.class));
 
-			assertThat(values).containsExactly(3.14);
+			Assertions.<Object> assertThat(values).containsExactly(3.14);
 		}
 
 		@Test
@@ -2034,7 +2036,7 @@ void readFieldValuesFromClassWithTypeFilterForDouble() {
 
 			var values = readFieldValues(fields, null, isA(Double.class));
 
-			assertThat(values).containsExactly(2.5);
+			Assertions.<Object> assertThat(values).containsExactly(2.5);
 		}
 
 		private static Predicate<Field> isA(Class<?> type) {