ARUHA-778 Fix deployment

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'groovy'
 apply plugin: 'eclipse'
 apply plugin: 'application'
-apply plugin: 'org.springframework.boot'
+apply plugin: 'spring-boot'
 apply plugin: "jacoco"
 apply plugin: 'findbugs'
 apply plugin: 'checkstyle'
@@ -76,7 +76,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:1.2.5.RELEASE"
         classpath 'org.yaml:snakeyaml:1.17'
     }
 }
@@ -105,28 +105,24 @@ dependencies {
     }
 
     // spring
-    compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") {
+    compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion") {
         exclude module: 'logback-classic'
         exclude module: 'log4j-over-slf4j'
-        exclude module: 'json'
     }
     compile "org.springframework:spring-context:$springFrameworkVersion"
     compile "org.springframework:spring-web:$springFrameworkVersion"
     compile "org.springframework:spring-webmvc:$springFrameworkVersion"
-    compile 'org.springframework.boot:spring-boot-test'
+    compile "org.springframework.boot:spring-boot-test:$springBootVersion"
 
     // oauth
     compile 'org.springframework.security.oauth:spring-security-oauth2:2.1.0.RELEASE'
-    compile("org.springframework.boot:spring-boot-starter-security:$springBootVersion") {
+    compile('org.springframework.boot:spring-boot-starter-security') {
         exclude module: "logback-classic"
-        exclude module: "json"
     }
 
     // actuator
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    compile ('org.zalando.zmon:zmon-actuator:0.9.7') {
-        exclude module: "spring-boot-dependencies"
-    }
+    compile 'org.zalando.zmon:zmon-actuator:0.9.7'
 
     // storage
     compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion"
@@ -141,11 +137,7 @@ dependencies {
     }
     compile 'org.zalando:jackson-datatype-problem:0.5.0'
     compile 'org.zalando:problem:0.5.0'
-    compile ('org.zalando:problem-spring-web:0.5.0') {
-        exclude module: "spring-security-web"
-        exclude module: "spring-mvc"
-        exclude module: "jackson-datatype-problem"
-    }
+    compile 'org.zalando:problem-spring-web:0.5.0'
     compile 'com.google.guava:guava:19.0'
     compile 'javax.ws.rs:javax.ws.rs-api:2.0.1'
     compile 'org.slf4j:slf4j-log4j12:1.7.25'
@@ -156,7 +148,6 @@ dependencies {
     compile 'org.apache.commons:commons-lang3:3.5'
     compile 'org.zalando:nakadi-plugin-api:1.0.5'
     compile 'org.echocat.jomon:runtime:1.6.3'
-    compile 'org.json:json:20160810'
 
     // kafka & zookeeper
     compile 'org.apache.kafka:kafka-clients:0.9.0.1'
@@ -171,21 +162,18 @@ dependencies {
     }
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.8.8'
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
-    compile ('org.zalando:twintip-spring-web:1.1.0') {
-        exclude module: "spring-web"
-        exclude module: "jackson-databind"
-        exclude module: "jackson-dataformat-yaml"
-    }
+    compile 'org.zalando:twintip-spring-web:1.1.0'
     compile 'com.grack:nanojson:1.2'
+    compile 'org.json:json:20160810'
 
     // tests
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile('junit:junit:4.12') {
         exclude module: "hamcrest-core"
     }
     testCompile "org.springframework:spring-test:$springFrameworkVersion"
-    testCompile "org.springframework.boot:spring-boot-test:${springBootVersion}"
-    testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
+    testCompile 'org.springframework.boot:spring-boot-test'
+    testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.skyscreamer:jsonassert:1.5.0'
     testCompile 'uk.co.datumedge:hamcrest-json:0.2'
     testCompile 'org.mockito:mockito-all:1.10.19'