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 <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index dfaeb80fc10ae0b06a594e04dac2bd2b7cb47079..e5d18a9bf0082d455de51e9f81b7f141690c5ddd 100644 (file)
--- 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 723bb09196f2744b5ba11539182ff219dd5a548c..72602af7e70efb48ba31aa2ed9d5bc97bfc29cac 100644 (file)
--- 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 cd23834c2275726377ca5cfbb90dc6a39c41c044..3801cf1a4c94691d0da945909659cdfdcaddad39 100644 (file)
--- 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 c2221bcf0cf8355afddae317ff152ace72e56a76..71371c2ad500f6580e8322ec179a277ebc4dedb8 100644 (file)
--- 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 8761d4281da7d1b213aa75651aecf00adcbb148a..c3f0cea1d997c6f82128e4ba004f6c1c0059f072 100644 (file)
--- 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 f14d2961271f89c43599aca9ab7eb03443ceb565..b373283a8892a8489e45e46d9cfb7ffbbfe0f585 100644 (file)
--- 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 34f9cb0479001d2535208c946b315dba2a7315fc..75e60c44e063ae8d6ac19934e018f200c7d5b080 100644 (file)
--- 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 41f213a7278cd477ed5268287f77a95d82dcb49c..8450c8fd875cc6f19628dcd373d10ced7d57ecba 100644 (file)
--- 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 654a375c5cd6d97723f87b9e88d82531765aebc2..b640c09d5a894e295a54b69703e44a2b16c59770 100644 (file)
--- 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 0ffe5ea8e5f2b3bb791743f8a7685997afcccb0e..233a1e730fd73b6b3aa8db4f5111e9acc1356351 100644 (file)
--- 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 90516e361d69f1133f602231d2d1cb2b6b9ee659..e65cca4418aa0502b5b261c6bc1411455baf3083 100644 (file)
--- 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 45858a5eab84e0eafad1eb1ada5c62abed43188e..4e865cf5f5f4fdeaa916608bd82290bccbddb53e 100644 (file)
--- 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 2e3ec821c936a9188cdd6767649b5f998bdcb399..696ab0df33ae5173d9db77162c5c442f02959f8a 100644 (file)
--- 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 402e53cae3a7db7e8d4c1bb545d6e5c06028d25e..2651c8bc834a37145b526ba285c06f4558c49af0 100644 (file)
--- 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 0b059bc870da4b4969f74cafd8299a0ea16fe0d4..abfbd51282f3bd1f7b2ce289478149f31685e487 100644 (file)
--- 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 e4ea294dca9acaea606bca119f4aefe361b256dd..08e27c9a56ac513b48414198498077a97542f655 100644 (file)
--- 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 cbb1446489c267e683f23551162e58e5967707b8..cf5ba163bfb88c9cbe856816ff3aaaa839f7115b 100644 (file)
--- 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 bc78e6840e3a27e79d5fa52c7b3b86866bc04348..5ce937765b1955e3fe15384e367d60cc43c263e5 100644 (file)
--- 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 35ac34907c94657d6c3c5209c7d8b8bbcfa0b5d8..6dde13a38169fad2576fb7defbb56a84cd0ba194 100644 (file)
--- 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 0c9e215b7dabe434562991ab7b9062e06f2279ba..222cc0230ea193b800176b21178ab5e9debdd6f6 100644 (file)
--- 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 26ce3cea0ed501f6dba535c27f8376976f368579..eddc32fcbbe36c4fa97b76f843d275c563d2c2b0 100644 (file)
--- 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 092f022412c0e6d9ff8573454e4aa237bcafa1fc..de308d76345e7a85dc9c8f95de1640c240f38963 100644 (file)
--- 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 dae2f4b56d61dc187374b8edec81fd9354a5c474..f290ee9394e2d41dabbac3cdcac6790b1f13361b 100644 (file)
--- 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 d824095ea21f5fba41e61947fdf9e932879c935e..9ff2c3d56b02bea7fcc3b307564bb3d2711048a1 100644 (file)
--- 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 2f6fefffba4580db909d33bf57f42d45b3455862..d6e4f142bf6badfb6c1eaede8b874e4964d6528f 100644 (file)
--- 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 215bec89f543883281ac1016a6aaf546e80e6159..86920b1e213b1ab806a8e22a6721c643d948596c 100644 (file)
--- 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 a01688903aa649f11cf8c3f01b068edceaa1b84c..dfda165e932eccdc09444e235cd25fe46243be4f 100644 (file)
--- 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