Skip to content

Commit

Permalink
Replaced log4j by log4j 2, removed unnecessary name com.mysql.jdbc.Dr…
Browse files Browse the repository at this point in the history
…iver from connection
  • Loading branch information
raczeja committed Mar 27, 2020
1 parent 38db210 commit dba9760
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
/jdbc_drivers/mssql-jdbc-8.2.0.jre8.jar
/zip
/release
/*.iml
/*.jar
14 changes: 9 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<properties>
<testng.version>6.8.8</testng.version>
<jaxb-impl.version>2.1.8</jaxb-impl.version>
<log4j.version>1.2.17</log4j.version>
<log4j.version>2.13.1</log4j.version>
<log4jcore.version>2.13.1</log4jcore.version>
<c3p0.version>0.9.5.4</c3p0.version>
</properties>

Expand Down Expand Up @@ -80,13 +81,16 @@
<artifactId>c3p0</artifactId>
<version>${c3p0.version}</version>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4jcore.version}</version>
</dependency>
</dependencies>

</project>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion test-definitions/cmpSqlResults-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
</datasource>
<datasource maxPollSize="6">
<name>MySQL</name>
<driver>com.mysql.jdbc.Driver</driver>
<url>jdbc:mysql://${MYSQLDBSERVER}:${MYSQLDBPORT}/${MYSQLDBNAME}</url>
<user>${USERNAME}</user>
<password>${PASSWORD}</password>
Expand Down

0 comments on commit dba9760

Please sign in to comment.