Simpify definition of slf4j version

openhab · May 20, 2024 · 963fc3d · 963fc3d
1 parent f8f4975
commit 963fc3d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 -->