diff --git a/pom.xml b/pom.xml index beb512e4f..cafdf8ea5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.19.1 + 1.20.0 @@ -54,9 +54,31 @@ - log4j - log4j - 1.2.12 + org.apache.logging.log4j + log4j-core + 2.21.1 + + + org.apache.logging.log4j + log4j-api + 2.21.1 + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.21.1 + test + + + org.apache.logging.log4j + log4j-1.2-api + 2.21.1 + test + + + org.apache.logging.log4j + log4j-jcl + 2.21.1 diff --git a/src/com/rjconsultores/ventaboletos/FlyWay.java b/src/com/rjconsultores/ventaboletos/FlyWay.java index 0fb76c145..52a47f605 100644 --- a/src/com/rjconsultores/ventaboletos/FlyWay.java +++ b/src/com/rjconsultores/ventaboletos/FlyWay.java @@ -19,14 +19,15 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.callback.FlywayCallback; import com.rjconsultores.ventaboletos.vo.FlyWayCustomDetail; public class FlyWay { - private static Logger log = Logger.getLogger(FlyWay.class); + private static final Logger log = LogManager.getLogger(FlyWay.class); private static final FlyWay INSTANCE = new FlyWay(); @@ -150,7 +151,7 @@ public class FlyWay { try{ String ambiente = System.getProperty("ambiente") ==null || System.getProperty("ambiente").isEmpty() ? "" : System.getProperty("ambiente"); if( (AMBIENTE_DEV.equalsIgnoreCase(ambiente) && AMBIENTE_CONSULTA.equalsIgnoreCase(ambiente)) && Boolean.FALSE.equals(isReloadFlyway) ) { - log.warn("Flyway não executado. Ambiente = dev ou consulta"); + log.warn("Flyway não executado. Ambiente = dev ou consulta"); return true; }