Merge pull request #60 from bnc-projects/october-updates

Update dependencies

Author: Bhavik Kumar

.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
   - TF_IN_AUTOMATION=1
   - SERVICE_NAME=spring-boot-java-base
-  - VERSION=0.12.4
+  - VERSION=0.12.9
   - DEPLOYMENT_ACCESS_KEY_ID=
   - DEPLOYMENT_SECRET_ACCESS_KEY=
   - AWS_DEFAULT_REGION=
@@ -53,15 +53,13 @@ jobs:
     - unset AWS_SESSION_TOKEN
     script:
     - cd deployment/terraform/ecr
-    - terraform init -backend-config="bucket=${STATE_S3_BUCKET}" -backend-config="region=${AWS_DEFAULT_REGION}" -backend-config="dynamodb_table=${STATE_DYNAMODB_TABLE}" -backend-config="kms_key_id=${KMS_KEY_ID}" -backend-config="key=${KEY}" -backend-config="role_arn=${ROLE_ARN}" 1>/dev/null
-    - terraform apply -backup="-" -input=false -auto-approve -var role_arn=${ROLE_ARN} -var service_name=${SERVICE_NAME} 1>/dev/null
+    - terraform init -backend-config="bucket=${STATE_S3_BUCKET}" -backend-config="region=${AWS_DEFAULT_REGION}" -backend-config="dynamodb_table=${STATE_DYNAMODB_TABLE}" -backend-config="kms_key_id=${KMS_KEY_ID}" -backend-config="key=${KEY}" -backend-config="role_arn=${ROLE_ARN}" 1>/dev/null || exit 1
+    - terraform apply -backup="-" -input=false -auto-approve -var role_arn=${ROLE_ARN} -var service_name=${SERVICE_NAME} 1>/dev/null || exit 1
     - REPOSITORY_URI=$(terraform output repository_url)
     - cd $TRAVIS_BUILD_DIR
     - eval $(aws sts assume-role --role-arn "$OPERATIONS_ROLE_ARN" --role-session-name "${TRAVIS_REPO_SLUG//\//-}" | jq -r '.Credentials | @sh "export AWS_SESSION_TOKEN=\(.SessionToken)\nexport AWS_ACCESS_KEY_ID=\(.AccessKeyId)\nexport AWS_SECRET_ACCESS_KEY=\(.SecretAccessKey) "')
     - $(aws ecr get-login --no-include-email)
-    - ./gradlew check
-    - ./gradlew docker dockerTag dockerPush dockerTagsPush -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI
-    - ./gradlew publish
+    - ./gradlew check docker dockerTag dockerPush dockerTagsPush publish -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI
     after_success:
     - ./gradlew sonarqube
   - stage: deploy to development

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'idea'
-    id "org.sonarqube" version "2.7.1" apply false
+    id "org.sonarqube" version "2.8" apply false
     id "com.github.spotbugs" version "2.0.0" apply false
     id "com.bnc.gradle.travis-ci-versioner" version "1.0.6"
 }
@@ -83,10 +83,10 @@ allprojects {
     dependencies {
         implementation group: 'com.bnc', name: 'market-data-api', version: '0.0.8'
 
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.5.1'
-        testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.1'
-        testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
-        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.0.0'
+        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.5.2'
+        testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.1.0'
+        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.1.0'
     }
 }
 

deployment/script/travis_deploy.sh

@@ -2,8 +2,8 @@
 
 cd $TRAVIS_BUILD_DIR
 cd deployment/terraform/ecs-service
-terraform init -backend-config="bucket=${STATE_S3_BUCKET}" -backend-config="region=${AWS_DEFAULT_REGION}" -backend-config="dynamodb_table=${STATE_DYNAMODB_TABLE}" -backend-config="kms_key_id=${KMS_KEY_ID}" -backend-config="key=${SERVICE_KEY}" -backend-config="role_arn=${ROLE_ARN}" 1> /dev/null
-terraform apply -backup="-" -input=false -auto-approve -var role_arn=${ROLE_ARN} -var service_name=${SERVICE_NAME} -var service_version=${TRAVIS_BUILD_NUMBER} -var splunk_url=${SPLUNK_URL} -var splunk_token=${SPLUNK_TOKEN} 1> /dev/null
+terraform init -backend-config="bucket=${STATE_S3_BUCKET}" -backend-config="region=${AWS_DEFAULT_REGION}" -backend-config="dynamodb_table=${STATE_DYNAMODB_TABLE}" -backend-config="kms_key_id=${KMS_KEY_ID}" -backend-config="key=${SERVICE_KEY}" -backend-config="role_arn=${ROLE_ARN}" 1> /dev/null || exit 1
+terraform apply -backup="-" -input=false -auto-approve -var role_arn=${ROLE_ARN} -var service_name=${SERVICE_NAME} -var service_version=${TRAVIS_BUILD_NUMBER} -var splunk_url=${SPLUNK_URL} -var splunk_token=${SPLUNK_TOKEN} 1> /dev/null || exit 1
 eval $(terraform output -json | jq -r .' | @sh "export CLUSTER_NAME=\(.ecs_cluster_name.value)\nexport DEPLOYMENT_ROLE_ARN=\(.deployment_role_arn.value) "')
 eval $(aws sts assume-role --role-arn "$DEPLOYMENT_ROLE_ARN" --role-session-name "${TRAVIS_REPO_SLUG//\//-}" | jq -r '.Credentials | @sh "export AWS_SESSION_TOKEN=\(.SessionToken)\nexport AWS_ACCESS_KEY_ID=\(.AccessKeyId)\nexport AWS_SECRET_ACCESS_KEY=\(.SecretAccessKey) "')
-aws ecs wait services-stable --services ${SERVICE_NAME} --cluster ${CLUSTER_NAME}
+aws ecs wait services-stable --services ${SERVICE_NAME} --cluster ${CLUSTER_NAME} || exit 1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "org.springframework.boot" version "2.1.6.RELEASE"
+    id "org.springframework.boot" version "2.1.9.RELEASE"
     id "io.spring.dependency-management" version "1.0.8.RELEASE"
     id "com.palantir.docker" version "0.22.1"
     id "com.gorylenko.gradle-git-properties" version "2.0.0"
@@ -40,7 +40,7 @@ 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', version: '2.1.2.RELEASE'
-    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.2.0'
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.1.4.RELEASE'
+    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.3.0'
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 }