From 963fc3d80328047e5a0760bd8f1dc2f86fd0c20a Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 20 May 2024 16:36:45 +0200
Subject: [PATCH] Simpify definition of slf4j version

---
 bundles/org.openhab.core.model.item/pom.xml        | 4 ++--
 bundles/org.openhab.core.model.persistence/pom.xml | 4 ++--
 bundles/org.openhab.core.model.rule/pom.xml        | 4 ++--
 bundles/org.openhab.core.model.script/pom.xml      | 4 ++--
 bundles/org.openhab.core.model.sitemap/pom.xml     | 4 ++--
 bundles/org.openhab.core.model.thing/pom.xml       | 4 ++--
 pom.xml                                            | 1 -
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml
index 2602b7db764..1ef7299e606 100644
--- a/bundles/org.openhab.core.model.item/pom.xml
+++ b/bundles/org.openhab.core.model.item/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml
index 02c9b4f40c5..fed0013020a 100644
--- a/bundles/org.openhab.core.model.persistence/pom.xml
+++ b/bundles/org.openhab.core.model.persistence/pom.xml
@@ -67,12 +67,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml
index 9655da3b367..98d324d3d8c 100644
--- a/bundles/org.openhab.core.model.rule/pom.xml
+++ b/bundles/org.openhab.core.model.rule/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
index ef108b12f91..aded9d54b4b 100644
--- a/bundles/org.openhab.core.model.script/pom.xml
+++ b/bundles/org.openhab.core.model.script/pom.xml
@@ -103,12 +103,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml
index 5b19e647b98..f78a777b6be 100644
--- a/bundles/org.openhab.core.model.sitemap/pom.xml
+++ b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml
index 3b1a32c3c38..050a2cde628 100644
--- a/bundles/org.openhab.core.model.thing/pom.xml
+++ b/bundles/org.openhab.core.model.thing/pom.xml
@@ -85,12 +85,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-for-model.version}</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/pom.xml b/pom.xml
index f19973047c7..f002fcf30cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,6 @@
     <karaf.tooling.version>4.4.6</karaf.tooling.version>
     <sat.version>0.16.0</sat.version>
     <slf4j.version>2.0.12</slf4j.version>
-    <slf4j-for-model.version>2.0.12</slf4j-for-model.version>
     <xtext.version>2.35.0.M1</xtext.version>
     <spotless.version>2.43.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->