From 801108b0e1180d2bbd89f2cdeb5028c912aa10c7 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sat, 8 Sep 2018 00:03:05 +0530
Subject: [PATCH 1/3] BAEL-8899 Let's upgrade the Gatling versions

-Updated gatling and scala versions to latest
---
 testing-modules/gatling/pom.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index 1afaefd47e..f0906da0bc 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -110,13 +110,10 @@
 	</dependencyManagement>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<encoding>UTF-8</encoding>
-		<scala.version>2.11.12</scala.version> <!--2.11.12 --> <!--2.12.6 -->
-		<gatling.version>2.2.5</gatling.version> <!--2.2.5 --> <!--2.3.1 -->
-		<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version> <!--3.2.2 --> <!--3.3.2 -->
-		<gatling-maven-plugin.version>2.2.1</gatling-maven-plugin.version> <!--2.2.1 --> <!--2.2.4 -->
+		<scala.version>2.13.0-M5</scala.version>
+		<gatling.version>2.3.1</gatling.version>
+		<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
+		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
 	</properties>
 
 </project>

From a0caa18ca2b2a70bd7dbe51159dbf501699c45df Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Sat, 8 Sep 2018 00:10:50 +0530
Subject: [PATCH 2/3] Update pom.xml

---
 testing-modules/gatling/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index f0906da0bc..a78a4e369c 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -112,7 +112,7 @@
 	<properties>
 		<scala.version>2.13.0-M5</scala.version>
 		<gatling.version>2.3.1</gatling.version>
-		<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
+		<scala-maven-plugin.version>3.3.1</scala-maven-plugin.version>
 		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
 	</properties>
 

From 9d70db511801e4366989a6765817d45c0eec5155 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Mon, 10 Sep 2018 22:08:34 +0530
Subject: [PATCH 3/3] BAEL-8899 Let's upgrade the Gatling versions

-Fixed dependency versions
---
 testing-modules/gatling/pom.xml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index a78a4e369c..08b8545d06 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -7,13 +7,13 @@
 	<artifactId>gatling</artifactId>
 	<version>1.0-SNAPSHOT</version>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
-
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    
 	<dependencies>
 		<dependency>
 			<groupId>io.gatling.highcharts</groupId>
@@ -78,6 +78,9 @@
 						<goals>
 							<goal>execute</goal>
 						</goals>
+						<configuration>
+  							<disableCompiler>true</disableCompiler>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -110,10 +113,13 @@
 	</dependencyManagement>
 
 	<properties>
-		<scala.version>2.13.0-M5</scala.version>
-		<gatling.version>2.3.1</gatling.version>
-		<scala-maven-plugin.version>3.3.1</scala-maven-plugin.version>
-		<gatling-maven-plugin.version>3.0.0-M5</gatling-maven-plugin.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<encoding>UTF-8</encoding>
+		<scala.version>2.12.6</scala.version> <!--2.11.12 --> <!--2.12.6 -->
+		<gatling.version>2.3.1</gatling.version> <!--2.2.5 --> <!--2.3.1 -->
+		<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version> <!--3.2.2 --> <!--3.3.2 -->
+		<gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version> <!--2.2.1 --> <!--2.2.4 -->
 	</properties>
 
 </project>