Log4j cleanup. Remove last traces of log4j v1 (and remove log4j1 brid…

…ge to avoid them coming back). Create log4j2 settings for Handle Plugin.

dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataExportSearchIT.java

@@ -23,7 +23,8 @@
 import com.google.common.io.Files;
 import com.opencsv.CSVReader;
 import com.opencsv.exceptions.CsvException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.app.launcher.ScriptLauncher;
 import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
@@ -51,7 +52,7 @@ public class MetadataExportSearchIT extends AbstractIntegrationTestWithDatabase
     private Item[] itemsSubject2 = new Item[numberItemsSubject2];
     private String filename;
     private Collection collection;
-    private Logger logger = Logger.getLogger(MetadataExportSearchIT.class);
+    private Logger logger = LogManager.getLogger(MetadataExportSearchIT.class);
     private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     private SearchService searchService;
 

dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java

@@ -11,7 +11,8 @@
 import java.sql.SQLException;
 import java.util.Date;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.orcid.OrcidHistory;
@@ -24,7 +25,7 @@
  */
 public class OrcidHistoryBuilder extends  AbstractBuilder<OrcidHistory, OrcidHistoryService> {
 
-    private static final Logger log = Logger.getLogger(OrcidHistoryBuilder.class);
+    private static final Logger log = LogManager.getLogger(OrcidHistoryBuilder.class);
 
     private OrcidHistory orcidHistory;
 

dspace-oai/pom.xml

@@ -123,11 +123,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <!-- TODO: This "bridge" should be removed as we should not support Log4j v1 syntax anymore -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-        </dependency>
 
         <!-- Testing -->
         <dependency>

dspace-oai/src/main/java/org/dspace/xoai/filter/ItemsWithBitstreamFilter.java

@@ -9,8 +9,8 @@
 
 import java.sql.SQLException;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
 import org.dspace.handle.factory.HandleServiceFactory;

dspace-rdf/pom.xml

@@ -89,10 +89,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-	<dependency>
-	  <groupId>org.apache.logging.log4j</groupId>
-	  <artifactId>log4j-web</artifactId>
-	</dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>

dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java

@@ -13,7 +13,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.PageRest;
 import org.dspace.app.rest.model.SearchEventRest;
 import org.dspace.app.rest.model.SearchResultsRest;
@@ -31,7 +32,7 @@
 @Component
 public class SearchEventConverter {
     /* Log4j logger */
-    private static final Logger log = Logger.getLogger(SearchEventConverter.class);
+    private static final Logger log = LogManager.getLogger(SearchEventConverter.class);
 
     @Autowired
     private ScopeResolver scopeResolver;

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamLinksetProcessor.java

@@ -10,7 +10,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Bitstream;
@@ -25,7 +26,7 @@
  */
 public class BitstreamLinksetProcessor extends BitstreamSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(BitstreamLinksetProcessor.class);
+    private static final Logger log = LogManager.getLogger(BitstreamLinksetProcessor.class);
 
     private final BitstreamService bitstreamService;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamParentItemProcessor.java

@@ -10,7 +10,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Bitstream;
@@ -28,7 +29,7 @@
  */
 public class BitstreamParentItemProcessor extends BitstreamSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(BitstreamParentItemProcessor.class);
+    private static final Logger log = LogManager.getLogger(BitstreamParentItemProcessor.class);
 
     private final BitstreamService bitstreamService;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamTypeProcessor.java

@@ -11,7 +11,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 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.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Bitstream;
@@ -28,7 +29,7 @@
  */
 public class BitstreamTypeProcessor extends BitstreamSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(BitstreamTypeProcessor.class);
+    private static final Logger log = LogManager.getLogger(BitstreamTypeProcessor.class);
 
     @Autowired
     private SimpleMapConverter mapConverterDSpaceToSchemaOrgUri;

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemAuthorProcessor.java

@@ -16,7 +16,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
@@ -37,7 +38,7 @@ public class ItemAuthorProcessor extends ItemSignpostingProcessor {
     /**
      * log4j category
      */
-    private static final Logger log = Logger.getLogger(ItemAuthorProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemAuthorProcessor.class);
 
     private final ItemService itemService;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemContentBitstreamsProcessor.java

@@ -11,7 +11,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Bitstream;
@@ -33,7 +34,7 @@ public class ItemContentBitstreamsProcessor extends ItemSignpostingProcessor {
     /**
      * log4j category
      */
-    private static final Logger log = Logger.getLogger(ItemContentBitstreamsProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemContentBitstreamsProcessor.class);
 
     public ItemContentBitstreamsProcessor(FrontendUrlService frontendUrlService) {
         super(frontendUrlService);

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemDescribedbyProcessor.java

@@ -10,7 +10,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
@@ -23,7 +24,7 @@
  */
 public class ItemDescribedbyProcessor extends ItemSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(ItemDescribedbyProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemDescribedbyProcessor.class);
 
     private final ConfigurationService configurationService;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLicenseProcessor.java

@@ -11,7 +11,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 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.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
@@ -25,7 +26,7 @@
  */
 public class ItemLicenseProcessor extends ItemSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(ItemLicenseProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemLicenseProcessor.class);
 
     private final CreativeCommonsService creativeCommonsService =
             LicenseServiceFactory.getInstance().getCreativeCommonsService();

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLinksetProcessor.java

@@ -10,7 +10,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
@@ -23,7 +24,7 @@
  */
 public class ItemLinksetProcessor extends ItemSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(ItemLinksetProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemLinksetProcessor.class);
 
     private final ConfigurationService configurationService;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemTypeProcessor.java

@@ -11,7 +11,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 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.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
@@ -27,7 +28,7 @@
  */
 public class ItemTypeProcessor extends ItemSignpostingProcessor {
 
-    private static final Logger log = Logger.getLogger(ItemTypeProcessor.class);
+    private static final Logger log = LogManager.getLogger(ItemTypeProcessor.class);
     private static final String ABOUT_PAGE_URI = "https://schema.org/AboutPage";
 
     @Autowired

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java

@@ -13,7 +13,8 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.security.BitstreamMetadataReadPermissionEvaluatorPlugin;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.processor.bitstream.BitstreamSignpostingProcessor;
@@ -37,7 +38,7 @@
 @Service
 public class LinksetServiceImpl implements LinksetService {
 
-    private static final Logger log = Logger.getLogger(LinksetServiceImpl.class);
+    private static final Logger log = LogManager.getLogger(LinksetServiceImpl.class);
 
     @Autowired
     protected ItemService itemService;

dspace-sword/pom.xml

@@ -91,10 +91,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-web</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>xom</groupId>

dspace-swordv2/pom.xml

@@ -95,10 +95,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-web</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

dspace/bin/start-handle-server

@@ -36,6 +36,6 @@ rm -f $HANDLEDIR/txns/lock
 # does not support more than one JVM writing to the same rolling log.
 nohup java $JAVA_OPTS -classpath `$BINDIR/dspace classpath` \
     -Ddspace.log.init.disable=true \
-    -Dlog4j.configuration=log4j-handle-plugin.properties \
+    -Dlog4j2.configurationFile=log4j2-handle-plugin.xml \
     net.handle.server.Main $HANDLEDIR \
     </dev/null >> $LOGDIR/handle-server.log 2>&1 &

dspace/bin/start-handle-server.bat

@@ -51,7 +51,7 @@ echo.
 echo NOTE: If you want to run the Handle Server as a backend process, re-execute this script
 echo using the Windows "start" command. For example, "start /B start-handle-server.bat"
 echo.
-java %JAVA_OPTS% -cp "%DSPACE_CLASSPATH%" -Ddspace.log.init.disable=true -Dlog4j.configuration=log4j-handle-plugin.properties net.handle.server.Main %HANDLEDIR%  >> "%LOGDIR%/handle-server.log"
+java %JAVA_OPTS% -cp "%DSPACE_CLASSPATH%" -Ddspace.log.init.disable=true -Dlog4j2.configurationFile=log4j2-handle-plugin.xml net.handle.server.Main %HANDLEDIR%  >> "%LOGDIR%/handle-server.log"
 
 REM Clean up DSPACE_CLASSPATH variable
 set DSPACE_CLASSPATH=