From 6111b67d87bb22cec768b8caca80430d0a87094c Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 1 Feb 2018 21:44:31 -0500 Subject: [PATCH] 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 --- jjb/aaa/aaa.yaml | 6 ------ jjb/alto/alto.yaml | 6 ------ jjb/atrium/atrium.yaml | 6 ------ jjb/bgpcep/bgpcep.yaml | 6 ------ jjb/bier/bier.yaml | 6 ------ jjb/capwap/capwap.yaml | 6 ------ jjb/cardinal/cardinal.yaml | 6 ------ jjb/centinel/centinel.yaml | 6 ------ jjb/coe/coe.yaml | 6 ------ jjb/controller/controller.yaml | 6 ------ jjb/coretutorials/coretutorials.yaml | 6 ------ jjb/daexim/daexim.yaml | 4 ---- jjb/didm/didm.yaml | 6 ------ jjb/dlux/dlux.yaml | 6 ------ jjb/dluxapps/dluxapps.yaml | 6 ------ jjb/eman/eman.yaml | 6 ------ jjb/faas/faas.yaml | 6 ------ jjb/federation/federation.yaml | 6 ------ jjb/genius/genius.yaml | 6 ------ jjb/groupbasedpolicy/groupbasedpolicy.yaml | 6 ------ jjb/honeycomb/vbd/vbd.yaml | 6 ------ jjb/infrautils/infrautils.yaml | 6 ------ jjb/iotdm/iotdm.yaml | 6 ------ jjb/jsonrpc/jsonrpc.yaml | 8 -------- jjb/l2switch/l2switch.yaml | 6 ------ jjb/lacp/lacp.yaml | 6 ------ jjb/lispflowmapping/lispflowmapping.yaml | 6 ------ jjb/mdsal/mdsal.yaml | 6 ------ jjb/messaging4transport/messaging4transport.yaml | 6 ------ jjb/natapp/natapp.yaml | 6 ------ jjb/nemo/nemo.yaml | 6 ------ jjb/netconf/netconf.yaml | 6 ------ jjb/netide/netide.yaml | 6 ------ jjb/netvirt/netvirt.yaml | 4 ---- jjb/neutron/neutron.yaml | 6 ------ jjb/next/next.yaml | 6 ------ jjb/nic/nic.yaml | 6 ------ jjb/ocpplugin/ocpplugin.yaml | 6 ------ jjb/odlparent/odlparent.yaml | 10 ---------- jjb/of-config/of-config.yaml | 6 ------ jjb/ofextensions/circuitsw/circuitsw.yaml | 6 ------ jjb/openflowjava/openflowjava.yaml | 4 ---- jjb/openflowplugin/openflowplugin.yaml | 6 ------ jjb/ovsdb/ovsdb.yaml | 6 ------ jjb/p4plugin/p4plugin.yaml | 2 -- jjb/packetcable/packetcable.yaml | 6 ------ jjb/persistence/persistence.yaml | 9 --------- jjb/reservation/reservation.yaml | 6 ------ jjb/sdninterfaceapp/sdninterfaceapp.yaml | 6 ------ jjb/sfc/sfc.yaml | 6 ------ jjb/snbi/snbi.yaml | 6 ------ jjb/snmp/snmp.yaml | 6 ------ jjb/snmp4sdn/snmp4sdn.yaml | 6 ------ jjb/sxp/sxp.yaml | 6 ------ jjb/systemmetrics/systemmetrics.yaml | 6 ------ jjb/topoprocessing/topoprocessing.yaml | 6 ------ jjb/transportpce/transportpce.yaml | 6 ------ jjb/tsdr/tsdr.yaml | 6 ------ jjb/ttp/ttp.yaml | 6 ------ jjb/unimgr/unimgr.yaml | 6 ------ jjb/usc/usc.yaml | 6 ------ jjb/usecplugin/usecplugin.yaml | 6 ------ jjb/vtn/vtn.yaml | 6 ------ jjb/yang-push/yang-push.yaml | 6 ------ jjb/yangide/yangide.yaml | 6 ------ jjb/yangtools/yangtools.yaml | 6 ------ 66 files changed, 395 deletions(-) diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 96b0c5178..0d307f7ab 100644 --- 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 02a890749..da8f9b443 100644 --- 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 0145b33ae..24207d711 100644 --- 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 8c1204a25..ce7887fb8 100644 --- 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 bc54f6eea..3a54e7137 100644 --- 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 316473e72..bf5f301d1 100644 --- 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 71eb69fa7..8962ee482 100644 --- 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 3301151d7..b96d01da8 100644 --- 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 9918f8f5f..4740ba10f 100644 --- 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 4ea17db11..8b698b32f 100644 --- 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 9077a7882..dfd6205f1 100644 --- 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 3016b6d92..49b7f4051 100644 --- 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 306765c25..c54a7e8bf 100644 --- 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 9f69b3865..fbd47780c 100644 --- 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 9ec4d1383..2eea9a58a 100644 --- 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 d8f3f0749..e2c75d2e1 100644 --- 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 ff2170e8f..cd16b5827 100644 --- 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 8b9cb09b6..d680b128f 100644 --- 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 af3a08963..32690ccf8 100644 --- 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 062c114bd..b60c2efdf 100644 --- 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 8bc6d62f5..4d3c545a3 100644 --- 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 5d838fab5..77dfce739 100644 --- 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 4da8aef60..bcb999f00 100644 --- 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 581508c45..aa9d59210 100644 --- 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 50d8b4dbc..3cb1e9378 100644 --- 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 3a1ed3595..194a76145 100644 --- 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 e72ba5e1f..2f0e2d50e 100644 --- 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 657ef2823..a52d25ce2 100644 --- 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 5d7d0ddc7..4c928c39b 100644 --- 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 275d7ecc4..b40529213 100644 --- 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 35ae3cd80..3a9c047e2 100644 --- 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 85f30cb49..026cebb91 100644 --- 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 f85b901d5..9952388a7 100644 --- 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 c52bdc9c0..943f00a10 100644 --- 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 1cfb40c47..b56980226 100644 --- 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 e83303f65..338f2b037 100644 --- 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 0571d5d77..5ee9a4850 100644 --- 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 b2de85dfb..239fdc64c 100644 --- 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 a7e9267d0..46a237a5c 100644 --- 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 292bb74e3..b119ff3b2 100644 --- 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 d9c6a22bb..ab4d336fe 100644 --- 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 a4c11129a..66561f090 100644 --- 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 0ae23472a..f32368689 100644 --- 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 5e295edc3..c9118a47d 100644 --- 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 52711dfaa..1fd08e53b 100644 --- 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 1eb271218..893de90b9 100644 --- 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 fccca8f18..1b7254c9c 100644 --- 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 3ee723ceb..47ae0223c 100644 --- 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 cdfd118ce..a970d3baf 100644 --- 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 db26acad7..350e6c49c 100644 --- 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 57b955bdb..b580353fa 100644 --- 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 d5a2992a7..0797d5820 100644 --- 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 80bb127a3..6bf8e0fec 100644 --- 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 7f03e0b76..bbc06bd2e 100644 --- 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 d8991f2d9..e90c54398 100644 --- 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 cbc71a4fe..95a78bf24 100644 --- 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 d82234ac1..c1602ba26 100644 --- 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 841919211..8b26f5df0 100644 --- 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 c81438262..61b061724 100644 --- 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 c82839430..10e12ff2e 100644 --- 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 9691545b9..16a9e10e2 100644 --- 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 12f84a221..4d0ee2843 100644 --- 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 661253e75..e0c973e45 100644 --- 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 25b0681b6..bc312bc65 100644 --- 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 fd6f203b7..98e63de30 100644 --- 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 cf57422e4..5dbfb07b9 100644 --- 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' -- 2.36.6