This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
The following commit(s) were added to refs/heads/master by this push:
new dbd8eb1 JCLOUDS-1589: Upgrade to log4j 2.16.0
dbd8eb1 is described below
commit dbd8eb1dabc2c0f0349388fdffcca6cb8819f07c
Author: Andrew Gaul <g...@apache.org>
AuthorDate: Thu Dec 16 22:47:46 2021 +0900
JCLOUDS-1589: Upgrade to log4j 2.16.0
This addresses a critical CVE:
https://logging.apache.org/log4j/2.x/security.html
---
apis/atmos/pom.xml | 4 ++--
apis/cloudwatch/pom.xml | 4 ++--
apis/s3/pom.xml | 4 ++--
apis/sts/pom.xml | 4 ++--
drivers/log4j/pom.xml | 4 ++--
.../main/java/org/jclouds/logging/log4j/Log4JLogger.java | 13 +++++--------
loadbalancer/pom.xml | 4 ++--
project/pom.xml | 6 +++---
providers/b2/pom.xml | 4 ++--
skeletons/standalone-compute/pom.xml | 4 ++--
10 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index 00570d0..4455a39 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -59,8 +59,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index 87b6529..fbdd904 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -59,8 +59,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 77dc304..f3d5606 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -79,8 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml
index e750eef..c8b96f6 100644
--- a/apis/sts/pom.xml
+++ b/apis/sts/pom.xml
@@ -59,8 +59,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml
index 8844126..1e5fa5d 100644
--- a/drivers/log4j/pom.xml
+++ b/drivers/log4j/pom.xml
@@ -44,8 +44,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git
a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/Log4JLogger.java
b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/Log4JLogger.java
index 4b919fd..f154eb8 100644
--- a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/Log4JLogger.java
+++ b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/Log4JLogger.java
@@ -16,9 +16,6 @@
*/
package org.jclouds.logging.log4j;
-import static org.apache.log4j.Level.ERROR;
-import static org.apache.log4j.Level.WARN;
-
import org.jclouds.logging.BaseLogger;
import org.jclouds.logging.Logger;
@@ -26,17 +23,17 @@ import org.jclouds.logging.Logger;
* {@link org.apache.log4j.Logger} implementation of {@link Logger}.
*/
public class Log4JLogger extends BaseLogger {
- private final org.apache.log4j.Logger logger;
+ private final org.apache.logging.log4j.Logger logger;
private final String category;
public static class Log4JLoggerFactory implements LoggerFactory {
public Logger getLogger(String category) {
- return new Log4JLogger(category, org.apache.log4j.Logger
+ return new Log4JLogger(category, org.apache.logging.log4j.LogManager
.getLogger(category));
}
}
- public Log4JLogger(String category, org.apache.log4j.Logger logger) {
+ public Log4JLogger(String category, org.apache.logging.log4j.Logger
logger) {
this.category = category;
this.logger = logger;
}
@@ -79,7 +76,7 @@ public class Log4JLogger extends BaseLogger {
}
public boolean isWarnEnabled() {
- return logger.isEnabledFor(WARN);
+ return logger.isWarnEnabled();
}
@Override
@@ -93,7 +90,7 @@ public class Log4JLogger extends BaseLogger {
}
public boolean isErrorEnabled() {
- return logger.isEnabledFor(ERROR);
+ return logger.isErrorEnabled();
}
public String getCategory() {
diff --git a/loadbalancer/pom.xml b/loadbalancer/pom.xml
index 0f217f4..1359b14 100644
--- a/loadbalancer/pom.xml
+++ b/loadbalancer/pom.xml
@@ -61,8 +61,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/project/pom.xml b/project/pom.xml
index 9408b34..1800439 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -236,7 +236,7 @@
<modernizer-maven-annotations.version>1.8.0</modernizer-maven-annotations.version>
<!-- Log dependency versions -->
- <log4j.version>1.2.17</log4j.version>
+ <log4j.version>2.16.0</log4j.version>
<logback.version>1.1.2</logback.version>
<!-- OSGi dependency versions -->
@@ -336,8 +336,8 @@
<!-- Log dependencies -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
diff --git a/providers/b2/pom.xml b/providers/b2/pom.xml
index 133846f..28d3b64 100644
--- a/providers/b2/pom.xml
+++ b/providers/b2/pom.xml
@@ -66,8 +66,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/skeletons/standalone-compute/pom.xml
b/skeletons/standalone-compute/pom.xml
index 8a72aa6..01d2648 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -59,8 +59,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
