[WFCORE-254] Removed the org.apache.commons.logging module as it will…

… be provided by WildFly Core. Also removed the org.slf4j.jcl-over-slf4j module as well.
wildfly · Sep 19, 2016 · 4835466 · 4835466
1 parent 078c905
commit 4835466
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 86 deletions.
diff --git a/client/jms/pom.xml b/client/jms/pom.xml
@@ -130,6 +130,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -592,6 +592,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-hc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -1327,17 +1333,6 @@
             <artifactId>picketlink-idm-impl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-ext</artifactId>

diff --git a/feature-pack/src/main/resources/content/bin/client/README-EJB-JMS.txt b/feature-pack/src/main/resources/content/bin/client/README-EJB-JMS.txt
@@ -26,6 +26,7 @@ org.jboss.sasl:jboss-sasl
 org.jboss.xnio:xnio-api
 org.jboss.xnio:xnio-nio
 org.jgroups:jgroups
+org.slf4j:slf4j-api
 org.slf4j:jcl-over-slf4j
 
 

diff --git a/.../src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml b/.../src/main/resources/modules/system/layers/base/org/apache/commons/logging/main/module.xml
diff --git a/...re-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/...re-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
@@ -80,6 +80,7 @@
         <module name="javax.xml.stream.api" />
         <module name="javax.xml.ws.api" />
         <module name="org.apache.commons.lang" />
+        <module name="org.apache.commons.logging"/>
         <module name="org.apache.httpcomponents"/>
         <module name="org.apache.neethi" />
         <module name="org.apache.velocity" />

diff --git a/...ck/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml b/...ck/src/main/resources/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/module.xml
diff --git a/pom.xml b/pom.xml
@@ -6001,6 +6001,7 @@
                 <version>${version.org.picketlink}</version>
             </dependency>
 
+            <!-- This dependency is no longer used as a module. However it is required for client the JMS client library -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>

diff --git a/testsuite/domain/pom.xml b/testsuite/domain/pom.xml
@@ -166,8 +166,8 @@
             <artifactId>picketbox</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>commons-logging-jboss-logmanager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logmanager</groupId>