Merge pull request #27 from ObjectivityLtd/v1.5

Replaced log4j by log4j 2
Accenture · Mar 27, 2020 · cb54e89 · cb54e89
2 parents 38db210 + 183722b
commit cb54e89
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@
 /jdbc_drivers/mssql-jdbc-8.2.0.jre8.jar
 /zip
 /release
+/*.iml
+/*.jar
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,7 +16,7 @@ pool:
 
 variables:
 - name: dBTestCompareVersion
-  value: 1.4
+  value: 1.5
 
 steps:
 

diff --git a/pom.xml b/pom.xml
@@ -9,10 +9,11 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <testng.version>6.8.8</testng.version>
-        <jaxb-impl.version>2.1.8</jaxb-impl.version>
-        <log4j.version>1.2.17</log4j.version>
-        <c3p0.version>0.9.5.4</c3p0.version>
+        <testng.version>7.0.0</testng.version>
+        <jaxb-impl.version>2.2.7</jaxb-impl.version>
+        <log4j.version>2.13.1</log4j.version>
+        <log4jcore.version>2.13.1</log4jcore.version>
+        <c3p0.version>0.9.5.5</c3p0.version>
     </properties>
 
     <build>
@@ -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>

diff --git a/src/main/java/uk/co/objectivity/test/db/RunTests.java b/src/main/java/uk/co/objectivity/test/db/RunTests.java
@@ -98,7 +98,7 @@ private static void runTestNG(int threadCount, Filter filter) {
             suiteName = "FILTERED compare SQL results suite";
         }
         testng.setDefaultSuiteName(suiteName);
-        testng.setParallel(XmlSuite.PARALLEL_INSTANCES);
+        testng.setParallel(XmlSuite.ParallelMode.INSTANCES);
         testng.setThreadCount(threadCount);
         // testng.setDataProviderThreadCount(cmpSqlResultsConfig.getThreads());
         testng.run();

diff --git 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
@@ -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>