Merge branch 'dev' of gitlab.gwdg.de:bmp-caosdb/caosdb-server into dev

.gitlab-ci.yml

@@ -33,7 +33,7 @@ stages:
 
 # delete local maven repo to be sure all packages are still maintained by the maven repos
 setup:mvn:
-    tags: [ linux ]
+    tags: [ java8 ]
     stage: setup
     script:
         - make easy-units
@@ -46,7 +46,7 @@ setup:mvn:
 
 # generate parsing classes with antlr
 code-generation:antlr:
-    tags: [ linux ]
+    tags: [ java8 ]
     stage: code-generation
     artifacts:
         paths:
@@ -60,7 +60,7 @@ code-generation:antlr:
 
 # compile the server
 build:server:
-    tags: [ linux ]
+    tags: [ java8 ]
     stage: build
     dependencies:
         - code-generation:antlr
@@ -76,7 +76,7 @@ build:server:
 
 # junit tests for the server
 test:server:
-    tags: [ linux ]
+    tags: [ java8 ]
     stage: test
     dependencies:
         - build:server
@@ -87,7 +87,7 @@ test:server:
 # Clean
 ###########
 clean:mvn:
-    tags: [ linux ]
+    tags: [ java8 ]
     stage: clean
     when: always
     dependencies: []