Update merge view job filter

[releng/builder.git] / jjb / ovsdb / ovsdb-sonar.yaml

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index ac657e5cd5c967a6523a86f6ff19b6cd37c10b43..a223c54200656cf06cb2febafb5981efff9fd0ae 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -67,7 +67,7 @@
               -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
               -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
+            - '-Xmx1024m'
           settings: 'ovsdb-settings'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -75,7 +75,7 @@
       - inject:
           properties-file: env.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: >
               verify -V -B -Pintegrationtest -Dsonar
@@ -91,7 +91,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins