Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -22,7 +22,7 @@ variables:
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   # `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 -Dgit-rev="$(git describe)"
+  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"'
@@ -33,8 +33,7 @@ variables:
 .validate: &validate
   stage: build
   script:
-    - env
-    - 'mvn $MAVEN_CLI_OPTS test-compile'
+    - 'mvn -Dgit-rev="`git describe`" $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
@@ -42,7 +41,7 @@ variables:
   stage: test
   script:
     - env
-    - 'mvn $MAVEN_CLI_OPTS verify site site:stage'
+    - 'mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS verify site site:stage'
   except:
     - master
 
@@ -66,8 +65,7 @@ deploy:jdk8:
   # Use stage test here, so the pages job may later pickup the created site.
   stage: test
   script:
-    - env
-    - 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
+    - 'mvn -Dgit-rev="`git describe`" $MAVEN_CLI_OPTS deploy site site:stage'
   only:
     - master
   # Archive up the built documentation site.