From 1309a144c140e56537d53ae0332535b9a640de60 Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Wed, 7 Jun 2023 15:06:15 -0700 Subject: [PATCH] Feat: switch default java-version to openjdk17 None of our active projects support Java lower than 17, switch the default and eliminate overrides in projects. Change-Id: I478cac9436b3963f86f47b8ae4fbf6a111874bf5 Signed-off-by: Robert Varga Signed-off-by: Sangwook Ha --- jjb/aaa/aaa.yaml | 4 ---- jjb/autorelease/autorelease-projects.yaml | 1 - jjb/autorelease/autorelease-templates.yaml | 5 ++--- jjb/bgpcep/bgpcep.yaml | 3 --- jjb/controller/controller.yaml | 4 ---- jjb/daexim/daexim.yaml | 4 ---- jjb/defaults.yaml | 4 ++-- jjb/infrautils/infrautils.yaml | 4 ---- jjb/integration/distribution/distribution-jobs.yaml | 3 --- jjb/integration/integration-test-jobs.yaml | 1 - jjb/jsonrpc/jsonrpc.yaml | 4 ---- jjb/lispflowmapping/lispflowmapping.yaml | 4 ---- jjb/mdsal/mdsal.yaml | 4 ---- jjb/netconf/netconf-distribution-mri-test.yaml | 1 - jjb/netconf/netconf.yaml | 4 ---- jjb/odlparent/odlparent.yaml | 1 - jjb/openflowplugin/openflowplugin-patch-test.yaml | 1 - jjb/openflowplugin/openflowplugin.yaml | 4 ---- jjb/ovsdb/ovsdb-full-integration.yaml | 2 -- jjb/ovsdb/ovsdb-patch-test.yaml | 1 - jjb/ovsdb/ovsdb.yaml | 4 ---- jjb/releng-maven-mri-stage.yaml | 2 +- jjb/releng-templates-java.yaml | 3 --- jjb/serviceutils/serviceutils-patch-test.yaml | 1 - jjb/serviceutils/serviceutils.yaml | 4 ---- jjb/transportpce/transportpce.yaml | 7 ------- jjb/yangtools/yangtools.yaml | 4 ---- 27 files changed, 5 insertions(+), 79 deletions(-) diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index dfaeb80fc..e5d18a9bf 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -14,7 +14,6 @@ project: "aaa" project-name: "aaa" branch: "master" - java-version: "openjdk17" mvn-settings: "aaa-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -37,7 +36,6 @@ project: "aaa" project-name: "aaa" branch: 0.17.x - java-version: "openjdk17" mvn-settings: "aaa-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -60,7 +58,6 @@ project: "aaa" project-name: "aaa" branch: 0.16.x - java-version: "openjdk17" mvn-settings: "aaa-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -96,7 +93,6 @@ project: "aaa" project-name: "aaa" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "aaa-settings" sonarcloud: true diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 723bb0919..72602af7e 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -63,7 +63,6 @@ -Dcheckstyle.skip=true -Dskip.karaf.featureTest=true -Dsft.heap.max=4g - java-version: "openjdk17" - project: name: autorelease-info diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index cd23834c2..3801cf1a4 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -62,7 +62,6 @@ build-node: "{build-node}" cron: "H 0 * * *" - java-version: "{java-version}" mvn-global-settings: global-settings mvn-goals: clean deploy mvn-opts: "-Xmx8g -Dmaven.compile.fork=true" @@ -499,7 +498,7 @@ # Default variables # ##################### - java-version: openjdk8 + java-version: openjdk17 mvn-global-settings: global-settings mvn-settings: autorelease-settings mvn-version: mvn38 @@ -512,7 +511,7 @@ project-type: freestyle # Note: This NEEDS to be hardcoded as projects should NOT be allowed to # override the build node. - node: centos7-builder-2c-8g + node: centos8-builder-2c-8g concurrent: true jdk: "{java-version}" disabled: "{disable-job}" diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index c2221bcf0..71371c2ad 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -20,7 +20,6 @@ build-timeout: 120 branch: "master" build-node: centos8-builder-8c-8g - java-version: "openjdk17" mvn-settings: "bgpcep-settings" dependencies: > odlparent-merge-{stream}, @@ -52,7 +51,6 @@ build-timeout: 120 branch: "0.18.x" build-node: centos8-builder-8c-8g - java-version: "openjdk17" mvn-settings: "bgpcep-settings" dependencies: > odlparent-merge-{stream}, @@ -93,7 +91,6 @@ build-node: centos8-builder-8c-8g build-timeout: 120 branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "bgpcep-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 8761d4281..c3f0cea1d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -14,7 +14,6 @@ project: "controller" project-name: "controller" branch: master - java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" build-timeout: 90 @@ -39,7 +38,6 @@ project: "controller" project-name: "controller" branch: 7.0.x - java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" build-timeout: 90 @@ -64,7 +62,6 @@ project: "controller" project-name: "controller" branch: 6.0.x - java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" build-timeout: 90 @@ -102,7 +99,6 @@ project: "controller" project-name: "controller" branch: master - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pintegrationtests,docs" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index f14d29612..b373283a8 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -15,7 +15,6 @@ project-name: "daexim" stream: potassium branch: "master" - java-version: "openjdk17" mvn-settings: "daexim-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -39,7 +38,6 @@ project-name: "daexim" stream: argon branch: "stable/argon" - java-version: "openjdk17" mvn-settings: "daexim-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -63,7 +61,6 @@ project-name: "daexim" stream: chlorine branch: "stable/chlorine" - java-version: "openjdk17" mvn-settings: "daexim-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -79,7 +76,6 @@ project: "daexim" project-name: "daexim" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "daexim-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 34f9cb047..75e60c44e 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -131,8 +131,8 @@ verify-jdkversion: openjdk17 # Maven / Java - java-version: "openjdk8" - jre: "openjdk8" + java-version: "openjdk17" + jre: "openjdk17" opendaylight-infra-mvn-opts: | --show-version --batch-mode diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 41f213a72..8450c8fd8 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -15,7 +15,6 @@ project: "infrautils" project-name: "infrautils" branch: master - java-version: "openjdk17" mvn-settings: "infrautils-settings" dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -39,7 +38,6 @@ project: "infrautils" project-name: "infrautils" branch: 5.0.x - java-version: "openjdk17" mvn-settings: "infrautils-settings" dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -63,7 +61,6 @@ project: "infrautils" project-name: "infrautils" branch: "4.0.x" - java-version: "openjdk17" mvn-settings: "infrautils-settings" dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -99,7 +96,6 @@ project: "infrautils" project-name: "infrautils" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "infrautils-settings" sonarcloud: true diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 654a375c5..b640c09d5 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -18,7 +18,6 @@ mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt" mvn-opts: "-Xmx1024m" mvn-version: mvn38 - java-version: openjdk17 jre: "openjdk17" karaf-version: odl nexus-iq-namespace: odl- @@ -51,7 +50,6 @@ type: managed profile: "-Pmanaged" forbidden-files: '(docker\/.*)' - java-version: "openjdk17" jre: "openjdk17" karaf-version: karaf4 dist-pom: "distribution/pom.xml" @@ -93,7 +91,6 @@ project: integration/distribution project-name: distribution branch: master - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: integration-distribution-settings mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 0ffe5ea8e..233a1e730 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,7 +18,6 @@ build-node: centos8-builder-2c-2g mvn-version: "mvn38" - java-version: "openjdk17" # CSIT Lists in defaults.yaml stream: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 90516e361..e65cca441 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -14,7 +14,6 @@ project: "jsonrpc" project-name: "jsonrpc" stream: potassium - java-version: "openjdk17" branch: "master" mvn-settings: "jsonrpc-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" @@ -38,7 +37,6 @@ project: "jsonrpc" project-name: "jsonrpc" stream: argon - java-version: "openjdk17" branch: "stable/argon" mvn-settings: "jsonrpc-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" @@ -62,7 +60,6 @@ project: "jsonrpc" project-name: "jsonrpc" stream: chlorine - java-version: "openjdk17" branch: "stable/chlorine" mvn-settings: "jsonrpc-settings" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" @@ -89,7 +86,6 @@ project: "jsonrpc" project-name: "jsonrpc" - java-version: "openjdk17" branch: "master" mvn-version: mvn38 mvn-settings: "jsonrpc-settings" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 45858a5ea..4e865cf5f 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -17,7 +17,6 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "master" - java-version: "openjdk17" mvn-settings: "lispflowmapping-settings" mvn-goals: "clean deploy -DrepoBuild" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" @@ -50,7 +49,6 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "stable/argon" - java-version: "openjdk17" mvn-settings: "lispflowmapping-settings" mvn-goals: "clean deploy -DrepoBuild" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" @@ -83,7 +81,6 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "stable/chlorine" - java-version: "openjdk17" mvn-settings: "lispflowmapping-settings" mvn-goals: "clean deploy -DrepoBuild" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" @@ -105,7 +102,6 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "lispflowmapping-settings" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 2e3ec821c..696ab0df3 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -15,7 +15,6 @@ branch: master stream: master - java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -46,7 +45,6 @@ branch: 11.0.x stream: 11.0.x - java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -77,7 +75,6 @@ branch: 10.0.x stream: 10.0.x - java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -120,7 +117,6 @@ project: "mdsal" project-name: "mdsal" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "mdsal-settings" mvn-goals: "clean deploy" diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml index 402e53cae..2651c8bc8 100644 --- a/jjb/netconf/netconf-distribution-mri-test.yaml +++ b/jjb/netconf/netconf-distribution-mri-test.yaml @@ -9,7 +9,6 @@ stream: - master: branch: "master" - java-version: "openjdk17" os-branch: "queens" diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 0b059bc87..abfbd5128 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -17,7 +17,6 @@ project-name: "netconf" stream: master branch: "master" - java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" mvn-goals: "clean deploy -Pintegrationtests" @@ -46,7 +45,6 @@ project-name: "netconf" stream: 5.0.x branch: "5.0.x" - java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" mvn-goals: "clean deploy -Pintegrationtests" @@ -75,7 +73,6 @@ project-name: "netconf" stream: 4.0.x branch: "4.0.x" - java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" mvn-goals: "clean deploy -Pintegrationtests" @@ -114,7 +111,6 @@ project: "netconf" project-name: "netconf" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "netconf-settings" mvn-goals: "clean deploy -Pintegrationtests" diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index e4ea294dc..08e27c9a5 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -124,7 +124,6 @@ project-name: "odlparent" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "odlparent-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index cbb144648..cf5ba163b 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -6,7 +6,6 @@ # The project name project: "openflowplugin" - java-version: "openjdk17" mvn-version: "mvn38" # Project branches diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index bc78e6840..5ce937765 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -19,7 +19,6 @@ project-name: "openflowplugin" branch: "master" build-timeout: 90 - java-version: "openjdk17" mvn-settings: "openflowplugin-settings" mvn-goals: "clean deploy javadoc:aggregate" dependencies: > @@ -51,7 +50,6 @@ project-name: "openflowplugin" branch: "stable/argon" build-timeout: 90 - java-version: "openjdk17" mvn-settings: "openflowplugin-settings" mvn-goals: "clean deploy javadoc:aggregate" dependencies: > @@ -83,7 +81,6 @@ project-name: "openflowplugin" branch: "stable/chlorine" build-timeout: 90 - java-version: "openjdk17" mvn-settings: "openflowplugin-settings" mvn-goals: "clean deploy javadoc:aggregate" dependencies: > @@ -104,7 +101,6 @@ project-name: "openflowplugin" branch: "master" build-timeout: 90 - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "openflowplugin-settings" sonarcloud: true diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 35ac34907..6dde13a38 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -4,8 +4,6 @@ jobs: - "ovsdb-daily-full-integration-{stream}" - java-version: "openjdk17" - stream: - potassium: branch: "master" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 0c9e215b7..222cc0230 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -6,7 +6,6 @@ # The project name project: "ovsdb" - java-version: "openjdk17" mvn-version: "mvn38" stream: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 26ce3cea0..eddc32fcb 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -17,7 +17,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "master" - java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]" @@ -43,7 +42,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "stable/argon" - java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]" @@ -69,7 +67,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "stable/chlorine" - java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]" @@ -86,7 +83,6 @@ project-name: "ovsdb" branch: "master" build-timeout: 90 - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "ovsdb-settings" sonarcloud: true diff --git a/jjb/releng-maven-mri-stage.yaml b/jjb/releng-maven-mri-stage.yaml index 092f02241..de308d763 100644 --- a/jjb/releng-maven-mri-stage.yaml +++ b/jjb/releng-maven-mri-stage.yaml @@ -86,7 +86,7 @@ disable-job: false git-url: "$GIT_URL/$PROJECT" github-url: "https://github.com" - java-version: openjdk8 + java-version: openjdk17 maven-versions-plugin: false version-properties-file: version.properties mvn-central: false diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index dae2f4b56..f290ee939 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -45,7 +45,6 @@ sign-artifacts: true cron: "" - java-version: openjdk17 mvn-version: mvn38 - job-group: @@ -67,7 +66,6 @@ build-timeout: 180 mvn-version: mvn38 - java-version: openjdk17 - job-template: name: "{project-name}-integration-{stream}" @@ -162,7 +160,6 @@ cron: "@daily" mvn-opts: "" mvn-version: mvn35 - java-version: openjdk8 ##################### # Job Configuration # diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index d824095ea..9ff2c3d56 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -5,7 +5,6 @@ - inttest-patch-test project: "serviceutils" - java-version: "openjdk17" mvn-version: "mvn38" stream: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index 2f6fefffb..d6e4f142b 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -19,7 +19,6 @@ project: "serviceutils" project-name: "serviceutils" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "serviceutils-settings" build-timeout: 90 dependencies: > @@ -51,7 +50,6 @@ project: "serviceutils" project-name: "serviceutils" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "serviceutils-settings" build-timeout: 90 dependencies: > @@ -83,7 +81,6 @@ project: "serviceutils" project-name: "serviceutils" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "serviceutils-settings" build-timeout: 90 dependencies: > @@ -103,7 +100,6 @@ project: "serviceutils" project-name: "serviceutils" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "serviceutils-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 215bec89f..86920b1e2 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -18,7 +18,6 @@ stream: transportpce-master branch: "master" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" @@ -45,7 +44,6 @@ stream: argon branch: "stable/argon" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" @@ -73,7 +71,6 @@ stream: chlorine branch: "stable/chlorine" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" @@ -102,7 +99,6 @@ project-name: "transportpce" branch: "master" build-timeout: 90 - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "transportpce-settings" sonarcloud: true @@ -136,7 +132,6 @@ stream: master branch: "master" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" @@ -155,7 +150,6 @@ stream: argon branch: "stable/argon" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" @@ -174,7 +168,6 @@ stream: chlorine branch: "stable/chlorine" build-node: centos8-builder-2c-2g - java-version: "openjdk17" mvn-settings: "transportpce-settings" mvn-opts: "-Xmx1024m" dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index a01688903..dfda165e9 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -10,7 +10,6 @@ branch: master stream: master - java-version: "openjdk17" mvn-settings: "yangtools-settings" dependencies: "" @@ -37,7 +36,6 @@ branch: 10.0.x stream: 10.0.x - java-version: "openjdk17" mvn-settings: "yangtools-settings" dependencies: "" @@ -64,7 +62,6 @@ branch: 9.0.x stream: 9.0.x - java-version: "openjdk17" mvn-settings: "yangtools-settings" dependencies: "" @@ -108,7 +105,6 @@ project: "yangtools" project-name: "yangtools" branch: "master" - java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "yangtools-settings" sonarcloud: true -- 2.36.6