#251 Upgrade log4j

geoserver · Nov 9, 2023 · d8f7675 · d8f7675
1 parent a7bc045
commit d8f7675
Show file tree

Hide file tree

Showing 70 changed files with 170 additions and 195 deletions.
diff --git a/...gin/userui/src/main/java/org/geoserver/geofence/gui/server/service/impl/LoginService.java b/...gin/userui/src/main/java/org/geoserver/geofence/gui/server/service/impl/LoginService.java
@@ -23,8 +23,8 @@
 import org.geoserver.geofence.gui.service.GeofenceRemoteService;
 import org.geoserver.geofence.services.exception.NotFoundServiceEx;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/src/gui/web/src/main/java/org/geoserver/geofence/gui/server/service/impl/StartupService.java b/src/gui/web/src/main/java/org/geoserver/geofence/gui/server/service/impl/StartupService.java
@@ -11,8 +11,8 @@
 import org.geoserver.geofence.login.util.MD5Util;
 import org.geoserver.geofence.services.GFUserAdminServiceImpl;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/pom.xml b/src/pom.xml
@@ -25,7 +25,7 @@
      <hibernate-spatial-version>1.1.3.2</hibernate-spatial-version>
      <postgresql.jdbc.version>42.2.18</postgresql.jdbc.version>
      <postgis.jdbc.version>1.3.3</postgis.jdbc.version>
-     <jts.version>1.17.1</jts.version>
+     <jts.version>1.19.0</jts.version>
    </properties>
 
    <name>Master GeoFence POM</name>
@@ -68,7 +68,7 @@
 
    <scm>
       <connection>scm:git:git@github.com:geoserver/geofence.git</connection>
-      <tag>master</tag>
+      <tag>main</tag>
       <url>https://github.com/geoserver/geofence</url>
    </scm>
 

diff --git a/src/samples/csv2geofence/src/test/java/org/geoserver/csv2geofence/BaseTest.java b/src/samples/csv2geofence/src/test/java/org/geoserver/csv2geofence/BaseTest.java
@@ -12,7 +12,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import org.apache.log4j.spi.LoggerFactory;
+import org.apache.logging.log4j.spi.LoggerFactory;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;

diff --git a/src/services/core/persistence/pom.xml b/src/services/core/persistence/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+
         <!-- =========================================================== -->
         <!-- 4J UTILS                                                    -->
         <!-- =========================================================== -->
@@ -57,11 +62,6 @@
             <artifactId>dom4j</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
         <!-- =========================================================== -->
         <!--     SPRING                                                  -->
         <!-- =========================================================== -->

diff --git a/...core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java b/...core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java
@@ -17,8 +17,8 @@
 import org.geoserver.geofence.core.dao.DuplicateKeyException;
 import org.geoserver.geofence.core.model.AdminRule;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...es/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java b/...es/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java
@@ -15,8 +15,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.googlecode.genericdao.search.ISearch;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**

diff --git a/...ore/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java b/...ore/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java
@@ -12,8 +12,8 @@
 import org.geoserver.geofence.core.dao.GSInstanceDAO;
 import org.geoserver.geofence.core.model.GSInstance;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.transaction.annotation.Transactional;
 
 

diff --git a/...es/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java b/...es/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java
@@ -18,8 +18,8 @@
 
 import com.googlecode.genericdao.search.ISearch;
 import com.googlecode.genericdao.search.Search;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**

diff --git a/...e/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java b/...e/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java
@@ -13,8 +13,8 @@
 import org.geoserver.geofence.core.dao.LayerDetailsDAO;
 import org.geoserver.geofence.core.model.LayerAttribute;
 import org.geoserver.geofence.core.model.LayerDetails;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.hibernate.Hibernate;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/.../persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java b/.../persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java
@@ -16,8 +16,8 @@
 import com.googlecode.genericdao.search.ISearch;
 import com.googlecode.genericdao.search.Search;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...ices/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java b/...ices/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java
@@ -17,8 +17,8 @@
 
 import org.geoserver.geofence.core.model.enums.GrantType;
 import org.geoserver.geofence.core.model.enums.InsertPosition;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.geoserver.geofence.core.dao.DuplicateKeyException;
 
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...ore/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java b/...ore/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java
@@ -12,8 +12,8 @@
 import org.geoserver.geofence.core.dao.RuleLimitsDAO;
 import org.geoserver.geofence.core.model.RuleLimits;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java b/...core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java
@@ -13,8 +13,8 @@
 import org.geoserver.geofence.core.dao.UserGroupDAO;
 import org.geoserver.geofence.core.model.UserGroup;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...e/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java b/...e/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java
@@ -10,8 +10,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.geoserver.geofence.core.dao.GSUserDAO;
 import org.geoserver.geofence.core.dao.RegistrableDAO;
 import org.geoserver.geofence.core.dao.UserGroupDAO;

diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java b/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java
@@ -17,8 +17,8 @@
 import org.geoserver.geofence.core.model.GSUser;
 import org.geoserver.geofence.core.model.Rule;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

diff --git a/src/services/core/services-impl/pom.xml b/src/services/core/services-impl/pom.xml
@@ -86,9 +86,10 @@
         </dependency>
 
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-main</artifactId>

diff --git a/...ervices-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java b/...ervices-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java
@@ -24,8 +24,8 @@
 import static org.geoserver.geofence.services.util.FilterUtils.addPagingConstraints;
 import static org.geoserver.geofence.services.util.FilterUtils.addStringCriteria;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  *

diff --git a/...services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java b/...services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java
@@ -9,8 +9,8 @@
 
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.core.dao.GSUserDAO;
 import org.geoserver.geofence.core.model.GSUser;

diff --git a/...core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java b/...core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java
@@ -8,8 +8,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.core.dao.GSUserDAO;
 import org.geoserver.geofence.core.dao.UserGroupDAO;

diff --git a/...e/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java b/...e/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java
@@ -11,8 +11,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.core.dao.GFUserDAO;
 import org.geoserver.geofence.core.model.GFUser;

diff --git a/...services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java b/...services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java
@@ -10,8 +10,8 @@
 
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.core.dao.GSInstanceDAO;
 import org.geoserver.geofence.services.dto.ShortInstance;

diff --git a/...ore/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java b/...ore/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.services.exception.BadRequestServiceEx;
 import org.geoserver.geofence.services.exception.NotFoundServiceEx;

diff --git a/...re/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java b/...re/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java
@@ -12,8 +12,8 @@
 import org.geotools.referencing.CRS;
 import org.locationtech.jts.geom.Geometry;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.geoserver.geofence.core.dao.AdminRuleDAO;
 import org.geoserver.geofence.core.dao.LayerDetailsDAO;
 import org.geoserver.geofence.core.dao.RuleDAO;

diff --git a/...ore/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java b/...ore/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java
@@ -13,8 +13,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.services.exception.BadRequestServiceEx;
 import org.geoserver.geofence.services.exception.NotFoundServiceEx;

diff --git a/...ervices-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java b/...ervices-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java
@@ -11,8 +11,8 @@
 
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.geoserver.geofence.services.dto.ShortGroup;
 import org.geoserver.geofence.services.exception.BadRequestServiceEx;

diff --git a/...es/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java b/...es/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
@@ -10,8 +10,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.geoserver.geofence.core.model.IPRangeProvider;
 import org.geoserver.geofence.services.dto.RuleFilter;
 import org.geoserver.geofence.services.exception.BadRequestServiceEx;

diff --git a/...ces/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java b/...ces/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java
@@ -19,8 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.geoserver.geofence.services.dto.ShortAdminRule;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;

diff --git a/...rvices/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java b/...rvices/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java
@@ -7,8 +7,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

diff --git a/src/services/core/webtest/pom.xml b/src/services/core/webtest/pom.xml
@@ -83,8 +83,8 @@
 	<!-- =============================================================== -->
 
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
         </dependency>
 
         <!-- =============================================================== -->

diff --git a/src/services/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java b/src/services/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java
@@ -26,8 +26,8 @@
 
 import java.util.List;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;

diff --git a/src/services/core/webtest/src/main/resources/log4j.xml b/src/services/core/webtest/src/main/resources/log4j.xml