Separate out build options from general ones

.gitlab-ci.yml

@@ -9,7 +9,8 @@ variables:
   # for submodules: https://gitlab.com/gitlab-org/gitlab-runner/issues/3011
   GIT_SUBMODULE_STRATEGY: none
   MAVEN_CLI_OPTS: "--batch-mode"
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dbuild.tooling=true -Dbuild.af3=true -Dbuild.emf=true"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
+  MAVEN_BUILD_OPTS: " -Dbuild.tooling=true -Dbuild.af3=true -Dbuild.emf=true"
 
 
 before_script:
@@ -30,7 +31,7 @@ build:
 #    - git submodule sync --recursive
     - git submodule update --remote --recursive --init
   script:
-    - mvn $MAVEN_CLI_OPTS verify
+    - mvn $MAVEN_CLI_OPTS $MAVEN_BUILD_OPTS verify
 
 test:
   stage: test