Merge "Remove source:jar and javadoc:jar from goals"

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml
index c269b02bc5d32473611123e3106622b3daee7122..56d4fcf513824200cf828f1e3da00a7a5ee316d9 100644 (file)
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-custom.yaml
@@ -43,7 +43,7 @@
             !include-raw-escape include-raw-setup-docker.sh
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -Pjenkins -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -52,7 +52,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
             goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
             properties:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 8bac0764a707880e3e67f80ebe834724d837921a..fcc9c1262c2bb96d14ac9b2df8e5905b90746a50 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -79,7 +79,7 @@
         - shell:
             !include-raw-escape include-raw-setup-docker.sh
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
             goals: 'clean install verify -Pintegrationtest,jenkins -V'
             properties:

diff --git a/jjb/ovsdb/ovsdb-full-lithium-integration.yaml b/jjb/ovsdb/ovsdb-full-lithium-integration.yaml
index 082cfbe0621afdc6dd868533e5a54a0095872d13..aea489165d7976c506e24518ca9564aaf47801b8 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-lithium-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-lithium-integration.yaml
@@ -79,7 +79,7 @@
         - shell:
             !include-raw-escape include-raw-setup-docker.sh
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
             goals: 'clean install verify -Pintegrationtest,jenkins -V'
             properties:

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index bc7740f368aee5ecec1589c6ce57de44603539d0..60bdf4ef97e54b6d183de895e640409f9f9c8f50 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -61,7 +61,6 @@ if cfg.get('BRANCHES'):
             branches.update({b: branch[b]})
 else:
     branches.update({"master": {"jdks": "openjdk7"}})
-    branches.update({"stable/helium": {"jdks": "openjdk7"}})
 
 sonar_branch = list(branches.items())[0][0]
 # Create YAML to list branches to create jobs for