Use Eclipse formatter 4.25 with Spotless (#15264)

This version still checks test files.

See: openhab/openhab-core#3515

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
index 6fd9187016bf9bc01df548b9cd3c5f9af9240d9d..fbb64ecaf6dc24e9808296f28433e797f9674f2d 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
@@ -60,7 +60,7 @@ public class HomeManager extends RestManager {
         UNKNOWN;
     }
 
-    private static record EndpointValue<T>(T value) {
+    private static record EndpointValue<T> (T value) {
     }
 
     private static record EndpointUi(AccessType access, DisplayType display, String iconUrl, @Nullable String unit) {

diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/AbstractHomeAssistantTests.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/AbstractHomeAssistantTests.java
index 1ceb52e074c47141c750871e05995f08851a1bc6..80c703339b2813152046969c73efebacb9be9afb 100644 (file)
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/AbstractHomeAssistantTests.java
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/AbstractHomeAssistantTests.java
@@ -99,7 +99,7 @@ public abstract class AbstractHomeAssistantTests extends JavaTest {
                 .thenReturn(ThingTypeBuilder.instance(HA_TYPE_UID, HA_TYPE_LABEL).build());
         when(transformationServiceProvider
                 .getTransformationService(JinjaTransformationProfile.PROFILE_TYPE_UID.getId()))
-                        .thenReturn(jinjaTransformationService);
+                .thenReturn(jinjaTransformationService);
 
         channelTypeProvider = spy(new MqttChannelTypeProvider(thingTypeRegistry));
 

diff --git a/pom.xml b/pom.xml
index fc5f63b5965cc8772a89bf45d229291bd58defda..035f4e7b85298494a26de7ee62e50e9e36d2a50f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -77,8 +77,9 @@
     <netty.version>4.1.92.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
     <sat.version>0.15.0</sat.version>
-    <spotless.version>2.35.0</spotless.version>
-    <spotless.eclipse.version>4.26</spotless.eclipse.version>
+    <spotless.version>2.37.0</spotless.version>
+    <!-- Eclipse Java formatter version 4.26+ does not check test files -->
+    <spotless.eclipse.version>4.25</spotless.eclipse.version>
     <spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
 
     <bnd.importpackage/>