Remove unused {jdks} variable

global-jjb maven-verify jobs do not use the {jdks} variable. This
variable is a remnant of the old ODL maven verify job.

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 96b0c51785e3989fad60cc089b4037bf250203ff..0d307f7abf9c46f1fcfd15b8aceba1af929d349b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -10,8 +10,6 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'aaa'
     project-name: 'aaa'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'aaa'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 02a890749f6db6119ab98c0392ed3240cd567666..da8f9b4432baf51ceb2f8abcbd5f185bd060d90a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -10,8 +10,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'alto'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 0145b33ae86bfbdb0b7a4f24400f8292c15b0660..24207d711819c04c03d664b5f503d205567e4444 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -10,8 +10,6 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'atrium-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 8c1204a25e559c371cbd6b8b43b9e60273f4a44b..ce7887fb8d400e3fa3e0f863f2d77edef8e8a4bc 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -13,8 +13,6 @@
     build-node: centos7-builder-2c-8g
     build-timeout: 120
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
@@ -43,8 +41,6 @@
     build-node: centos7-builder-2c-8g
     build-timeout: 120
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
@@ -74,8 +70,6 @@
     build-timeout: 120
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index bc54f6eea8a07e65bf9a4022885fc151c4d85623..3a54e71373756d6ff2e9becf1e5a8d803d8b429d 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -11,8 +11,6 @@
     project-name: 'bier'
     branch: 'master'
     build-timeout: 90
-    jdks:
-      - openjdk8
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -33,8 +31,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -56,8 +52,6 @@
     project-name: 'bier'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 316473e72735f19b6b21a6663bf7b558d5bfc36a..bf5f301d19f497694affeaf01edb8fc066bda9fb 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -10,8 +10,6 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'capwap'
     project-name: 'capwap'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'capwap'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 71eb69fa7d99c4f696b5281cf4b7a4191108828d..8962ee4826ac05eff8329d57cbfba8736b8926cf 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -10,8 +10,6 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'cardinal'
     project-name: 'cardinal'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'cardinal'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 3301151d7989b3bcc53d5f5afe0c8a16fc6fa095..b96d01da85a96fae69059d4acaedcb7bd9d9d89c 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -10,8 +10,6 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'centinel'
     project-name: 'centinel'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'centinel'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 9918f8f5faa6b0ff99ac670a74e11bfc8a95e671..4740ba10f4c910c75190b0e15e9bfdc9f9331ba9 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -10,8 +10,6 @@
     project-name: 'coe'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -32,8 +30,6 @@
     project-name: 'coe'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -54,8 +50,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 4ea17db1125734c585585caee7fae0adfa3995dc..8b698b32f8dff88e1baed1d65e6863b2336f079e 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -11,8 +11,6 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -35,8 +33,6 @@
     project: 'controller'
     project-name: 'controller'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -60,8 +56,6 @@
     project-name: 'controller'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 9077a7882cf6e6f06c2fdf7fbccd310e0420c51a..dfd6205f1cfdd52d8992845cab6686dc035290bb 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -9,8 +9,6 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'coretutorials-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -31,8 +29,6 @@
     project: 'coretutorials'
     project-name: 'coretutorials'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'coretutorials-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -54,8 +50,6 @@
     project-name: 'coretutorials'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'coretutorials-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 3016b6d9288e22de292dca3cdc867a5d48260de2..49b7f40517ee5617b7fc8e86c7de679e2d1fbafa 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -10,8 +10,6 @@
     project-name: 'daexim'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -32,8 +30,6 @@
     project-name: 'daexim'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 306765c25dc6210cc2455e4222aec25539266c94..c54a7e8bf86876698b0fd9c8a414335b5e67169f 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -10,8 +10,6 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'didm'
     project-name: 'didm'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'didm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 9f69b38653986daa04e0c6d4bc191e349c782b89..fbd47780c894731805a66dc77c61d746601ecd06 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -10,8 +10,6 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'dlux'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 9ec4d138303ab1ae3042cb74045c331c2d470da7..2eea9a58ab409927529347b3e091822ad85361fd 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -10,8 +10,6 @@
     project-name: 'dluxapps'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -32,8 +30,6 @@
     project-name: 'dluxapps'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -55,8 +51,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index d8f3f0749b9f12992c6ae91de3eb873f16f215af..e2c75d2e18a66b45b2dffb8274a3a611c11e4023 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -11,8 +11,6 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -35,8 +33,6 @@
     project: 'eman'
     project-name: 'eman'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -60,8 +56,6 @@
     project-name: 'eman'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index ff2170e8f5af4493b047736fa3b4bc7fc9fdcec5..cd16b5827ff7bc98dce24e8208ed2f471d1f1633 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -10,8 +10,6 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'faas'
     project-name: 'faas'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'faas'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 8b9cb09b64fbe3fc519198e4afd44d1cb80c539c..d680b128fd042eea71019e7f3254429a700deb9b 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -11,8 +11,6 @@
     project-name: 'federation'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -34,8 +32,6 @@
     project-name: 'federation'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -58,8 +54,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index af3a0896335700ffecbe987662dc1b7fab422704..32690ccf80dd4c09a1c8fe15877a476eb40ad5d9 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -11,8 +11,6 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 90
@@ -39,8 +37,6 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
@@ -67,8 +63,6 @@
     project-name: 'genius'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 062c114bd2db4c53b608350c30a625f01483f178..b60c2efdfb4e23dafd111c9aba84a5a63ef3dd67 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -10,8 +10,6 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -39,8 +37,6 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -68,8 +64,6 @@
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 8bc6d62f545d2dabf372b45901cb08462513ba33..4d3c545a3b7f2dde74f864d5cd545d9bf138e51e 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -10,8 +10,6 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'vbd'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 5d838fab51f805f84da7da974383e3a2a3a30e65..77dfce7398fb89c2909e57870aa63bea6afff9d5 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -11,8 +11,6 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -33,8 +31,6 @@
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -56,8 +52,6 @@
     project-name: 'infrautils'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 4da8aef60bf257ad7f9be2017abab5856c21507e..bcb999f0012249760092dc07369c3ade07afa052 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -10,8 +10,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'iotdm'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 581508c45762983f248660b7d1f50188a688dec5..aa9d59210ec726b9e8924a36603b2a1f2cf05bab 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -9,8 +9,6 @@
     project-name: 'jsonrpc'
     stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -30,8 +28,6 @@
     project-name: 'jsonrpc'
     stream: oxygen
     branch: 'stable/oxygen'
-    jdks:
-      - openjdk8
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -51,8 +47,6 @@
     project-name: 'jsonrpc'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -73,8 +67,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 50d8b4dbc12e3a443a219b6101e8dd0976d52b36..3cb1e9378bf555543c2d329b30747bcd4d9875b3 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -10,8 +10,6 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -37,8 +35,6 @@
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -65,8 +61,6 @@
     project-name: 'l2switch'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 3a1ed3595c8f562395e18d6df93a7c0e5b850a6f..194a76145edafe80761174f997aab1f368c21abb 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -10,8 +10,6 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'lacp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index e72ba5e1fdcb4d7b36bde7693074597a176d9a28..2f0e2d50e3d636489bfffca27504804ecc599a3d 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -11,8 +11,6 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -39,8 +37,6 @@
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -68,8 +64,6 @@
     project-name: 'lispflowmapping'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 657ef2823fdd81df12920c14c52eb32b0e5de4d0..a52d25ce241b35f16633c8d41d95bf2494b9a856 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -11,8 +11,6 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
@@ -36,8 +34,6 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
@@ -61,8 +57,6 @@
     project-name: 'mdsal'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 5d7d0ddc7adb4611598431dc0a2be36bf1a9cf44..4c928c39bfa90852a3e0c40e357175958fe243d7 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -11,8 +11,6 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'messaging4transport-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -34,8 +32,6 @@
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'messaging4transport-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -58,8 +54,6 @@
     project-name: 'messaging4transport'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'messaging4transport-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 275d7ecc4a0355f25b98860b4a4261a5cfa781de..b40529213b487f29ccf266b67718476a1b667c60 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -11,8 +11,6 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
@@ -34,8 +32,6 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
@@ -58,8 +54,6 @@
     project-name: 'natapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 35ae3cd801742a8692ad2eddb87ec2d7141c069c..3a9c047e25cf1d88aa6d9acecb46f07624db53d1 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -10,8 +10,6 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'nemo'
     project-name: 'nemo'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'nemo'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 85f30cb49609dda64bf9e95c64543186f46e4ffa..026cebb91088ccba7fb703ff233f8f7ee979500f 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -10,8 +10,6 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -34,8 +32,6 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -58,8 +54,6 @@
     project-name: 'netconf'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index f85b901d532dacec7a8cde7793020ee322de277b..9952388a736a9708ceb5af6f3f47c53a40ca9459 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -10,8 +10,6 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'netide'
     project-name: 'netide'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'netide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index c52bdc9c0118535a8c7895b9bc3c03fe42121e85..943f00a10dc13ff03b4f207154fe673d57e2a721 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -18,8 +18,6 @@
           karaf-version: karaf3
     project: 'netvirt'
     project-name: 'netvirt'
-    jdks:
-      - openjdk8
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     build-timeout: 90
@@ -48,8 +46,6 @@
     branch: 'topic/vpp'
     karaf-version: karaf3
     distribution_branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     dependencies:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 1cfb40c47ac760e187239e2a6508c27136ecbadb..b569802268e5304904aca90d1384ac89e8bb8252 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -12,8 +12,6 @@
     project-name: 'neutron'
     build-timeout: 90
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -36,8 +34,6 @@
     project-name: 'neutron'
     build-timeout: 60
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
@@ -61,8 +57,6 @@
     build-timeout: 60
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index e83303f65ef6f22fde8733fdedaa1c2da8739d85..338f2b0379077b6653530292f5045968b53b0b86 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -10,8 +10,6 @@
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'next'
     project-name: 'next'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'next'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 0571d5d77eb9f281b7fb5e9ece57ef1523c150ee..5ee9a485000c866b2b254d0a331752291dd43068 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -10,8 +10,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'nic'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index b2de85dfb99a5bec6ce4087a46eef5cac68e8ee0..239fdc64cbf753f87bf9e6edcf75f75d126274f7 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -10,8 +10,6 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'ocpplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index a7e9267d03e3f650337a3b0311d24fef89294234..46a237a5ce295af0568415698ba102ba92e63f2e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -12,8 +12,6 @@
     branch: master
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: mvn35
@@ -44,8 +42,6 @@
     branch: 3.1.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -76,8 +72,6 @@
     branch: 3.0.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -108,8 +102,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -141,8 +133,6 @@
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 292bb74e36e41cd67868be49fc4d5ceca9432b81..b119ff3b2d7f81f4430f072f81e45635799fe584 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -10,8 +10,6 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'of-config'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index d9c6a22bb16fa5b182d6097b1f67e06a76f49239..ab4d336fea6f5a46f649925a928f65d123b61fc8 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -9,8 +9,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -30,8 +28,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -51,8 +47,6 @@
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdks:
-      - openjdk8
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index a4c11129a6e5c4558df8395ff330572abead90be..66561f090af202896281a3cdc1a4645d008667e4 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -11,8 +11,6 @@
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'openflowjava-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -35,8 +33,6 @@
     project-name: 'openflowjava'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'openflowjava-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 0ae23472a2766eb89b333536155e4b0990b6daea..f3236868905dfeb732795cacbaad999e650b4d7c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -11,8 +11,6 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,8 +38,6 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -69,8 +65,6 @@
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
     karaf-version: 'karaf3'
-    jdks:
-      - openjdk8
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 5e295edc3bb2bdd1badcc7962ee0f543137ec22e..c9118a47d681c414fcc4af21eb320e487a93ba3b 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -11,8 +11,6 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -34,8 +32,6 @@
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -58,8 +54,6 @@
     project-name: 'ovsdb'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 52711dfaa90d5e9dda2c5d5d21a3e999fbe5c650..1fd08e53b1033511e31e25273d06cc6b2598e9ac 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -11,8 +11,6 @@
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 1eb271218fc6800b3782c7bfea920472165fafa2..893de90b903eb590f186a36944a6e854917635e7 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -10,8 +10,6 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'packetcable'
     project-name: 'packetcable'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'packetcable'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index fccca8f18ada3a962559fa519997a11d44de2191..1b7254c9c0ae471b73d8d6a6870aa416d1228240 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -10,9 +10,6 @@
     project-name: 'persistence'
     branch: 'master'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
     mvn-settings: 'persistence-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -33,9 +30,6 @@
     project-name: 'persistence'
     branch: 'stable/nitrogen'
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
     mvn-settings: 'persistence-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -57,9 +51,6 @@
     branch: 'stable/carbon'
     karaf-version: karaf3
     jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
     mvn-settings: 'persistence-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index 3ee723ceb7f531fd1a5a115954b9ea1d172856ab..47ae0223cb1147cce4fd4d46fd6c7ba559b0dd78 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -9,8 +9,6 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'reservation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -30,8 +28,6 @@
     project: 'reservation'
     project-name: 'reservation'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'reservation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -52,8 +48,6 @@
     project-name: 'reservation'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'reservation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index cdfd118cef645be26c21b756b980759450a1e542..a970d3bafa477228684d00a2d460660ced6c6f51 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -10,8 +10,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index db26acad7df18c5c282953648f40384a8a850411..350e6c49ce7e5fb92634b70907a7f8b76aec635c 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -10,8 +10,6 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
@@ -34,8 +32,6 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
@@ -58,8 +54,6 @@
     project-name: 'sfc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 57b955bdb7de895f2d7391a06e4bc21c632e7eb0..b580353fa3573a8ae54daab23b106dcb24b87643 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -10,8 +10,6 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'snbi'
     project-name: 'snbi'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'snbi'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index d5a2992a75e9e4b53d2c5a40d4c3c7886aa2c302..0797d5820f738f03ed8b0e1b448d8c2c6d7c41a8 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -10,8 +10,6 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'snmp'
     project-name: 'snmp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'snmp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 80bb127a33cadb34c24965c189cf6d772c14dbbb..6bf8e0fec2f2cd0c54d5d7c48a58242afb1a0aef 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -10,8 +10,6 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'snmp4sdn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 7f03e0b7600689d5efaa172f227cdc8b68b2390b..bbc06bd2ed36f7a8dc152a72eccc1fca24b27bd0 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -10,8 +10,6 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'sxp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index d8991f2d9d0724bc892aaa4878207a5578c71c4b..e90c54398aa1cb555419c1e894e4196d3b8dfbed 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -9,8 +9,6 @@
     project-name: 'systemmetrics'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -30,8 +28,6 @@
     project-name: 'systemmetrics'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -52,8 +48,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index cbc71a4fe38ba8244d773882b3429683aee29920..95a78bf243d8259939101681ce1b7508630b0e22 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -10,8 +10,6 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'topoprocessing-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'topoprocessing-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'topoprocessing'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'topoprocessing-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index d82234ac1ddd202ebc9a06fc68359867167c39e5..c1602ba26f538243bee4eaadc8c8dceb3970a84b 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -9,8 +9,6 @@
     project-name: 'transportpce'
     stream: oxygen
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -30,8 +28,6 @@
     project-name: 'transportpce'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -52,8 +48,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 841919211d2b82a55f4ee2b096e177447795ad25..8b26f5df0cf3d5af6bc35f9cd1b1f37eeaf1a563 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -10,8 +10,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'tsdr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index c81438262f07d5e6f99edbd1579451139354780a..61b06172461e5ab32b21b9f1694ca8318afba875 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -10,8 +10,6 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'ttp'
     project-name: 'ttp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'ttp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index c82839430e430e172f225ae1392b4c87c3f2f93c..10e12ff2e0a62c998c3f30149613167d6e4be4c5 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -10,8 +10,6 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -33,8 +31,6 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -57,8 +53,6 @@
     project-name: 'unimgr'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 9691545b99ffd9e65ade53c56034d23529eaefb1..16a9e10e24ca12ca8f89e86c5ea4766e3729579e 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -11,8 +11,6 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -34,8 +32,6 @@
     project: 'usc'
     project-name: 'usc'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -58,8 +54,6 @@
     project-name: 'usc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 12f84a22146e9f926315c5e94886ceb477fcb0b9..4d0ee2843f4774a5c2c8fd09e6137b43bd30c0e0 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -10,8 +10,6 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
@@ -32,8 +30,6 @@
     project: 'usecplugin'
     project-name: 'usecplugin'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
@@ -55,8 +51,6 @@
     project-name: 'usecplugin'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 661253e75af887623974dd91f5b1ca74bb023e66..e0c973e458c3724d0f4eefaac76dbc716dd51520 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -11,8 +11,6 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -39,8 +37,6 @@
     project: 'vtn'
     project-name: 'vtn'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -68,8 +64,6 @@
     project-name: 'vtn'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 25b0681b6fad5682a2db0d36de35a0e0d2fe228b..bc312bc658c4199cc8d88f5dfbfddcb8374dfecf 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -10,8 +10,6 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'yang-push-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -32,8 +30,6 @@
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'yang-push-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -55,8 +51,6 @@
     project-name: 'yang-push'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'yang-push-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index fd6f203b77f48aa5fdab48bc68024bb747167c30..98e63de308e2f2687f7e6cda7f98009ca9d1db8c 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -9,8 +9,6 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'yangide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
@@ -30,8 +28,6 @@
     project: 'yangide'
     project-name: 'yangide'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'yangide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
@@ -52,8 +48,6 @@
     project-name: 'yangide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'yangide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index cf57422e4bf7ae2e3d7dccb5e1cbc2532cb077de..5dbfb07b9afe078965e736a543d0d15d1c511cc5 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -10,8 +10,6 @@
     branch: master
     stream: master
 
-    jdks:
-      - openjdk8
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -41,8 +39,6 @@
     project-name: 'yangtools'
     branch: 'v1.2.x'
     distribution_branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -72,8 +68,6 @@
     project-name: 'yangtools'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'