From fd3bb8224b905573c069ee385df64726cc3e05d7 Mon Sep 17 00:00:00 2001 From: Gijs Kant Date: Mon, 14 Oct 2019 17:04:06 +0200 Subject: [PATCH 1/2] Add newline to update notification email. --- .../src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy | 2 +- .../groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy b/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy index 12b5870..9572f43 100644 --- a/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy +++ b/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy @@ -54,7 +54,7 @@ class EmailGenerator { String footer = [ "You can login to ${clientAppLink} to reload your cohorts and review the new data available.", "The list of cohorts is in the left panel. Click on the cohort and select 'Show subscription records' to see the identifiers of the records that were added or removed.", - + '', 'Regards,', '', clientAppName, diff --git a/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy b/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy index 46802dc..17acbe1 100644 --- a/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy +++ b/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy @@ -75,7 +75,7 @@ class EmailGeneratorSpec extends Specification { '' + '

You can login to ABC to reload your cohorts and review the new data available.' + '
The list of cohorts is in the left panel. Click on the cohort and select \'Show subscription records\' to see the identifiers of the records that were added or removed.' + - '
Regards,

ABC' + '

Regards,

ABC' when: def realContent = EmailGenerator.getQuerySubscriptionUpdatesBody(querySetChanges, clientAppName, clientAppUrl, reportDate) then: From 2f6bd13d45cdcc1b4d21f14745bcc3d8c9f05b93 Mon Sep 17 00:00:00 2001 From: Gijs Kant Date: Mon, 14 Oct 2019 23:35:15 +0200 Subject: [PATCH 2/2] Prepare release 1.0.3. --- docker/Dockerfile | 2 +- docker/README.md | 2 +- docker/docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index de2c32d..1e6114d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-jre-alpine -ARG GB_BACKEND_VERSION="1.0.2" +ARG GB_BACKEND_VERSION="1.0.3" ENV GB_BACKEND_WAR_URL https://repo.thehyve.nl/content/repositories/releases/nl/thehyve/gb-backend/${GB_BACKEND_VERSION}/gb-backend-${GB_BACKEND_VERSION}.war diff --git a/docker/README.md b/docker/README.md index 6726787..bbc6872 100644 --- a/docker/README.md +++ b/docker/README.md @@ -43,7 +43,7 @@ Publish the image to [Docker Hub](https://hub.docker.com/r/thehyve/glowing-bear- ```bash docker login -GB_BACKEND_VERSION="1.0.2" +GB_BACKEND_VERSION="1.0.3" docker tag glowing-bear-backend "thehyve/glowing-bear-backend:${GB_BACKEND_VERSION}" docker push "thehyve/glowing-bear-backend:${GB_BACKEND_VERSION}" ``` diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 429c1a4..7e4001d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,7 +14,7 @@ services: gb-backend: container_name: gb-backend - image: thehyve/glowing-bear-backend:1.0.2 + image: thehyve/glowing-bear-backend:1.0.3 ports: - 8083:8083 environment: