Revert "Adopt slf4j-2.0.12"

This reverts commit cf438d63b20c25ed153ea6c2898cdc6a014d9009. This would
end up leaking from all rebuilt artifacts, which is not appropriate for
a minor release bump.

Change-Id: Ie2248294807fd0dd2b751ae43569be13eb430cfd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 09e8296a854b53da28ab4965fec748e3a060eea4..168dedee3a5eb73e55a3a5b697ca7afa263d38a7 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -145,7 +145,7 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-bom</artifactId>
             <type>pom</type>
-            <version>2.23.0</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -349,12 +349,6 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.tracker</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-bom</artifactId>
-            <type>pom</type>
-            <version>2.0.9</version>
-        </dependency>
         <dependency>
             <groupId>org.sonarsource.java</groupId>
             <artifactId>sonar-jacoco-listeners</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 9148e1231372895fc777e8b8f0dc17fa21e3dbb3..7fd07873e80a15ac95fd8b0d7c8b761cc31d0c79 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -202,31 +202,23 @@
 
       <!--
            Supporting Libraries
-      -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-bom</artifactId>
-        <version>2.0.9</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
+       -->
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.3.14</version>
+        <version>1.2.13</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.3.14</version>
+        <version>1.2.13</version>
       </dependency>
 
       <!-- log4j2 -->
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>2.23.0</version>
+        <version>2.17.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -1143,6 +1135,18 @@
               <artifactId>spotbugs</artifactId>
               <version>13.1.0-SNAPSHOT</version>
             </dependency>
+
+            <!-- The SpotBugs Maven plugin uses SLF4J-2 -->
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-api</artifactId>
+              <version>2.0.9</version>
+            </dependency>
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-simple</artifactId>
+              <version>2.0.9</version>
+            </dependency>
           </dependencies>
           <configuration>
             <plugins>