BAH-1362 | Rohit, Deepthi | Upgrades log4j to the latest version 2.17…

….1 (#11) * BAH-1362 | Rohit, Deepthi | Upgrades log4j to the latest version 2.17.1 * BAH-1362 | Rohit, Deepthi | Keeps log4j version submodule specific * BAH-1362 | Rohit, Deepthi | Adds provided in log4j dependency
ICT4H · Jan 21, 2022 · a5e198f · a5e198f
1 parent 77b8893
commit a5e198f
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 60 deletions.
diff --git a/atomfeed-client-spring/pom.xml b/atomfeed-client-spring/pom.xml
@@ -16,6 +16,7 @@
 
     <properties>
         <spring.version>3.1.0.RELEASE</spring.version>
+        <log4jVersion>2.17.1</log4jVersion>
     </properties>
 
     <repositories>
@@ -46,9 +47,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4jVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4jVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/atomfeed-client/pom.xml b/atomfeed-client/pom.xml
@@ -17,6 +17,7 @@
         <jdbc.username>root</jdbc.username>
         <jdbc.password>admin</jdbc.password>
         <jdbc.url>jdbc:h2:~/atomfeed;DATABASE_TO_UPPER=false</jdbc.url>
+        <log4jVersion>2.17.1</log4jVersion>
     </properties>
 
     <dependencies>
@@ -26,9 +27,15 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4jVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4jVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/AtomFeedProperties.java b/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/AtomFeedProperties.java
@@ -1,6 +1,7 @@
 package org.ict4h.atomfeed.client;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class AtomFeedProperties {
     private int readTimeout = 20000;
@@ -10,7 +11,7 @@ public class AtomFeedProperties {
     private int failedEventMaxRetry = 5;
     private int failedEventsBatchProcessSize = 5;
 
-    private static Logger logger = Logger.getLogger(AtomFeedProperties.class);
+    private static Logger logger = LogManager.getLogger(AtomFeedProperties.class);
     private boolean handleRedirection = false;
 
     public int getReadTimeout() {

diff --git a/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/repository/AllFeeds.java b/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/repository/AllFeeds.java
@@ -2,7 +2,8 @@
 
 import com.sun.syndication.feed.atom.Feed;
 import com.sun.syndication.io.WireFeedInput;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.client.exceptions.AtomFeedClientException;
 import org.ict4h.atomfeed.client.AtomFeedProperties;
 import org.ict4h.atomfeed.client.repository.datasource.DefaultHttpClient;
@@ -17,7 +18,7 @@ public class AllFeeds {
     private AtomFeedProperties atomFeedProperties = new AtomFeedProperties();
     private Map<String, String> clientCookies;
 
-    private static Logger logger = Logger.getLogger(AllFeeds.class);
+    private static Logger logger = LogManager.getLogger(AllFeeds.class);
 
     protected AllFeeds() {
         this.httpClient = new DefaultHttpClient();

diff --git a/...ient/src/main/java/org/ict4h/atomfeed/client/repository/jdbc/AllFailedEventsJdbcImpl.java b/...ient/src/main/java/org/ict4h/atomfeed/client/repository/jdbc/AllFailedEventsJdbcImpl.java
@@ -2,7 +2,8 @@
 
 import com.sun.syndication.feed.atom.Category;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.Configuration;
 import org.ict4h.atomfeed.client.domain.Event;
 import org.ict4h.atomfeed.client.domain.FailedEvent;
@@ -17,7 +18,7 @@
 import java.util.List;
 
 public class AllFailedEventsJdbcImpl implements AllFailedEvents {
-    private static Logger logger = Logger.getLogger(AllFailedEventsJdbcImpl.class);
+    private static Logger logger = LogManager.getLogger(AllFailedEventsJdbcImpl.class);
     public static final String FAILED_EVENTS_TABLE = "failed_events";
     public static final String FAILED_EVENT_RETRY_LOG_TABLE = "failed_event_retry_log";
     public static final int ERROR_MSG_MAX_LEN = 4000;

diff --git a/...ed-client/src/main/java/org/ict4h/atomfeed/client/repository/jdbc/AllMarkersJdbcImpl.java b/...ed-client/src/main/java/org/ict4h/atomfeed/client/repository/jdbc/AllMarkersJdbcImpl.java
@@ -1,6 +1,7 @@
 package org.ict4h.atomfeed.client.repository.jdbc;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.Configuration;
 import org.ict4h.atomfeed.client.domain.Marker;
 import org.ict4h.atomfeed.client.exceptions.AtomFeedClientException;
@@ -17,7 +18,7 @@
 import java.util.List;
 
 public class AllMarkersJdbcImpl implements AllMarkers {
-    private static Logger logger = Logger.getLogger(AllMarkersJdbcImpl.class);
+    private static Logger logger = LogManager.getLogger(AllMarkersJdbcImpl.class);
     private JdbcConnectionProvider connectionProvider;
 
     public AllMarkersJdbcImpl(JdbcConnectionProvider connectionProvider) {

diff --git a/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/service/AtomFeedClient.java b/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/service/AtomFeedClient.java
@@ -2,7 +2,8 @@
 
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.client.domain.Event;
 import org.ict4h.atomfeed.client.domain.FailedEvent;
 import org.ict4h.atomfeed.client.domain.FailedEventRetryLog;
@@ -22,7 +23,7 @@
 import java.util.List;
 
 public class AtomFeedClient implements FeedClient {
-    private static Logger logger = Logger.getLogger(AtomFeedClient.class);
+    private static Logger logger = LogManager.getLogger(AtomFeedClient.class);
 
     private AllFeeds allFeeds;
     private AtomFeedProperties atomFeedProperties;

diff --git a/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/service/FeedEnumerator.java b/atomfeed-client/src/main/java/org/ict4h/atomfeed/client/service/FeedEnumerator.java
@@ -2,7 +2,6 @@
 
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import org.apache.log4j.Logger;
 import org.ict4h.atomfeed.client.domain.Marker;
 import org.ict4h.atomfeed.client.exceptions.AtomFeedClientException;
 import org.ict4h.atomfeed.client.repository.AllFeeds;
@@ -19,8 +18,6 @@ public class FeedEnumerator implements Iterable<Entry>, Iterator<Entry> {
     private Feed currentFeed;
     private List<Entry> entries;
 
-    private static Logger logger = Logger.getLogger(FeedEnumerator.class);
-
     public FeedEnumerator(AllFeeds allFeeds, Marker marker) {
         this.allFeeds = allFeeds;
         this.marker = marker;

diff --git a/atomfeed-client/src/test/resources/log4j.xml b/atomfeed-client/src/test/resources/log4j.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%C{1}] %m%n" />
-        </layout>
-    </appender>
-
-    <logger name="org.springframework">
-        <level value="warn"/>
-        <appender-ref ref="console"/>
-    </logger>
-
-    <logger name="org.ict4h.atomfeed.client">
-        <level value="warn"/>
-        <appender-ref ref="console"/>
-    </logger>
-
-    <root>
-        <priority value="warn"/>
-        <appender-ref ref="console"/>
-    </root>
-</log4j:configuration>
+<Configuration>
+    <Appenders>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %-5p [%C{1}] %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.springframework" level="warn">
+            <AppenderRef ref="console"/>
+        </Logger>
+        <Logger name="org.ict4h.atomfeed.client" level="warn">
+            <AppenderRef ref="console"/>
+        </Logger>
+        <Root level="warn">
+            <AppenderRef ref="console"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/atomfeed-commons/pom.xml b/atomfeed-commons/pom.xml
@@ -11,6 +11,10 @@
     <artifactId>atomfeed-commons</artifactId>
     <version>1.9.4</version>
 
+    <properties>
+        <log4jVersion>2.17.1</log4jVersion>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -30,9 +34,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4jVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4jVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/atomfeed-server/pom.xml b/atomfeed-server/pom.xml
@@ -13,6 +13,10 @@
     <version>1.9.4</version>
     <packaging>jar</packaging>
 
+    <properties>
+        <log4jVersion>2.17.1</log4jVersion>
+    </properties>
+
     <!--<properties>-->
         <!--<db.server>localhost</db.server>-->
         <!--<db.name>atomfeed</db.name>-->
@@ -133,9 +137,15 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4jVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4jVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/atomfeed-server/src/main/java/org/ict4h/atomfeed/server/service/EventFeedServiceImpl.java b/atomfeed-server/src/main/java/org/ict4h/atomfeed/server/service/EventFeedServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.sun.syndication.feed.atom.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
 import org.ict4h.atomfeed.server.domain.EventFeed;
 import org.ict4h.atomfeed.server.domain.EventRecord;
 import org.ict4h.atomfeed.server.domain.EventRecordComparator;
@@ -19,7 +18,6 @@ public class EventFeedServiceImpl implements EventFeedService {
     private static final String LINK_TYPE_SELF = "self";
     private static final String LINK_TYPE_VIA = "via";
     private static final String ATOMFEED_MEDIA_TYPE = "application/vnd.atomfeed+xml";
-    private final Logger logger = Logger.getLogger(this.getClass());
 
 	private FeedGenerator feedGenerator;
     private ResourceBundle bundle;

diff --git a/...server/src/main/java/org/ict4h/atomfeed/server/service/helper/EventFeedServiceHelper.java b/...server/src/main/java/org/ict4h/atomfeed/server/service/helper/EventFeedServiceHelper.java
@@ -3,7 +3,7 @@
 import com.sun.syndication.feed.atom.Feed;
 import com.sun.syndication.io.FeedException;
 import com.sun.syndication.io.WireFeedOutput;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.server.service.EventFeedService;
 import org.ict4h.atomfeed.transaction.AFTransactionManager;
 import org.ict4h.atomfeed.transaction.AFTransactionWork;

diff --git a/atomfeed-spring-server/pom.xml b/atomfeed-spring-server/pom.xml
@@ -17,6 +17,7 @@
 
     <properties>
         <spring.version>3.1.0.RELEASE</spring.version>
+        <log4jVersion>2.17.1</log4jVersion>
     </properties>
 
     <repositories>
@@ -47,9 +48,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4jVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4jVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...src/main/java/org/ict4h/atomfeed/server/transaction/AtomFeedSpringTransactionSupport.java b/...src/main/java/org/ict4h/atomfeed/server/transaction/AtomFeedSpringTransactionSupport.java
@@ -1,6 +1,5 @@
 package org.ict4h.atomfeed.server.transaction;
 
-import org.apache.log4j.Logger;
 import org.ict4h.atomfeed.jdbc.JdbcConnectionProvider;
 import org.ict4h.atomfeed.transaction.AFTransactionManager;
 import org.ict4h.atomfeed.transaction.AFTransactionWork;
@@ -18,7 +17,6 @@
 import java.util.Map;
 
 public class AtomFeedSpringTransactionSupport implements AFTransactionManager, JdbcConnectionProvider {
-    private static Logger logger = Logger.getLogger(AtomFeedSpringTransactionSupport.class);
     private final DataSource dataSource;
     private PlatformTransactionManager transactionManager;
     private Map<AFTransactionWork.PropagationDefinition, Integer> propagationMap = new HashMap<AFTransactionWork.PropagationDefinition, Integer>();

diff --git a/atomfeed-spring-server/src/main/java/org/ict4h/atomfeed/spring/resource/EventResource.java b/atomfeed-spring-server/src/main/java/org/ict4h/atomfeed/spring/resource/EventResource.java
@@ -1,6 +1,7 @@
 package org.ict4h.atomfeed.spring.resource;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.ict4h.atomfeed.server.service.EventFeedService;
 import org.ict4h.atomfeed.server.service.helper.EventFeedServiceHelper;
 import org.ict4h.atomfeed.server.transaction.AtomFeedSpringTransactionSupport;
@@ -19,7 +20,7 @@
 public class EventResource {
     private EventFeedService eventFeedService;
     private AtomFeedSpringTransactionSupport atomTxManager;
-    private static Logger logger = Logger.getLogger(EventResource.class);
+    private static Logger logger = LogManager.getLogger(EventResource.class);
 
     @Autowired
     public EventResource(EventFeedService eventFeedService, AtomFeedSpringTransactionSupport atomTxManager) {

diff --git a/pom.xml b/pom.xml
@@ -196,7 +196,7 @@
     <repositories>
         <repository>
             <id>central</id>
-            <url>http://repo1.maven.org/maven2</url>
+            <url>https://repo1.maven.org/maven2</url>
             <name>Repository for dependencies</name>
             <snapshots>
                 <enabled>true</enabled>
@@ -228,7 +228,7 @@
     <pluginRepositories>
         <pluginRepository>
             <id>central</id>
-            <url>http://repo1.maven.org/maven2</url>
+            <url>https://repo1.maven.org/maven2</url>
             <name>Repository for plugins</name>
         </pluginRepository>
     </pluginRepositories>