Skip to content

Update dependency org.junit.jupiter:junit-jupiter to v6 #2655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 2 commits into from
Nov 23, 2025
+3 −9
Merged

Update dependency org.junit.jupiter:junit-jupiter to v6 #2655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd1b36
Update dependency org.junit.jupiter:junit-jupiter to v6
renovate[bot] Nov 23, 2025
1061b6b
Tweaks usages of EnabledForJreRange
Goooler Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VER_SLF4J=[1.6,2.0[
# Used in multiple places
VER_DURIAN=1.2.0
VER_JGIT=7.4.0.202509020913-r
VER_JUNIT=5.14.1
VER_JUNIT=6.0.1
VER_ASSERTJ=3.27.6
VER_MOCKITO=5.20.0
VER_SELFIE=2.5.5
6 changes: 1 addition & 5 deletions plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FreshMarkExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2021 DiffPlug
* Copyright 2016-2025 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,16 +15,12 @@
*/
package com.diffplug.gradle.spotless;

import static org.junit.jupiter.api.condition.JRE.JAVA_14;

import java.io.IOException;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;

class FreshMarkExtensionTest extends GradleIntegrationHarness {
@Test
@EnabledForJreRange(max = JAVA_14)
void integration() throws IOException {
setFile("build.gradle").toLines(
"plugins {",
Expand Down
4 changes: 1 addition & 3 deletions testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.diffplug.spotless.java;

import static org.junit.jupiter.api.condition.JRE.JAVA_15;
import static org.junit.jupiter.api.condition.JRE.JAVA_20;
import static org.junit.jupiter.api.condition.JRE.JAVA_21;

Expand All @@ -39,9 +38,8 @@ void jvm13Features() throws Exception {
}

@Test
@EnabledForJreRange(max = JAVA_15) // google-java-format requires JRE 11+
void behavior18() throws Exception {
FormatterStep step = GoogleJavaFormatStep.create("1.8", TestProvisioner.mavenCentral());
FormatterStep step = GoogleJavaFormatStep.create(TestProvisioner.mavenCentral());
StepHarness.forStep(step)
.testResource("java/googlejavaformat/JavaCodeUnformatted.test", "java/googlejavaformat/JavaCodeFormatted18.test")
.testResource("java/googlejavaformat/JavaCodeWithLicenseUnformatted.test", "java/googlejavaformat/JavaCodeWithLicenseFormatted.test")
Expand Down
Loading