bump 1.0.2

.travis.yml

@@ -12,18 +12,14 @@ script:
   - "./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V"
   - "./mvnw test -B"
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker login -u $DOCKER_USER -p $DOCKER_PASS; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then export TAG=`if [ -z "$TRAVIS_TAG" ]; then echo "test"; else echo "latest"; fi`; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker build -t uzhlit/marugoto . -f DockerfileMiddleware; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker tag uzhlit/marugoto uzhlit/marugoto:$TAG; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker push uzhlit/marugoto:$TAG; fi
-  - if [ "$TRAVIS_BRANCH" == "master" && ! -z "$TRAVIS_TAG" ]; then docker tag uzhlit/marugoto uzhlit/marugoto:$TRAVIS_TAG; fi
-  - if [ "$TRAVIS_BRANCH" == "master" && ! -z "$TRAVIS_TAG" ]; then docker push uzhlit/marugoto:$TRAVIS_TAG; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker build -t uzhlit/marugoto-shell . -f DockerfileShell; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker tag uzhlit/marugoto-shell uzhlit/marugoto-shell:$TAG; fi
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then docker push uzhlit/marugoto-shell:$TAG; fi
-  - if [[ "$TRAVIS_BRANCH" == "master" && ! -z "$TRAVIS_TAG" ]]; then tag uzhlit/marugoto-shell uzhlit/marugoto-shell:$TRAVIS_TAG; fi
-  - if [[ "$TRAVIS_BRANCH" == "master" && ! -z "$TRAVIS_TAG" ]]; then docker push uzhlit/marugoto-shell:$TRAVIS_TAG; fi
+  - docker login -u $DOCKER_USER -p $DOCKER_PASS
+  - export TAG=`if [ ! -z "$TRAVIS_TAG" ]; then echo $TRAVIS_TAG; elif [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH"; fi`
+  - docker build -t uzhlit/marugoto . -f DockerfileMiddleware
+  - docker tag uzhlit/marugoto uzhlit/marugoto:$TAG
+  - docker push uzhlit/marugoto:$TAG
+  - docker build -t uzhlit/marugoto-shell . -f DockerfileShell
+  - docker tag uzhlit/marugoto-shell uzhlit/marugoto-shell:$TAG
+  - docker push uzhlit/marugoto-shell:$TAG
 env:
   global:
     - secure: prVCTC+6Mwz5m1GLjAUj9nTi4V7hXrjaVSVEFnwdJVH4ilaCXoYoD3r46yzv6MQG/7w+GF/T4fNteupKuDdALqlBZpoNVNTZmGFBQhQigqjpKRVWnKxkE3ay0tPC+txUq0a/8OzEGkU1ai44lHTOhWGY8dgUKxfp7YiXdN7PDfV+SekjNR9sfFLU5eU9Yv5tRYW14pwbrONu5Nu2rw1g6GAJDo/lORxkSAGYQUYoT5J5RBC5ItvFa74rLtD8CZrkYQsadfd4+Pub1mABVHUM4KIj/fPqfifk6j1Y19HmCMu5UzM3d97x2FBImePRQSJPHh8TQ5GjdwQ1QonF9M+qavxGqQGGoCUbotSQoJkKc6Y65PKzMAfjMzdzgP0+DlU/SrCKdVldJ/s4wrwuh4xxYg1DuxzZx7su0745gPRT3fV8wLhuvqaf11p4XlJg+z63vrIjil5kAu0A41Q6B86PfmCX35Vmdj3bPy9a8MUv2NJ/X/DCi6zB2vRpgGgvcaACRXAu8Si0w7Wbkm28OWO5X6LaKMCCfwC32Ti8y1PNPwJ5V2u1KrbN7VCCmAXGTp2AcuOY41mfV7CV324W8kzNzurjB1x+oeMWnelFCq+x5jt38e1NIUz9I84syu5Zkh2mzvF09VlM5bEJzhiJiIVIcg8dgduEQq02UN74Y5KBXJI=
@@ -33,7 +29,7 @@ deploy:
   provider: releases
   api_key:
     secure: OOf6dUTmmHm2AbqAiqpUVkG2ByFC8cnneLMDHbeirTs+oS4PTPO9jVc0sKKx9E6m4q/rjTg976t2F9j/xHfNJWaacq0u/tdbDHWHVI35sLGlYwovf1iPApGWtrmdL3dB7rL9lR57wrR4uPsYWOrmNO7C9x7vtX4UXtroecynUZkwRG1eXlO89hXW1PfIrKeSFyMzXipzG1o++2fQp4VKCF82yPz5gZ5lxl8VelZBfWTkTkrzvLDBhNN7tRwKlkULW90mmyxwFHnHtkkarbpithxSJlcsh0+oG4LYu1Irapf+TGUAEMEnZzxQqz2ZMIA6BcnydJwKno8zLWwtXLFXRd7XBHoO6mBfX3hxq8t6FS8U3/0CPJxCQSJQpMxQ5pvbzXEUbwZIE4IBwXdiJq2JZbbljoo/2hKmEOXXOxNkXTj1iOfZvDpscyCmfwkEkF25HTBROFmR7lL4DRAt/U4DejBD52iFmzJ+Sd09SG/ViTNDudTXaiVsUJpXh0ORqJyUu3hS0KerCPB2uX5QkU5disb6TLOkF5b63833kXghHrhC6i8QVcIL3lgnV+MRJSim8wjnsXkV4wAcUZtOs/+zzAaL5QVS/A0PPZuT4djKSZIEk4AHeK+nCcBW3lbH2v7xsGFNax0pTh/bBQQORcI6X4NKxaQNFWid549roS8jUYk=
-  file: backend/target/backend-1.0.1.war
+  file: backend/target/backend-1.0.2.war
   skip_cleanup: true
   name: marugoto - $(date +'%d.%m.%Y %R')
   on:

DockerfileMiddleware

@@ -5,7 +5,7 @@ FROM tomcat:9.0.13-jre10
 RUN rm -rf /usr/local/tomcat/webapps/*
 
 # transfer web application
-COPY backend/target/backend-1.0.1.war /usr/local/tomcat/webapps/ROOT.war
+COPY backend/target/backend-1.0.2.war /usr/local/tomcat/webapps/ROOT.war
 
 # default tomcat port
 EXPOSE 8080

DockerfileShell

@@ -2,7 +2,7 @@
 FROM openjdk:10-jre
 
 # transfer shell application
-COPY shell/target/shell-1.0.1.jar /opt/shell.jar
+COPY shell/target/shell-1.0.2.jar /opt/shell.jar
 
 # Prepare the mount
 RUN mkdir -p /home && sed -re '1s|:/root:|:/home:|' -i /etc/passwd;

README.md

@@ -22,13 +22,13 @@ mvnw package -DskipTests
 The packaged ``*.war``-file can be found under:
 
 ```console
-backend/target/backend-1.0.1.war
+backend/target/backend-1.0.2.war
 ```
 
 To run the ``war``-file, switch to backend/target and execute the following command:
 
 ```console
-java -jar backend-1.0.1.war
+java -jar backend-1.0.2.war
 ```
 To check api-docs(swagger) type in your browser:
 
@@ -47,13 +47,13 @@ mvnw package -Dmaven.test.skip=true
 The packaged ``*.jar``-file can be found unter:
 
 ```console
-shell/target/shell-1.0.1.jar
+shell/target/shell-1.0.2.jar
 ```
 
 To run the ``jar``-file, execute the following command:
 
 ```console
-java -jar shell-1.0.1.jar
+java -jar shell-1.0.2.jar
 ```
 
 Type ``help`` into the shell-terminal to get a list of available commands.

backend/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>ch.uzh.marugoto</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

core/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>ch.uzh.marugoto</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.uzh.marugoto</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
     <name>parent</name>
     <modules>

shell/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>ch.uzh.marugoto</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>ch.uzh.marugoto</groupId>
 			<artifactId>core</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>