Merge remote-tracking branch 'origin/Release_version_1.1'

Conflicts: Playground/pom.xml
sreenigsd · May 13, 2020 · 029a93c · 029a93c
2 parents 74a250a + b9591a3
commit 029a93c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/Cheetah/pom.xml b/Cheetah/pom.xml
@@ -226,13 +226,14 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/log4j/log4j -->
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-core</artifactId>
 		</dependency>
 
 
+
 		<!-- maven Dependencies -->
 		<!-- https://mvnrepository.com/artifact/org.codehaus.cargo/cargo-maven2-plugin -->
 		<dependency>
@@ -449,7 +450,21 @@
 			<artifactId>dynamicreports-googlecharts</artifactId>
 			<version>5.1.0</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
+		<dependency>
+		    <groupId>com.sun.xml.bind</groupId>
+		    <artifactId>jaxb-impl</artifactId>
+		    <version>2.3.3</version>
+		</dependency>
+
 
+		<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+		<dependency>
+		    <groupId>javax.xml.bind</groupId>
+		    <artifactId>jaxb-api</artifactId>
+		    <version>2.3.1</version>
+		</dependency>
 
 
 	</dependencies>
@@ -667,10 +682,11 @@
 				<version>4.12</version>
 			</dependency>
 			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.17</version>
+			    <groupId>org.apache.logging.log4j</groupId>
+			    <artifactId>log4j-core</artifactId>
+			    <version>2.13.2</version>
 			</dependency>
+
 			<dependency>
 				<groupId>org.codehaus.cargo</groupId>
 				<artifactId>cargo-maven2-plugin</artifactId>

diff --git a/Playground/chromedriver.exe b/Playground/chromedriver.exe
diff --git a/Playground/msedgedriver.exe b/Playground/msedgedriver.exe
diff --git a/Playground/resources/conf/drivers.xml b/Playground/resources/conf/drivers.xml
@@ -3,6 +3,6 @@
 	<ie-driver-path>IEDriverServer.exe</ie-driver-path>
 	<chrome-driver-path>chromedriver.exe</chrome-driver-path>
 	<firefox-driver-path>geckodriver.exe</firefox-driver-path>
-	<edge-driver-path>MicrosoftWebDriver.exe</edge-driver-path>
+	<edge-driver-path>msedgedriver.exe</edge-driver-path>
 	<opera-driver-path>operadriver.exe</opera-driver-path>
 </driver>