Merge branch 'develop' into 'master'

gitlab ci

See merge request fg-bks/br-verification-tool!17

.gitlab-ci.yml

@@ -57,35 +57,10 @@ verify:jdk8:
   <<: *verify
   image: maven:3.3.9-jdk-8
 
-# For `master` branch run `mvn deploy` automatically.
-# Here you need to decide whether you want to use JDK7 or 8.
-# To get this working you need to define a volume while configuring your gitlab-ci-multi-runner.
-# Mount your `settings.xml` as `/root/.m2/settings.xml` which holds your secrets.
-# See https://maven.apache.org/settings.html
-deploy:jdk8:
-  # Use stage test here, so the pages job may later pickup the created site.
-  stage: test
-  script:
-    - 'mvn $MAVEN_CLI_OPTS tomcat:redeploy'
-  only:
-    - master
-  # Archive up the built documentation site.
-  #artifacts:
-  #  paths:
-  #  - target/staging
-  image: maven:3.3.9-jdk-8
-
-pages:
+deploy:
   image: busybox:latest
   stage: deploy
   script:
-    # Because Maven appends the artifactId automatically to the staging path if you did define a parent pom,
-    # you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
-    - mv target/staging public
-  dependencies:
-    - deploy:jdk8
-  artifacts:
-    paths:
-    - public
+    - 'mvn $MAVEN_CLI_OPTS tomcat:redeploy'
   only:
     - master