Added missing lib to be able to configure net.logstash.logback.encode…

…r.LogstashEncoder on wsagent. Removed unused libs from ws-master war (#7444) (#7566)
eclipse-che · Nov 27, 2017 · 9cca9dd · 9cca9dd
1 parent 6731ded
commit 9cca9dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml
@@ -30,18 +30,10 @@
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-access</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml
@@ -42,6 +42,11 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>${logstash.logback.encoder.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-core</artifactId>
@@ -149,6 +154,7 @@
                             <ignoredDependencies>
                                 <ignoredDependency>org.everrest:everrest-core</ignoredDependency>
                                 <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
+                                <ignoredDependency>net.logstash.logback:logstash-logback-encoder</ignoredDependency>
                                 <ignoredDependency>org.slf4j:jul-to-slf4j</ignoredDependency>
                                 <ignoredDependency>org.slf4j:jcl-over-slf4j</ignoredDependency>
                                 <ignoredDependency>org.slf4j:log4j-over-slf4j</ignoredDependency>