diff --git a/pom.xml b/pom.xml index fbc14f812..902bad17b 100644 --- a/pom.xml +++ b/pom.xml @@ -230,8 +230,8 @@ org.apache.logging.log4j log4j-jcl 2.21.1 - - + + com.nimbusds nimbus-jose-jwt jdk16 diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java index d9ebf341a..a534383a0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaHibernateDAO.java @@ -14,7 +14,8 @@ import java.util.List; import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Hibernate; import org.hibernate.Query; @@ -52,7 +53,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i private static String FS_BPE = "FS_BPE_"; - private static Logger log = Logger.getLogger(EmpresaHibernateDAO.class); + private static Logger log = LogManager.getLogger(EmpresaHibernateDAO.class); @Autowired private DataSource dataSource; diff --git a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java index c1b3310a1..5d647fc74 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java @@ -30,14 +30,14 @@ import javax.persistence.Transient; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.impl.EmpresaServiceImpl; import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; import com.rjconsultores.ventaboletos.utilerias.CustomEnum; import com.rjconsultores.ventaboletos.utilerias.DateUtil; @@ -62,7 +62,7 @@ import br.com.rjconsultores.auditador.interfaces.Auditavel; public class Usuario implements Serializable, UserDetails, Auditavel { public final static int CANT_DIAS_CONTRASENA = 999; - private static Logger log = Logger.getLogger(Usuario.class); + private static Logger log = LogManager.getLogger(Usuario.class); private static final long serialVersionUID = 1L; @AuditarID