Merge pull request #35 from bnc-projects/update-dependencies

Update dependencies and move to spring boot 2.1

Author: bhavikkumar

build.gradle

@@ -1,9 +1,9 @@
 plugins {
-    id "com.github.spotbugs" version "1.6.4"
-    id "org.springframework.boot" version "2.0.5.RELEASE"
+    id "com.github.spotbugs" version "1.6.5"
+    id "org.springframework.boot" version "2.1.0.RELEASE"
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
     id "com.palantir.docker" version "0.20.1"
-    id "org.owasp.dependencycheck" version "3.3.2"
+    id "org.owasp.dependencycheck" version "3.3.4"
     id "org.sonarqube" version "2.6.2"
     id "com.gorylenko.gradle-git-properties" version "1.5.2"
 }
@@ -25,19 +25,19 @@ compileJava.options.encoding = "UTF-8"
 
 repositories {
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
 }
 
 spotbugs {
-    toolVersion = '3.1.7'
+    toolVersion = '3.1.8'
 }
 
 jacoco {
     toolVersion = "0.8.2"
 }
 
 checkstyle {
-    configDir rootProject.file('config/checkstyle')
-    toolVersion '8.1'
+    toolVersion '8.14'
 }
 
 springBoot {
@@ -118,22 +118,21 @@ docker {
 }
 
 dependencies {
-    def springBootVersion = '2.0.5.RELEASE'
+    def springBootVersion = '2.1.0.RELEASE'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.0.1.RELEASE'
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.7'
-    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.0.6'
-
+    // Update this to release version and remove milestone repo
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.1.0.M1'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.8'
+    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.1.0'
     runtime group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
 
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.1'
-    testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.3.1'
-    testRuntime group: 'com.h2database', name: 'h2', version: '1.4.197'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.22.0'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.11.1'
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
-
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.3.1'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.11.1'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.23.0'
     // Remove once Mockito 3.x gets released with Junit 5 support
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.22.0'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.23.0'
+    testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.3.1'
+    testRuntime group: 'com.h2database', name: 'h2', version: '1.4.197'
 }

src/main/java/com/bnc/sbjb/configuration/MetricsConfiguration.java

@@ -26,6 +26,9 @@ management:
     export:
       newrelic:
         enabled: false
+    tags:
+      application: ${spring.application.name}
+      container: ${HOSTNAME:}${COMPUTERNAME:}
 ---
 spring:
   profiles: production