Skip to content

Commit 5bc2fae

Browse files
authored
Upgrade spotless-maven-plugin to 2.35.0 and Eclipse JDT Formatter to 4.27 (#1414)
This allows format checking of the integration test targets up to Java 20.
1 parent 4fca868 commit 5bc2fae

5 files changed

Lines changed: 357 additions & 4 deletions

File tree

org.jacoco.build/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
<plugin>
471471
<groupId>com.diffplug.spotless</groupId>
472472
<artifactId>spotless-maven-plugin</artifactId>
473-
<version>1.24.3</version>
473+
<version>2.35.0</version>
474474
</plugin>
475475
</plugins>
476476
</pluginManagement>
@@ -562,7 +562,7 @@
562562
<include>src/**/*.java</include>
563563
</includes>
564564
<eclipse>
565-
<version>4.12.0</version>
565+
<version>4.27</version>
566566
<file>../org.jacoco.core/.settings/org.eclipse.jdt.core.prefs</file>
567567
</eclipse>
568568
<trimTrailingWhitespace/>

org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void should_instrument_class_files_and_copy_resources_when_folder_is_give
7070
// non class-file resources are copied:
7171
assertTrue(new File(destdir,
7272
"org/jacoco/cli/internal/commands/test-resource.properties")
73-
.isFile());
73+
.isFile());
7474

7575
assertInstrumented(new File(destdir,
7676
"org/jacoco/cli/internal/commands/InstrumentTest.class"));

org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void should_create_html_report_when_html_option_is_provided()
124124
"org.jacoco.cli.internal.commands/ReportTest.html").isFile());
125125
assertTrue(new File(html,
126126
"org.jacoco.cli.internal.commands/ReportTest.java.html")
127-
.isFile());
127+
.isFile());
128128
}
129129

130130
@Test

0 commit comments

Comments
 (0)