Merge branch 'dev' into release

thehyve · Aug 24, 2022 · a8888d6 · a8888d6
2 parents 39ac2e8 + 82d3709
commit a8888d6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -52,7 +52,7 @@ Publish the image to [Docker Hub](https://hub.docker.com/r/thehyve/transmart-api
 
 ```bash
 docker login
-TRANSMART_VERSION="17.2.14"
+TRANSMART_VERSION="17.2.15"
 docker tag transmart-api-server "thehyve/transmart-api-server:${TRANSMART_VERSION}"
 docker push "thehyve/transmart-api-server:${TRANSMART_VERSION}"
 ```
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -16,7 +16,7 @@ services:
 
   transmart-api-server:
     container_name: transmart-api-server
-    image: thehyve/transmart-api-server:17.2.14
+    image: thehyve/transmart-api-server:17.2.15
     ports:
       - 9081:8081
     environment:

diff --git a/docker/transmart-api-server/Dockerfile b/docker/transmart-api-server/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="luk.zim91@gmail.com" \
       service="transmart-api-server" \
       description="This is the Docker image of the tranSMART API server"
 
-ARG TRANSMART_VERSION="17.2.14"
+ARG TRANSMART_VERSION="17.2.15"
 
 ENV TRANSMART_USER_NAME transmart
 ENV TRANSMART_GROUP_NAME "${TRANSMART_USER_NAME}"

diff --git a/docs/README.md b/docs/README.md
@@ -1,6 +1,6 @@
-# tranSMART 17.2.14 Installation
+# tranSMART 17.2.15 Installation
 
-Below are the installation instructions for tranSMART version 17.2.14. If you already have an older version of tranSMART, follow the [upgrade guide](upgrade.md) instead.
+Below are the installation instructions for tranSMART version 17.2.15. If you already have an older version of tranSMART, follow the [upgrade guide](upgrade.md) instead.
 
   1. [Prerequisites](#1-prerequisites)
   2. [Setup database](#2-setup-database)
@@ -102,7 +102,7 @@ Deployment artefacts are published to [the Nexus repository of The Hyve](https:/
 To fetch and run `transmart-api-server`:
 ```bash
 # Fetch artefacts from Maven
-TRANSMART_VERSION=17.2.14
+TRANSMART_VERSION=17.2.15
 curl -f -L https://repo.thehyve.nl/service/local/repositories/releases/content/org/transmartproject/transmart-api-server/${TRANSMART_VERSION}/transmart-api-server-${TRANSMART_VERSION}.war -o transmart-api-server-${TRANSMART_VERSION}.war && \
 # Run it with:
 java -jar -Dspring.config.location=/path/to/config.yaml transmart-api-server-${TRANSMART_VERSION}.war

diff --git a/transmart-api-server/build.gradle b/transmart-api-server/build.gradle
@@ -91,6 +91,7 @@ publishing {
         }
     }
 }
+
+bootWar.dependsOn ':transmart-schemas:assemble'
 publishToMavenLocal.dependsOn 'executableWar'
 publish.dependsOn 'executableWar'
-assemble.dependsOn ':transmart-schemas:assemble'
diff --git a/transmart-copy/README.md b/transmart-copy/README.md
@@ -6,11 +6,11 @@ only substituting indexes for database identifiers for subjects, trial visits an
 
 ### Download
 The latest version can be downloaded here:
-[transmart-copy-17.2.14.jar](https://repo.thehyve.nl/service/local/repositories/releases/content/org/transmartproject/transmart-copy/17.2.14/transmart-copy-17.2.14.jar).
+[transmart-copy-17.2.15.jar](https://repo.thehyve.nl/service/local/repositories/releases/content/org/transmartproject/transmart-copy/17.2.15/transmart-copy-17.2.15.jar).
 
 ```bash
 # Download transmart-copy
-curl -f -L https://repo.thehyve.nl/service/local/repositories/releases/content/org/transmartproject/transmart-copy/17.2.14/transmart-copy-17.2.14.jar -o transmart-copy.jar
+curl -f -L https://repo.thehyve.nl/service/local/repositories/releases/content/org/transmartproject/transmart-copy/17.2.15/transmart-copy-17.2.15.jar -o transmart-copy.jar
 ```
 
 ### Usage