conflict test is in test stage and fix on grep return status code

.gitlab-ci.yml

@@ -174,7 +174,7 @@ build_war:
 
 dependency_conflict_check:
   image: maven:latest
-  stage: build
+  stage: test
   script:
     - apt-get update
     - apt-get install -y curl gnupg git ant sudo
@@ -182,7 +182,9 @@ dependency_conflict_check:
     - apt-get install -y nodejs
 
     - mvn clean install -DskipTests=true
-    - mvn dependency:tree -Dverbose | grep conflict > conflicts.txt
+    - set +e
+    - mvn dependency:tree -Dverbose | grep conflict | cat > conflicts.txt
+    - set -e
     - conflicts=`cat conflicts.txt| wc -l`
     - echo Found conflicts $conflicts ':'
     - cat conflicts.txt