Update deployment and dependencies (#51)

Author: Bhavik Kumar

.travis.yml

@@ -62,8 +62,8 @@ terraform workspace new development
 
 1. Encrypt the following global environment variables using the Travis-CI CLI.
 ```
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
+DEPLOYMENT_ACCESS_KEY_ID=
+DEPLOYMENT_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=
 KMS_KEY_ID=
 ROLE_ARN=
@@ -72,6 +72,7 @@ STATE_DYNAMODB_TABLE=
 KEY=<The project key for the ECR repository>, e.g bnc/<team>/ecr/<service-name>
 SERVICE_KEY=<The project key for ECS service>, e.g ecs/<service-name>
 SPLUNK_URL=
+OPERATIONS_ROLE_ARN=
 ```
 
 2. Encrypt the following environment variables for the development deployment:

README.md

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id "org.sonarqube" version "2.7.1" apply false
-    id "com.github.spotbugs" version "1.6.9" apply false
+    id "com.github.spotbugs" version "2.0.0" apply false
     id "com.bnc.gradle.travis-ci-versioner" version "1.0.6"
 }
 
@@ -60,7 +60,7 @@ allprojects {
     }
 
     jacoco {
-        toolVersion = "0.8.3"
+        toolVersion = "0.8.4"
     }
 
     checkstyle {
@@ -83,8 +83,8 @@ allprojects {
     dependencies {
         testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.4.2'
         testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
-        testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.27.0'
-        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.27.0'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.28.2'
+        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.28.2'
         testRuntime group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.4.2'
     }
 }

build.gradle

@@ -1,3 +1,2 @@
-profile         = "<The profile to use for the AWS provider>"
 role_arn        = "<The role to assume to access the terraform remote state>"
 service_name    = "<The service name>"

deployment/terraform/ecr/master.tfvars.example

@@ -1,8 +1,3 @@
 output "repository_url" {
   value = module.ecr.repository_url
 }
-
-output "deployment_role_arn" {
-  sensitive = true
-  value     = data.terraform_remote_state.bnc_ops.outputs.deployment_role_arn
-}

deployment/terraform/ecr/outputs.tf

@@ -1,12 +1,12 @@
 plugins {
-    id "org.springframework.boot" version "2.1.4.RELEASE"
+    id "org.springframework.boot" version "2.1.5.RELEASE"
     id "io.spring.dependency-management" version "1.0.7.RELEASE"
     id "com.palantir.docker" version "0.22.1"
     id "com.gorylenko.gradle-git-properties" version "2.0.0"
 }
 
 jar {
-    archivesBaseName = rootProject.name + "-" + project.name
+    archivesBaseName = rootProject.name
 }
 
 springBoot {
@@ -36,17 +36,11 @@ docker {
     buildArgs(['JAR_FILE': "${bootJar.archiveFileName.getOrNull()}"])
 }
 
-dependencyManagement {
-    imports {
-        mavenBom "org.springframework.cloud:spring-cloud-sleuth:2.1.1.RELEASE"
-    }
-}
-
 dependencies {
     implementation project(':client')
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth'
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.1.1.RELEASE'
     implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.1.4'
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 }