diff --git a/.gitignore b/.gitignore index a7282b5..9e1e701 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /jdbc_drivers/mssql-jdbc-8.2.0.jre8.jar /zip /release +/*.iml +/*.jar diff --git a/pom.xml b/pom.xml index 1abe3f1..13ee6b6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,8 @@ 6.8.8 2.1.8 - 1.2.17 + 2.13.1 + 2.13.1 0.9.5.4 @@ -80,13 +81,16 @@ c3p0 ${c3p0.version} - - log4j - log4j + org.apache.logging.log4j + log4j-api ${log4j.version} - + + org.apache.logging.log4j + log4j-core + ${log4jcore.version} + diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 7b8553f..032a42c 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -1,8 +1,8 @@ # Root logger option +log4j1.compatibility=true log4j.rootLogger=TRACE, stdout log4j.logger.org.nocrala.tools.texttablefmt=WARN log4j.logger.com.mchange=WARN - # Direct log messages to stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out diff --git a/test-definitions/cmpSqlResults-config.xml b/test-definitions/cmpSqlResults-config.xml index abc89b4..71b7506 100644 --- a/test-definitions/cmpSqlResults-config.xml +++ b/test-definitions/cmpSqlResults-config.xml @@ -47,7 +47,6 @@ MySQL - com.mysql.jdbc.Driver jdbc:mysql://${MYSQLDBSERVER}:${MYSQLDBPORT}/${MYSQLDBNAME} ${USERNAME} ${PASSWORD}