Merge develop

.gitlab-ci.yml

@@ -3,11 +3,20 @@ stages:
   - deploy 
   - sonar
 
-# Get the settings file from c2mon project
-before_script:
-  - wget https://gitlab.cern.ch/c2mon/c2mon/raw/master/settings.xml
+image: 
+  name: gitlab-registry.cern.ch/industrial-controls/sw-infra/cc7-maven:jdk-11-mvn-3.6-1
+  entrypoint: [""]   
 
 
+variables:
+  MAVEN_CLI_OPTS:
+    -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository
+      --batch-mode --errors --show-version --settings settings-ci.xml
+
+default:
+  before_script:
+    - curl -L https://cern.ch/maven/settings-ci.xml -o settings.xml
+
 # Fully build and publish master branch
 build_and_publish:
   type: deploy
@@ -25,19 +34,20 @@ build:
   except:
     - master
     - develop
+    - tags
 
 sonar_preview:
   type: sonar
   script:
-    - mvn -q -U -B clean compile sonar:sonar -Dmaven.test.skip=true -Dsonar.host.url=https://en-ice-sonar.cern.ch -Dsonar.analysis.mode=preview -Dsonar.gitlab.commit_sha=$CI_BUILD_REF -Dsonar.gitlab.ref_name=$CI_BUILD_REF_NAME -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.max_major_issues_gate=0 --settings settings.xml --debug -X
+    - mvn -q -U -B clean compile sonar:sonar -Dmaven.test.skip=true -Dsonar.host.url=$SONAR_URL -Dsonar.analysis.mode=preview -Dsonar.gitlab.commit_sha=$CI_BUILD_REF -Dsonar.gitlab.ref_name=$CI_BUILD_REF_NAME -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.max_major_issues_gate=0 --settings settings.xml --debug -X
   except:
     - master
-    - develop
+    - tags
 
 quality_assurance:
   stage: sonar
   script:
-    - mvn package dependency-check:aggregate sonar:sonar -Dmaven.test.skip=true -Dsonar.dependencyCheck.reportPath=target/dependency-check-report.xml --settings settings.xml
+    - mvn package sonar:sonar -Dmaven.test.skip=true -Dsonar.host.url=$SONAR_URL -Dsonar.dependencyCheck.reportPath=target/dependency-check-report.xml --settings settings.xml
   only:
     - master
     - develop

pom.xml

@@ -109,7 +109,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>${java.version}</source>
+					<release>${java.version}</release>
+                                        <source>${java.version}</source>
 					<target>${java.version}</target>
 				</configuration>
 			</plugin>