Bump default Maven version to 3.3.3

Change-Id: Id0b28cc77e04fbb99216d2d0a1fb3bba8c333e6b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 19d102d0632267c76e466e769867888662fe30dc..80249ba5679162cd312b3bf69f7371e9d912942c 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -34,7 +34,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 626e12d9edf6e56d338c7aa3fcc0ad89e66bbe40..286b806ef4a2cad79dd82854ff5a179f4f34696f 100644 (file)
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -43,7 +43,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar'
         maven-opts: 'MAVEN_OPTS'

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index a6067b9808698457485d9134fc13250731bd245c..8a27bbc246774f50ed85ffa023ab55fdbbb3d0cf 100644 (file)
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -36,7 +36,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index deed83ae9aed8dd519899a289c927eaa77b68095..b2b499d526b79bf72b30ff5034a1868e6cd5fbe4 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -47,7 +47,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar'
         maven-opts: 'MAVEN_OPTS'

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 0390c54b4c2c8aa1304a25b5f886911f6ba4eb02..0320ff21dd4a636560b1d3ec54e6c6664c29f7fb 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -45,7 +45,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS source:jar javadoc:jar -Dmerge'
         maven-opts: 'MAVEN_OPTS'

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index 87b87b74e963d7a64487248fba0b06ef9f8a76a5..e80d97dfbbc4168db40ecac5ba67471998f7cfea 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -31,7 +31,7 @@
         - timed: 'H H * * *'
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS -Dsonar'
         maven-opts: 'MAVEN_OPTS'

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 0ba1647cf565448656c763a92e57fa185775f4ac..8ae7197186242100c9d0d693014c8cc9379ef932 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -55,7 +55,7 @@
     builders:
         - wipe-org-opendaylight-repo
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'POM'
             goals: 'MAVEN_GOALS'
             java-opts:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 6bf9cfedfb06b25c9607cf8647031afcfa6b379f..1e76a0b452e4b2f251f14572ccac70d4467a3002 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -15,6 +15,7 @@
     mvn30: 'Maven 3.0.5'
     mvn31: 'Maven 3.1.1'
     mvn32: 'Maven 3.2.5'
+    mvn33: 'Maven 3.3.3'
 
     # Config File Provider ID mapping
     odl-global-settings: 'org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig1414604295262'