diff options
| author | Manuel Bentele | 2021-12-16 07:56:00 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2021-12-16 08:01:13 +0100 |
| commit | 932f537231cba02c9f08558475e6aea5a1c5d838 (patch) | |
| tree | da6351fe88c22affcffba517095f3411683faa89 /api | |
| parent | [daemon] Fix Java compiler warning (diff) | |
| download | taskman-lite-932f537231cba02c9f08558475e6aea5a1c5d838.tar.gz taskman-lite-932f537231cba02c9f08558475e6aea5a1c5d838.tar.xz taskman-lite-932f537231cba02c9f08558475e6aea5a1c5d838.zip | |
Update log4j because of the CVE-2021-44228 security flaw
Diffstat (limited to 'api')
4 files changed, 15 insertions, 12 deletions
diff --git a/api/pom.xml b/api/pom.xml index 6ff09fb..3993a09 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -48,15 +48,15 @@ <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>[2.0,3.0)</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>[2.0,3.0)</version> <scope>compile</scope> </dependency> <dependency> diff --git a/api/src/main/java/org/openslx/taskmanager/api/AbstractTask.java b/api/src/main/java/org/openslx/taskmanager/api/AbstractTask.java index 35d179d..43240ce 100644 --- a/api/src/main/java/org/openslx/taskmanager/api/AbstractTask.java +++ b/api/src/main/java/org/openslx/taskmanager/api/AbstractTask.java @@ -2,7 +2,8 @@ package org.openslx.taskmanager.api; import java.util.UUID; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.taskmanager.api.TaskStatus.StatusCode; import com.google.gson.annotations.Expose; @@ -11,7 +12,7 @@ public abstract class AbstractTask implements Runnable { private static final long RELEASE_DELAY = 10l * 60l * 1000l; - private static final Logger LOG = Logger.getLogger( AbstractTask.class ); + private static final Logger LOG = LogManager.getLogger( AbstractTask.class ); /* * To be set from task invocation (json data) diff --git a/api/src/main/java/org/openslx/taskmanager/api/Environment.java b/api/src/main/java/org/openslx/taskmanager/api/Environment.java index 2a33a17..e5705db 100644 --- a/api/src/main/java/org/openslx/taskmanager/api/Environment.java +++ b/api/src/main/java/org/openslx/taskmanager/api/Environment.java @@ -9,7 +9,8 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Holds the environment that tasks running a system command *should* @@ -18,7 +19,7 @@ import org.apache.log4j.Logger; public class Environment { - private static final Logger log = Logger.getLogger( Environment.class ); + private static final Logger log = LogManager.getLogger( Environment.class ); private static Map<String, String> env = null; diff --git a/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java b/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java index c1aa6e5..172d2ed 100644 --- a/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java +++ b/api/src/main/java/org/openslx/taskmanager/api/SystemCommandTask.java @@ -8,12 +8,13 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public abstract class SystemCommandTask extends AbstractTask { - private static final Logger log = Logger.getLogger( SystemCommandTask.class ); + private static final Logger log = LogManager.getLogger( SystemCommandTask.class ); private String[] command = null; |