Update .gitlab-ci.yml

.gitlab-ci.yml

-# This file is a template, and might need editing before it works on your project.
----
-# Build JAVA applications using Apache Maven (http://maven.apache.org)
-# For docker image tags see https://hub.docker.com/_/maven/
-#
-# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-#
-# This template will build and test your projects as well as create the documentation.
-#
-# * Caches downloaded dependencies and plugins between invocation.
-# * Does only verify merge requests but deploy built artifacts of the
-#   master branch.
-# * Shows how to use multiple jobs in test stage for verifying functionality
-#   with multiple JDKs.
-# * Uses site:stage to collect the documentation for multi-module projects.
-# * Publishes the documentation for `master` branch.
+image: maven:3.3.9-jdk8
 
 
 variables:
 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -24,69 +9,67 @@ variables:
   # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
   # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
 
 
-# Cache downloaded dependencies and plugins between builds.
-# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
+.before-script:
+  - export GIT-REV=`git describe`
 
 
-# This will only validate and compile stuff and run e.g. maven-enforcer-plugin.
-# Because some enforcer rules might check dependency convergence and class duplications
-# we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
-.validate: &validate
-  stage: build
+stages:
+ - validate
+ - compile
+ - test
+ - package
+ - verify
+ - deploy
+
+validate:
+  stage: validate
+  script:
+    - mvn $MAVEN_CLI_OPTS validate
+
+compile:
+  stage: compile
+  script:
+    - mvn $MAVEN_CLI_OPTS compile
+
+test-compile:
+  stage: compile
   script:
   script:
-    - 'mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS test-compile'
+    - mvn $MAVEN_CLI_OPTS test-compile
 
 
-# For merge requests do not `deploy` but only run `verify`.
-# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-.verify: &verify
+test:
   stage: test
   stage: test
   script:
   script:
-    - env
-    - 'mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS verify site site:stage'
-  except:
-    - master
+    - mvn $MAVEN_CLI_OPTS test
 
 
-# Validate merge requests using JDK8
-validate:jdk8:
-  <<: *validate
-  image: maven:3.3.9-jdk-8
+package:
+  stage: package
+  script:
+    - mvn $MAVEN_CLI_OPTS package
 
 
-# Verify merge requests using JDK8
-verify:jdk8:
-  <<: *verify
-  image: maven:3.3.9-jdk-8
+site:
+  stage: package
+  script:
+    - mvn $MAVEN_CLI_OPTS site site:jar
 
 
+verify:
+  stage: verify
+  script:
+    - mvn $MAVEN_CLI_OPTS verify
 
 
-# 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
+deploy:
+  stage: deploy
   script:
   script:
-    - 'mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS deploy site site:stage'
-  only:
-    - master
-  # Archive up the built documentation site.
+    - mvn $MAVEN_CLI_OPTS deploy
   artifacts:
   artifacts:
     paths:
     paths:
-    - target/staging
-  image: maven:3.3.9-jdk-8
-
+    - target/*.jar
 
 
 pages:
 pages:
-  image: busybox:latest
   stage: deploy
   stage: deploy
   script:
   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.
+    - mvn $MAVEN_CLI_OPTS site:stage
     - mv target/staging public
     - mv target/staging public
-  dependencies:
-    - deploy:jdk8
   artifacts:
   artifacts:
     paths:
     paths:
     - public
     - public
   only:
   only:
     - master
     - master
-