Skip to content

Commit 863a3a9

Browse files
authored
Update dependency org.junit.jupiter:junit-jupiter to v6 (#2655)
2 parents 48c9e4f + 1061b6b commit 863a3a9

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ VER_SLF4J=[1.6,2.0[
3030
# Used in multiple places
3131
VER_DURIAN=1.2.0
3232
VER_JGIT=7.4.0.202509020913-r
33-
VER_JUNIT=5.14.1
33+
VER_JUNIT=6.0.1
3434
VER_ASSERTJ=3.27.6
3535
VER_MOCKITO=5.20.0
3636
VER_SELFIE=2.5.5

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FreshMarkExtensionTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2025 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,16 +15,12 @@
1515
*/
1616
package com.diffplug.gradle.spotless;
1717

18-
import static org.junit.jupiter.api.condition.JRE.JAVA_14;
19-
2018
import java.io.IOException;
2119

2220
import org.junit.jupiter.api.Test;
23-
import org.junit.jupiter.api.condition.EnabledForJreRange;
2421

2522
class FreshMarkExtensionTest extends GradleIntegrationHarness {
2623
@Test
27-
@EnabledForJreRange(max = JAVA_14)
2824
void integration() throws IOException {
2925
setFile("build.gradle").toLines(
3026
"plugins {",

testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.diffplug.spotless.java;
1717

18-
import static org.junit.jupiter.api.condition.JRE.JAVA_15;
1918
import static org.junit.jupiter.api.condition.JRE.JAVA_20;
2019
import static org.junit.jupiter.api.condition.JRE.JAVA_21;
2120

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

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

0 commit comments

Comments
 (0)