OZG-5027-separate sonar checks in jenkinsfile, fix sonar properties

Jenkinsfile

@@ -50,27 +50,48 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME                
 
-
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         loginToDockerRepo()
                         sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3'
-                  if (env.BRANCH_NAME == 'dev') {
-                        try {
+                    }
+                    
+                }
+
+            }
+        }
+        stage('Sonar Checks') {
+            when {
+                branch 'dev'
+            }
+        	steps {
+        	    script {
+                    FAILED_STAGE=env.STAGE_NAME
 
+                  	configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                   		dir('info-manager-server') {
+                        	try {
 	                            withSonarQubeEnv('sonarqube-ozg-sh'){
 	                                sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
 	                            }
-                        }
-                        catch (Exception e) {
+	                        } catch (Exception e) {
                                 unstable("SonarQube failed")
                             }
                         }
-                  }
                 		
+                		dir('info-manager-interface') {
+                        	try {
+	                            withSonarQubeEnv('sonarqube-ozg-sh'){
+	                                sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
+	                            }
+	                        } catch (Exception e) {
+                                unstable("SonarQube failed")
+                            }
                         }
                 	
             		}
                 }
+            }
+        }
         
         stage('Deploy to Nexus'){
             when {

sonar-project.properties

@@ -24,12 +24,10 @@
 
 sonar.java.coveragePlugin=jacoco
 sonar.jacoco.reportPath=target/jacoco.exec
-
-sonar.projectKey=info-manager
-sonar.sources=info/src
-sonar.tests=info/src
-sonar.test.inclusions=**/*.java
+sonar.sourceEncoding=UTF-8
+sonar.sources=info-manager-server/src
+sonar.tests=info-manager-server/src
 sonar.exclusions=**/target/**
+sonar.test.inclusions = info-manager-server/src/**/test/**/*
+sonar.exclusions = info-manager-server/src/**/test/**/*
 
-sonar.sourceEncoding=UTF-8
-sonar.projectName=Info Manager