Merge pull request #965 from lkiesow/t/mh-13627-update-logger

MH-13627, Update Logger
opencast · Jun 19, 2019 · 9c83853 · 9c83853
2 parents 77ec720 + c060235
commit 9c83853
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 112 deletions.
diff --git a/modules/asset-manager-impl/pom.xml b/modules/asset-manager-impl/pom.xml
@@ -141,11 +141,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- https://github.com/MutabilityDetector/MutabilityDetector -->
     <dependency>
       <groupId>org.mutabilitydetector</groupId>

diff --git a/modules/asset-manager-storage-aws/pom.xml b/modules/asset-manager-storage-aws/pom.xml
@@ -78,11 +78,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/capture-admin-service-impl/pom.xml b/modules/capture-admin-service-impl/pom.xml
@@ -80,11 +80,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/common-jpa-impl/pom.xml b/modules/common-jpa-impl/pom.xml
@@ -31,11 +31,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- Testing -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/modules/composer-ffmpeg/pom.xml b/modules/composer-ffmpeg/pom.xml
@@ -87,10 +87,6 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncoderEngine.java b/modules/composer-ffmpeg/src/main/java/org/opencastproject/composer/impl/EncoderEngine.java
@@ -73,8 +73,7 @@ public class EncoderEngine implements AutoCloseable {
   /** If true STDERR and STDOUT of the spawned process will be mixed so that both can be read via STDIN */
   private static final boolean REDIRECT_ERROR_STREAM = true;
 
-  /** the logging facility provided by log4j */
-  private static Logger logger = LoggerFactory.getLogger(EncoderEngine.class.getName());
+  private static Logger logger = LoggerFactory.getLogger(EncoderEngine.class);
   /** the encoder binary */
   private String binary = "ffmpeg";
   /** Set of processes to clean up */

diff --git a/...-ffmpeg/src/test/java/org/opencastproject/composer/impl/ComplexCmdsEncoderEngineTest.java b/...-ffmpeg/src/test/java/org/opencastproject/composer/impl/ComplexCmdsEncoderEngineTest.java
@@ -50,7 +50,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.BasicConfigurator;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
@@ -133,7 +132,6 @@ private static File getFile(final String path) throws Exception {
   public void setUp() throws Exception {
     // Skip tests if FFmpeg is not installed
     Assume.assumeTrue(ffmpegInstalled);
-    BasicConfigurator.configure();
     engine = new EncoderEngine(FFMPEG_BINARY);
 
     File f = getFile("/video.mp4");

diff --git a/modules/composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ProcessSmilTest.java b/modules/composer-ffmpeg/src/test/java/org/opencastproject/composer/impl/ProcessSmilTest.java
@@ -64,7 +64,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.BasicConfigurator;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
@@ -138,7 +137,6 @@ public void setUp() throws Exception {
  // Skip tests if FFmpeg is not installed
 
     Assume.assumeTrue(ffmpegInstalled);
-    BasicConfigurator.configure();
     workingDirectory = FileSupport.getTempDirectory("processSmiltest");
     FileUtils.forceMkdir(workingDirectory);
 

diff --git a/modules/cover-image-impl/pom.xml b/modules/cover-image-impl/pom.xml
@@ -47,10 +47,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-anim</artifactId>

diff --git a/modules/db/pom.xml b/modules/db/pom.xml
@@ -34,11 +34,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>

diff --git a/modules/distribution-service-aws-s3/pom.xml b/modules/distribution-service-aws-s3/pom.xml
@@ -80,11 +80,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/engage-theodul-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/modules/engage-theodul-plugin-archetype/src/main/resources/archetype-resources/pom.xml
@@ -45,11 +45,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>

diff --git a/modules/event-comment/pom.xml b/modules/event-comment/pom.xml
@@ -77,11 +77,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/ingest-service-impl/pom.xml b/modules/ingest-service-impl/pom.xml
@@ -97,11 +97,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/publication-service-youtube-v3/pom.xml b/modules/publication-service-youtube-v3/pom.xml
@@ -123,11 +123,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/search-service-impl/pom.xml b/modules/search-service-impl/pom.xml
@@ -112,11 +112,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/search/pom.xml b/modules/search/pom.xml
@@ -310,11 +310,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/modules/series-service-impl/pom.xml b/modules/series-service-impl/pom.xml
@@ -77,11 +77,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>

diff --git a/modules/solr/pom.xml b/modules/solr/pom.xml
@@ -75,11 +75,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/themes/pom.xml b/modules/themes/pom.xml
@@ -52,11 +52,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/modules/userdirectory-ldap/pom.xml b/modules/userdirectory-ldap/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/modules/userdirectory/pom.xml b/modules/userdirectory/pom.xml
@@ -109,11 +109,6 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/pom.xml b/pom.xml
@@ -1056,23 +1056,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.21</version>
+        <version>1.7.26</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.21</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>1.6.4</version>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-        <scope>test</scope>
+        <version>1.7.26</version>
       </dependency>
       <!-- apache commons syncing -->
       <dependency>