From d205ffbc46fb531968df7e933906ab7dc7787323 Mon Sep 17 00:00:00 2001
From: Eugen Paraschiv <hanriseldon@gmail.com>
Date: Mon, 14 May 2018 00:20:56 +0300
Subject: [PATCH] minor scala and gatling upgrades

---
 testing-modules/gatling/pom.xml                     | 11 ++++++-----
 .../scala/org/baeldung/RecordedSimulation.scala     | 13 ++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index 10df52835a..c4aec4d61a 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -13,10 +13,11 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <scala.version>2.11.7</scala.version>
         <encoding>UTF-8</encoding>
-        <gatling.version>2.2.0</gatling.version>
-        <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
+        <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-->
     </properties>
 
     <dependencyManagement>
@@ -85,7 +86,7 @@
                         </goals>
                         <configuration>
                             <args>
-                                <arg>-Ybackend:GenBCode</arg>
+                                <!--<arg>-Ybackend:GenBCode</arg>-->
                                 <arg>-Ydelambdafy:method</arg>
                                 <arg>-target:jvm-1.8</arg>
                                 <arg>-deprecation</arg>
@@ -101,7 +102,7 @@
             <plugin>
                 <groupId>io.gatling</groupId>
                 <artifactId>gatling-maven-plugin</artifactId>
-                <version>${gatling.version}</version>
+                <version>${gatling-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>test</phase>
diff --git a/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala b/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
index cdbef1bf3c..dece393478 100644
--- a/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
+++ b/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
@@ -9,17 +9,16 @@ import io.gatling.jdbc.Predef._
 class RecordedSimulation extends Simulation {
 
     val httpProtocol = http
-        .baseURL("http://computer-database.gatling.io")
-        .inferHtmlResources(BlackList(""".*\.css""", """.*\.js""", """.*\.ico"""), WhiteList())
-        .acceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
-        .acceptEncodingHeader("gzip, deflate")
-        .acceptLanguageHeader("it-IT,it;q=0.8,en-US;q=0.5,en;q=0.3")
+        .baseURL("http://computer-database.gatling.io")
+        .inferHtmlResources(BlackList(""".*\.css""", """.*\.js""", """.*\.ico"""), WhiteList())
+        .acceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+        .acceptEncodingHeader("gzip, deflate")
+        .acceptLanguageHeader("it-IT,it;q=0.8,en-US;q=0.5,en;q=0.3")
         .userAgentHeader("Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0")
 
 
 
 
-
     val scn = scenario("RecordedSimulation")
         .exec(http("request_0")
             .get("/"))
@@ -43,4 +42,4 @@ class RecordedSimulation extends Simulation {
             .get("/computers?p=3"))
 
     setUp(scn.inject(atOnceUsers(1))).protocols(httpProtocol)
-}
+}