Cloud support removed, Gatling removed, Spring version upped to 1.3.5

build.gradle

@@ -17,7 +17,6 @@ plugins {
     id 'maven'
     id 'jacoco'
     id 'com.github.kt3k.coveralls' version '2.6.3'
-    id "com.github.lkishalmi.gatling" version "0.3.0"
 }
 
 war {
@@ -68,11 +67,11 @@ repositories {
 }
 
 ext {
-    sprintBootVersion = "1.3.3.RELEASE"
+    sprintBootVersion = "1.3.5.RELEASE"
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.12'
+  gradleVersion = '2.13'
   distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 
@@ -94,6 +93,9 @@ dependencies {
     compile 'com.google.code.gson:gson:2.6.2'
     compile 'org.projectlombok:lombok:1.16.8'
 
+    //ServletException requires compile time servlet dependency but it causes problems
+    //when deployed if exist on war run time.. hence provided but also compileOnly
+    compileOnly("org.springframework.boot:spring-boot-starter-tomcat")
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
     compile 'io.springfox:springfox-swagger2:2.4.0'
@@ -110,16 +112,12 @@ dependencies {
     testCompile 'com.jayway.jsonpath:json-path-assert:2.2.0'
 
     //Cloud is enabled via dependency but disabled via config
-    compile('org.springframework.cloud:spring-cloud-starter-consul-all:1.0.0.RELEASE') {
+/*    compile('org.springframework.cloud:spring-cloud-starter-consul-all:1.0.0.RELEASE') {
         exclude group: 'io.reactivex', module: 'rxjava'
     }
-    compile group: 'io.reactivex', name: 'rxjava', version: '1.1.5'
+    compile group: 'io.reactivex', name: 'rxjava', version: '1.1.5'*/
 
     // In order to get embedded app container to work
     integrationTestRuntime("org.springframework.boot:spring-boot-starter-tomcat")
     integrationTestCompile group: 'com.jayway.restassured', name: 'rest-assured', version: '2.9.0'
-
-    // gatling
-    compile 'org.scala-lang:scala-library:2.11.7'
-    compile "io.gatling.highcharts:gatling-charts-highcharts:2.1.6"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 19 09:47:27 EDT 2016
+#Thu Jun 02 12:13:49 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

gradlew.bat

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args