From 5a6e4d6efd067d2ad1941dced132162838cf4c0c Mon Sep 17 00:00:00 2001 From: etj Date: Wed, 8 Nov 2023 11:48:03 +0100 Subject: [PATCH] #251 Upgrade log4j --- .../gui/server/service/impl/LoginService.java | 4 +-- .../server/service/impl/StartupService.java | 4 +-- src/pom.xml | 4 +-- .../org/geoserver/csv2geofence/BaseTest.java | 2 +- src/services/core/persistence/pom.xml | 10 +++--- .../core/dao/impl/AdminRuleDAOImpl.java | 4 +-- .../geofence/core/dao/impl/GFUserDAOImpl.java | 4 +-- .../core/dao/impl/GSInstanceDAOImpl.java | 4 +-- .../geofence/core/dao/impl/GSUserDAOImpl.java | 4 +-- .../core/dao/impl/LayerDetailsDAOImpl.java | 4 +-- .../core/dao/impl/PrioritizableDAOImpl.java | 4 +-- .../geofence/core/dao/impl/RuleDAOImpl.java | 4 +-- .../core/dao/impl/RuleLimitsDAOImpl.java | 4 +-- .../core/dao/impl/UserGroupDAOImpl.java | 4 +-- .../core/dao/util/GeofenceDaoRegistry.java | 4 +-- .../geofence/core/dao/BaseDAOTest.java | 4 +-- src/services/core/services-impl/pom.xml | 5 +-- .../services/AdminRuleAdminServiceImpl.java | 4 +-- .../services/AuthorizationServiceImpl.java | 4 +-- .../services/DefaultUserResolver.java | 4 +-- .../services/GFUserAdminServiceImpl.java | 4 +-- .../services/InstanceAdminServiceImpl.java | 4 +-- .../services/RuleAdminServiceImpl.java | 4 +-- .../services/RuleReaderServiceImpl.java | 4 +-- .../services/UserAdminServiceImpl.java | 4 +-- .../services/UserGroupAdminServiceImpl.java | 4 +-- .../geofence/services/util/FilterUtils.java | 4 +-- .../geofence/services/ServiceTestBase.java | 4 +-- .../test/AbstractSpringContextTest.java | 4 +-- src/services/core/webtest/pom.xml | 4 +-- .../geofence/servicetest/MainTest.java | 4 +-- .../core/webtest/src/main/resources/log4j.xml | 35 ------------------- .../webtest/src/main/resources/log4j2.xml | 27 ++++++++++++++ src/services/modules/ldap/pom.xml | 4 +-- .../ldap/dao/impl/GSUserAttributesMapper.java | 4 +-- .../geofence/ldap/dao/impl/LDAPBaseDAO.java | 4 +-- .../dao/impl/UserGroupAttributesMapper.java | 4 +-- .../geofence/ldap/utils/LdapUtils.java | 4 +-- .../geofence/ldap/dao/impl/BaseDAOTest.java | 4 +-- src/services/modules/login/impl/pom.xml | 4 +-- .../geofence/login/LoginServiceImpl.java | 4 +-- .../login/cxf/BasicAuthInterceptor.java | 4 +-- .../geofence/login/util/GrantAll.java | 4 +-- .../geofence/login/util/MD5Util.java | 4 +-- .../geofence/login/util/SessionManager.java | 4 +-- src/services/modules/rest/client/pom.xml | 6 ---- .../services/rest/GeoFenceClientTest.java | 4 +-- src/services/modules/rest/impl/pom.xml | 4 +-- .../rest/auth/AuthenticationHandler.java | 4 +-- .../rest/auth/AuthorizationHandler.java | 4 +-- .../GeofenceAuthenticationInterceptor.java | 4 +-- .../rest/auth/GeofenceSecurityContext.java | 4 +-- .../rest/impl/BaseRESTServiceImpl.java | 4 +-- .../rest/impl/RESTAdminRuleServiceImpl.java | 4 +-- .../rest/impl/RESTBatchServiceImpl.java | 4 +-- .../rest/impl/RESTConfigServiceImpl.java | 4 +-- .../rest/impl/RESTInstanceServiceImpl.java | 4 +-- .../rest/impl/RESTRuleServiceImpl.java | 4 +-- .../rest/impl/RESTUserGroupServiceImpl.java | 4 +-- .../rest/impl/RESTUserServiceImpl.java | 4 +-- .../services/rest/utils/InstanceCleaner.java | 4 +-- .../services/rest/impl/RESTBaseTest.java | 4 +-- .../rest/impl/RESTRuleServiceImplTest.java | 4 +-- .../impl/RESTUserGroupServiceImplTest.java | 4 +-- .../rest/impl/RESTUserServiceImplTest.java | 4 +-- .../rest/model/ModelPrintoutFakeTest.java | 4 +-- src/services/modules/rest/test/pom.xml | 4 +-- .../services/servicetest/MainTest.java | 4 +-- src/services/pom.xml | 30 +++++----------- 69 files changed, 169 insertions(+), 194 deletions(-) delete mode 100644 src/services/core/webtest/src/main/resources/log4j.xml create mode 100644 src/services/core/webtest/src/main/resources/log4j2.xml diff --git a/src/gui/core/plugin/userui/src/main/java/org/geoserver/geofence/gui/server/service/impl/LoginService.java b/src/gui/core/plugin/userui/src/main/java/org/geoserver/geofence/gui/server/service/impl/LoginService.java index e8145d82..b5ded4cf 100644 --- a/src/gui/core/plugin/userui/src/main/java/org/geoserver/geofence/gui/server/service/impl/LoginService.java +++ b/src/gui/core/plugin/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 index 11c093e9..a8a5592a 100644 --- 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 index fe2dc831..cdc72112 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -25,7 +25,7 @@ 1.1.3.2 42.2.18 1.3.3 - 1.17.1 + 1.19.0 Master GeoFence POM @@ -68,7 +68,7 @@ scm:git:git@github.com:geoserver/geofence.git - master + main https://github.com/geoserver/geofence 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 index 8a1712ef..91fa1cf0 100644 --- 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 index a29f8d47..67ecc5ea 100644 --- a/src/services/core/persistence/pom.xml +++ b/src/services/core/persistence/pom.xml @@ -48,6 +48,11 @@ commons-codec + + org.apache.logging.log4j + log4j-api + + @@ -57,11 +62,6 @@ dom4j - - log4j - log4j - - diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java index 4d2589b2..38165ba8 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java +++ b/src/services/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java index cb44fc6f..93b979b9 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java +++ b/src/services/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java index aa6b88b3..148b3f49 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java +++ b/src/services/core/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java index 1cef5c36..28400667 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java +++ b/src/services/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java index 8a61c386..10c0df1f 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java +++ b/src/services/core/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java index 677cee83..05ced7d2 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java +++ b/src/services/core/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java index 905940bf..e07adf3c 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java +++ b/src/services/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java index efffcc6c..02790df8 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java +++ b/src/services/core/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java index d9c7cbfe..9805aa26 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java +++ b/src/services/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/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java b/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java index 92ac7b05..0ebd4f96 100644 --- a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java +++ b/src/services/core/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 index 4d46c3e8..83ea4a7c 100644 --- 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 index aa5bc5c6..a72c0f96 100644 --- a/src/services/core/services-impl/pom.xml +++ b/src/services/core/services-impl/pom.xml @@ -86,9 +86,10 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api + org.geotools gt-main diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java index 10f81f78..9f75551b 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java +++ b/src/services/core/services-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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java index f8e56b27..7013ec99 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java index 76f72236..1652f650 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java +++ b/src/services/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java index c0c85846..b3252d63 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java index 520977dd..f795e401 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java index 7b5e98b0..ae2f08fa 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java index 15a49c2a..686e0f7d 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java index dc2cf9f9..0e32421a 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java +++ b/src/services/core/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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java index 047b537c..55c0a3f0 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java +++ b/src/services/core/services-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/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java index a88fe3ed..1925817c 100644 --- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java +++ b/src/services/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/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java b/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java index df75de3d..d322602e 100644 --- a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java +++ b/src/services/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/src/services/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java b/src/services/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java index 7b3d67c2..08b5afd9 100644 --- a/src/services/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java +++ b/src/services/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 index 95ecb668..fe187a47 100644 --- a/src/services/core/webtest/pom.xml +++ b/src/services/core/webtest/pom.xml @@ -83,8 +83,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core 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 index 0256c73a..72b0c1c4 100644 --- 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 deleted file mode 100644 index f1c6c116..00000000 --- a/src/services/core/webtest/src/main/resources/log4j.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - logs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/services/core/webtest/src/main/resources/log4j2.xml b/src/services/core/webtest/src/main/resources/log4j2.xml new file mode 100644 index 00000000..d462b287 --- /dev/null +++ b/src/services/core/webtest/src/main/resources/log4j2.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/services/modules/ldap/pom.xml b/src/services/modules/ldap/pom.xml index a661a7b1..aeca0a4c 100644 --- a/src/services/modules/ldap/pom.xml +++ b/src/services/modules/ldap/pom.xml @@ -139,8 +139,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java index 575d5c65..3925fb2d 100644 --- a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java +++ b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java @@ -12,8 +12,8 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; 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; /** * AttributeMapper for GSUser objects. diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java index 960204d9..8f085cb4 100644 --- a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java +++ b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java @@ -33,8 +33,8 @@ import com.googlecode.genericdao.search.Filter; 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; import org.springframework.beans.factory.InitializingBean; /** diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java index ca9bf9ef..eb2cdde3 100644 --- a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java +++ b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java @@ -12,8 +12,8 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; 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; /** * AttributeMapper for UserGroup objects. diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java index 6a23c8de..2c941106 100644 --- a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java +++ b/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java @@ -10,8 +10,8 @@ import com.googlecode.genericdao.search.Filter; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author "Mauro Bartolomeoli - mauro.bartolomeoli@geo-solutions.it" diff --git a/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java b/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java index 2cf67410..402e0133 100644 --- a/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java +++ b/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java @@ -16,8 +16,8 @@ import org.geoserver.geofence.core.dao.GSUserDAO; import org.geoserver.geofence.core.dao.UserGroupDAO; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static org.junit.Assert.*; import org.junit.AfterClass; diff --git a/src/services/modules/login/impl/pom.xml b/src/services/modules/login/impl/pom.xml index e853e386..3e371fe6 100644 --- a/src/services/modules/login/impl/pom.xml +++ b/src/services/modules/login/impl/pom.xml @@ -55,8 +55,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java index 57617cee..69d7b7f9 100644 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java +++ b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java @@ -15,8 +15,8 @@ import org.geoserver.geofence.login.util.GrantAll; import org.geoserver.geofence.login.util.SessionManager; -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.DisposableBean; import org.springframework.beans.factory.InitializingBean; diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java index 009df473..14975b19 100644 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java +++ b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java @@ -23,8 +23,8 @@ import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; -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/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java index 5f345370..4ea0fb08 100644 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java +++ b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java @@ -12,8 +12,8 @@ import org.geoserver.geofence.api.dto.GrantedAuths; import org.geoserver.geofence.api.exception.AuthException; -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/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java index d6e8e502..728827a6 100644 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java +++ b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java @@ -9,8 +9,8 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -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/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java index 64fe6417..c2a0ccd7 100644 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java +++ b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java @@ -11,8 +11,8 @@ import org.geoserver.geofence.api.dto.GrantedAuths; import org.geoserver.geofence.api.exception.AuthException; -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/src/services/modules/rest/client/pom.xml b/src/services/modules/rest/client/pom.xml index 920e0e36..6ceae8cb 100644 --- a/src/services/modules/rest/client/pom.xml +++ b/src/services/modules/rest/client/pom.xml @@ -56,16 +56,10 @@ test - - log4j - log4j - - diff --git a/src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java b/src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java index 4292673b..85202b53 100644 --- a/src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java +++ b/src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; import javax.ws.rs.core.Response; -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.rest.model.RESTOutputAdminRule; import org.junit.AfterClass; diff --git a/src/services/modules/rest/impl/pom.xml b/src/services/modules/rest/impl/pom.xml index 930b49b1..60b637d2 100644 --- a/src/services/modules/rest/impl/pom.xml +++ b/src/services/modules/rest/impl/pom.xml @@ -116,8 +116,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java index ee36c351..a04e09b0 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java @@ -19,8 +19,8 @@ import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java index d736bb2d..a6722d38 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java @@ -22,8 +22,8 @@ import org.apache.cxf.service.invoker.MethodDispatcher; import org.apache.cxf.service.model.BindingOperationInfo; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class AuthorizationHandler extends AbstractPhaseInterceptor diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java index d4b8849b..27a490e7 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java @@ -12,8 +12,8 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java index df6f726c..0bac58ad 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java @@ -8,8 +8,8 @@ import java.security.Principal; import org.apache.cxf.security.SecurityContext; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java index 8e96934d..bf1753d1 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java @@ -23,8 +23,8 @@ import org.geoserver.geofence.services.rest.model.RESTShortUser; import org.geoserver.geofence.services.rest.model.util.IdName; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java index 79e5c50a..740ade1d 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java @@ -30,8 +30,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -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.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java index 89247a2f..aa3fa0dd 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java @@ -24,8 +24,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -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.transaction.annotation.Transactional; diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java index 74e6ee40..b6969626 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java @@ -56,8 +56,8 @@ import org.geoserver.geofence.services.rest.utils.InstanceCleaner; import java.util.ArrayList; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java index ef1acf44..20f5bd7d 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java @@ -28,8 +28,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java index 5b5c0c4d..5468e69d 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java @@ -46,8 +46,8 @@ import org.geoserver.geofence.services.rest.model.RESTRulePosition.RulePosition; import org.geoserver.geofence.services.rest.model.util.IdName; -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.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java index 7608d962..9a5a6e40 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java @@ -24,8 +24,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java index 00c0f19a..def3b8ba 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java @@ -31,8 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -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/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java index 4f40af32..17fcb970 100644 --- a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java +++ b/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java @@ -18,8 +18,8 @@ import org.geoserver.geofence.services.dto.ShortUser; 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; /** * diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java index d8e031fd..8338413c 100644 --- a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java +++ b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java @@ -15,8 +15,8 @@ import org.geoserver.geofence.services.rest.model.RESTShortUser; import org.geoserver.geofence.services.rest.model.RESTShortUserList; import org.geoserver.geofence.services.rest.model.config.RESTFullUserGroupList; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Before; diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java index a470b3f8..9501d09f 100644 --- a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java +++ b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.HashSet; import javax.ws.rs.core.Response; -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.rest.model.RESTRulePosition; import org.junit.Test; diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java index 981d12c1..ea9dbcc0 100644 --- a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java +++ b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java @@ -12,8 +12,8 @@ import org.geoserver.geofence.services.rest.model.util.IdName; import java.util.ArrayList; import javax.ws.rs.core.Response; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java index d1179f32..1501ded7 100644 --- a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java +++ b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java @@ -15,8 +15,8 @@ import java.util.HashSet; import java.util.Set; import javax.ws.rs.core.Response; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java index 472f79e5..ccd0aa43 100644 --- a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java +++ b/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.Set; import javax.xml.bind.JAXB; -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.rest.model.RESTRulePosition.RulePosition; import org.junit.Test; diff --git a/src/services/modules/rest/test/pom.xml b/src/services/modules/rest/test/pom.xml index a7e60be3..73408c80 100644 --- a/src/services/modules/rest/test/pom.xml +++ b/src/services/modules/rest/test/pom.xml @@ -90,8 +90,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api diff --git a/src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java b/src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java index 06175592..f5ff1e53 100644 --- a/src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java +++ b/src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java @@ -27,8 +27,8 @@ import org.geoserver.geofence.services.dto.ShortGroup; import org.geoserver.geofence.services.rest.utils.InstanceCleaner; -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; diff --git a/src/services/pom.xml b/src/services/pom.xml index dd1fd99e..affd9b2a 100644 --- a/src/services/pom.xml +++ b/src/services/pom.xml @@ -46,7 +46,9 @@ 1.3.03 2.1 - 1.1.2 + 1.2 + 2.17.2 + 2.3 3.2 1.7.0 @@ -215,47 +217,33 @@ - - - - - - log4j - log4j - 1.2.17 + ${log4j-version} - -