Merge pull request #11049 from jmesnil/WFLY-10069_slf4j_dependencies

[WFLY-10069] Remove all slf4j dependencies from WildFly
wildfly · Apr 3, 2018 · 4a8278c · 4a8278c
2 parents 7894e96 + a820451
commit 4a8278c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 150 deletions.
diff --git a/component-matrix/pom.xml b/component-matrix/pom.xml
@@ -58,7 +58,6 @@
              mvn com.github.ekryd.sortpom:sortpom-maven-plugin:2.8.0:sort  -Dsort.sortProperties=true -Dsort.nrOfIndentSpace=4 -Dsort.keepBlankLines=true -Dsort.sortDependencies=scope,groupId,artifactId
          -->
         <version.antlr>2.7.7</version.antlr>
-        <version.ch.qos.cal10n>0.8.1</version.ch.qos.cal10n>
         <version.com.fasterxml.classmate>1.3.4</version.com.fasterxml.classmate>
         <version.com.fasterxml.jackson>2.9.4</version.com.fasterxml.jackson>
         <version.com.github.ben-manes.caffeine>2.6.2</version.com.github.ben-manes.caffeine>
@@ -216,10 +215,6 @@
         <version.org.picketbox.picketbox-commons>1.0.0.final</version.org.picketbox.picketbox-commons>
         <version.org.picketlink>2.5.5.SP10</version.org.picketlink>
         <version.org.reactivestreams>1.0.2</version.org.reactivestreams>
-        <!-- Using two different slf4j versions here as the slf4j-ext is a deprecated module and may be removed in the
-             future. For other slf4j dependencies we want to continue to use the upstream version. -->
-        <version.org.slf4j>1.7.22</version.org.slf4j>
-        <version.org.slf4j.ext>1.7.22.jbossorg-1</version.org.slf4j.ext>
         <version.org.syslog4j>0.9.30</version.org.syslog4j>
         <version.org.wildfly.arquillian>2.1.0.Final</version.org.wildfly.arquillian>
         <version.org.wildfly.bridge.servlet-api-bridge>1.0.1.Final</version.org.wildfly.bridge.servlet-api-bridge>
@@ -844,12 +839,6 @@
                 <version>${version.antlr}</version>
             </dependency>
 
-            <dependency>
-                <groupId>ch.qos.cal10n</groupId>
-                <artifactId>cal10n-api</artifactId>
-                <version>${version.ch.qos.cal10n}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.fasterxml</groupId>
                 <artifactId>classmate</artifactId>
@@ -5678,25 +5667,6 @@
                 <version>${version.org.reactivestreams}</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>
-                <version>${version.org.slf4j}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-ext</artifactId>
-                <version>${version.org.slf4j.ext}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${version.org.slf4j}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-naming-client</artifactId>

diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -164,11 +164,6 @@
             <artifactId>asm</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.cal10n</groupId>
-            <artifactId>cal10n-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml</groupId>
             <artifactId>classmate</artifactId>
@@ -1466,17 +1461,6 @@
             <artifactId>picketlink-idm-impl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-ext</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>

diff --git a/feature-pack/src/license/full-feature-pack-licenses.xml b/feature-pack/src/license/full-feature-pack-licenses.xml
@@ -23,17 +23,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.cal10n</groupId>
-      <artifactId>cal10n-api</artifactId>
-      <licenses>
-        <license>
-          <name>MIT License</name>
-          <url>http://www.opensource.org/licenses/MIT</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml</groupId>
       <artifactId>classmate</artifactId>
@@ -3884,17 +3873,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-ext</artifactId>
-      <licenses>
-        <license>
-          <name>MIT License</name>
-          <url>http://www.opensource.org/licenses/MIT</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.wildfly</groupId>
       <artifactId>wildfly-naming-client</artifactId>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml
diff --git a/iiop-openjdk/pom.xml b/iiop-openjdk/pom.xml
@@ -159,12 +159,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-
-        <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>