FORGE-2531: Use slf4j addon

forge · Dec 22, 2015 · 5f7c739 · 5f7c739
1 parent 7a235b3
commit 5f7c739
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/database-tools/addon/pom.xml b/database-tools/addon/pom.xml
@@ -47,6 +47,12 @@
          <artifactId>configuration</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>slf4j</artifactId>
+         <version>1.7.13</version>
+         <classifier>forge-addon</classifier>
+      </dependency>      
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
          <artifactId>simple</artifactId>

diff --git a/database-tools/impl/pom.xml b/database-tools/impl/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
@@ -65,13 +66,12 @@
                <artifactId>hibernate-jpa-2.1-api</artifactId>
                <groupId>org.hibernate.javax.persistence</groupId>
             </exclusion>
+            <exclusion>
+               <artifactId>slf4j-api</artifactId>
+               <groupId>org.slf4j</groupId>
+            </exclusion>
          </exclusions>
       </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-jdk14</artifactId>
-         <version>1.5.8</version>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
          <artifactId>simple</artifactId>

diff --git a/maven/addon/pom.xml b/maven/addon/pom.xml
@@ -89,6 +89,12 @@
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>slf4j</artifactId>
+         <version>1.7.13</version>
+         <classifier>forge-addon</classifier>
+      </dependency>      
       <!-- Furnace Container -->
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>

diff --git a/maven/impl-projects/pom.xml b/maven/impl-projects/pom.xml
@@ -37,12 +37,12 @@
          <groupId>org.apache.maven</groupId>
          <artifactId>maven-embedder</artifactId>
          <version>${version.maven}</version>
-      </dependency>
-      <!-- This depends on the SLF4j Version used in Maven-embedder above -->
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-jdk14</artifactId>
-         <version>1.7.5</version>
+         <exclusions>
+            <exclusion>
+               <artifactId>slf4j-api</artifactId>
+               <groupId>org.slf4j</groupId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>