Skip to content

Commit

Permalink
feat: update toolchain with openjdk24
Browse files Browse the repository at this point in the history 
Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5028

Signed-off-by: sebastien.heurtematte <[email protected]>
  • Loading branch information
@heurtematte @fredg02
heurtematte authored and fredg02 committed Sep 19, 2024
1 parent ebfaf51 commit 5ccf544
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion build/gen-mvn-settings.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,5 @@ if [[ "$(jq -r '.maven.generate' "${CONFIG}")" == "true" ]]; then

>&2 echo -e "${SCRIPT_NAME}\tINFO: Generating Maven toolchains.xml"
#TODO: update max version when new JDK has been released
gen_maven_toolchains "23" > "${WORKDIR}/toolchains.xml"
gen_maven_toolchains "24" > "${WORKDIR}/toolchains.xml"
fi
84 changes: 42 additions & 42 deletions instances/eclipse.jdt/target/jenkins/plugins.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Resulting plugin list:
analysis-model-api 12.4.0
analysis-model-api 12.5.0
ant 511.v0a_a_1a_334f41b_
antisamy-markup-formatter 162.v0e6ec0fcfcf6
apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
apache-httpcomponents-client-5-api 5.3.1-110.v77252fb_d4da_5
apache-httpcomponents-client-5-api 5.3.1-117.v4d95117cd34f
asm-api 9.7-33.v4d23ef79fcc8
authentication-tokens 1.119.v50285141b_7e1
authorize-project 1.7.2
Expand All @@ -12,43 +12,43 @@ bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_
branch-api 2.1178.v969d9eb_c728e
build-timeout 1.33
caffeine-api 3.1.8-133.v17b_1ff2e0599
checks-api 2.2.0
checks-api 2.2.1
cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_
cloudbees-folder 6.928.v7c780211d66e
command-launcher 115.vd8b_301cc15d0
commons-lang3-api 3.14.0-76.vda_5591261cfe
commons-lang3-api 3.17.0-84.vb_b_938040b_078
commons-text-api 1.12.0-129.v99a_50df237f7
config-file-provider 973.vb_a_80ecb_9a_4d0
configuration-as-code 1836.vccda_4a_122a_a_e
credentials 1371.vfee6b_095f0a_3
config-file-provider 978.v8e85886ffdc4
configuration-as-code 1850.va_a_8c31d3158b_
credentials 1378.v81ef4269d764
credentials-binding 681.vf91669a_32e45
data-tables-api 2.0.8-1
data-tables-api 2.1.6-1
display-url-api 2.204.vf6fddd8a_8b_e9
durable-task 568.v8fb_5c57e8417
echarts-api 5.5.0-1
durable-task 577.v2a_8a_4b_7c0247
echarts-api 5.5.1-1
eddsa-api 0.3.0-4.v84c6f0f4969e
email-ext 1814.v404722f34263
extended-read-permission 53.v6499940139e5
external-monitor-job 215.v2e88e894db_f8
extra-columns 1.26
font-awesome-api 6.5.2-1
forensics-api 2.4.0
font-awesome-api 6.6.0-2
forensics-api 2.6.0
gerrit-code-review 0.4.9
ghprb 1.42.2
git 5.3.0
git 5.5.0
git-client 5.0.0
git-forensics 2.1.0
git-forensics 2.2.1
git-parameter 0.9.19
github 1.39.0
github 1.40.0
github-api 1.321-468.v6a_9f5f2d5a_7e
github-branch-source 1793.v1831e9c68d77
github-checks 581.va_9669c91d6cb_
github-branch-source 1797.v86fdb_4d57d43
github-checks 589.v845136f916cd
gitlab-api 5.6.0-97.v6603a_83f8690
gitlab-branch-source 704.vc7f1202d7e14
gitlab-branch-source 710.v6f19df32544b_
gitlab-plugin 1.8.1
gson-api 2.11.0-41.v019fcf6125dc
handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
hashicorp-vault-plugin 368.v48134f694db_f
hashicorp-vault-plugin 370.v946b_53544a_30
instance-identity 185.v303dc7c645f9
ionicons-api 74.v93d5eb_813d5f
jackson2-api 2.17.0-379.v02de8ec9f64c
Expand All @@ -60,52 +60,52 @@ jaxb 2.3.9-1
jdk-tool 80.v8a_dee33ed6f0
jersey2-api 2.44-151.v6df377fff741
jjwt-api 0.11.5-112.ve82dfb_224b_a_d
jobConfigHistory 1229.v3039470161a_d
joda-time-api 2.12.7-29.v5a_b_e3a_82269a_
jobConfigHistory 1264.v054b_c928547e
joda-time-api 2.13.0-85.vb_64d1c2921f1
jquery3-api 3.7.1-2
jsch 0.2.16-86.v42e010d9484b_
json-api 20240303-41.v94e11e6de726
json-path-api 2.9.0-58.v62e3e85b_a_655
junit 1284.vf75d778f98c5
kubernetes 4280.vd919fa_528c7e
junit 1300.v03d9d8a_cf1fb_
kubernetes 4288.v1719f9d0c854
kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
kubernetes-credentials 174.va_36e093562d9
kubernetes-credentials 190.v03c305394deb_
ldap 725.v3cb_b_711b_1a_ef
mailer 472.vf7c289a_4b_420
matrix-auth 3.2.2
matrix-project 832.va_66e270d2946
maven-plugin 3.23
metrics 4.2.21-451.vd51df8df52ec
mina-sshd-api-common 2.13.1-117.v2f1a_b_66ff91d
mina-sshd-api-core 2.13.1-117.v2f1a_b_66ff91d
mina-sshd-api-common 2.13.2-125.v200281b_61d59
mina-sshd-api-core 2.13.2-125.v200281b_61d59
okhttp-api 4.11.0-172.vda_da_1feeb_c6e
pam-auth 1.11
parameterized-trigger 806.vf6fff3e28c3e
pipeline-build-step 540.vb_e8849e1a_b_d8
pipeline-graph-analysis 216.vfd8b_ece330ca_
pipeline-groovy-lib 727.ve832a_9244dfa_
pipeline-groovy-lib 730.ve57b_34648c63
pipeline-input-step 495.ve9c153f6067b_
pipeline-maven 1421.v610fa_b_e2d60e
pipeline-maven-api 1421.v610fa_b_e2d60e
pipeline-milestone-step 119.vdfdc43fc3b_9a_
pipeline-model-api 2.2205.vc9522a_9d5711
pipeline-model-definition 2.2205.vc9522a_9d5711
pipeline-model-extensions 2.2205.vc9522a_9d5711
pipeline-model-api 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-definition 2.2214.vb_b_34b_2ea_9b_83
pipeline-model-extensions 2.2214.vb_b_34b_2ea_9b_83
pipeline-rest-api 2.34
pipeline-stage-step 312.v8cd10304c27a_
pipeline-stage-tags-metadata 2.2205.vc9522a_9d5711
pipeline-stage-tags-metadata 2.2214.vb_b_34b_2ea_9b_83
pipeline-stage-view 2.34
plain-credentials 183.va_de8f1dd5a_2b_
plugin-util-api 4.1.0
prism-api 1.29.0-15
prometheus 780.v7c50a_d288424
promoted-builds 957.vf5b_cee587563
prism-api 1.29.0-17
prometheus 784.vea_eca_f6592eb_
promoted-builds 965.vcda_c6a_e0998f
rebuild 332.va_1ee476d8f6d
resource-disposer 0.23
scm-api 696.v778d637b_a_762
script-security 1341.va_2819b_414686
simple-theme-plugin 191.vcd207ef9dd24
snakeyaml-api 2.2-121.v5a_68b_9300b_d4
script-security 1362.v67dc1f0e1b_b_3
simple-theme-plugin 196.v96d9592f4efa_
snakeyaml-api 2.3-123.v13484c65210a_
sonar 2.17.2
ssh-agent 376.v8933585c69d3
ssh-credentials 343.v884f71d78167
Expand All @@ -115,17 +115,17 @@ timestamper 1.27
token-macro 400.v35420b_922dcb_
trilead-api 2.147.vb_73cc728a_32e
variant 60.v7290fc0eb_b_cd
warnings-ng 11.4.0
warnings-ng 11.6.0
workflow-aggregator 600.vb_57cdd26fdd7
workflow-api 1322.v857eeeea_9902
workflow-api 1336.vee415d95c521
workflow-basic-steps 1058.vcb_fc1e3a_21a_9
workflow-cps 3922.va_f73b_7c4246b_
workflow-durable-task-step 1364.v2fd76fb_6fd41
workflow-cps 3964.v0767b_4b_a_0b_fa_
workflow-durable-task-step 1371.vb_7cec8f3b_95e
workflow-job 1400.v7fd111b_ec82f
workflow-multibranch 783.787.v50539468395f
workflow-scm-step 427.v4ca_6512e7df1
workflow-step-api 678.v3ee58b_469476
workflow-support 920.v59f71ce16f04
workflow-support 926.v9f4f9b_b_98c19
ws-cleanup 0.46
xvnc 1.28

2 changes: 1 addition & 1 deletion instances/eclipse.jdt/target/k8s/m2-dir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"data": {
".mavenrc": "set -- -V -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode \"${@}\"",
"toolchains.xml": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<toolchains>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-1.8</id>\n <version>1.8</version>\n <vendor>oracle</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-9</id>\n <version>9</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-9/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-10</id>\n <version>10</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-10/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-11</id>\n <version>11</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-12</id>\n <version>12</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-12/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-13</id>\n <version>13</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-13/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-14</id>\n <version>14</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-14/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-15</id>\n <version>15</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-15/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-16</id>\n <version>16</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-16/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-17</id>\n <version>17</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-18</id>\n <version>18</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-18/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-19</id>\n <version>19</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-19/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-20</id>\n <version>20</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-20/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-21</id>\n <version>21</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-21/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-22</id>\n <version>22</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-22/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-23</id>\n <version>23</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-23/latest</jdkHome></configuration>\n </toolchain>\n</toolchains>\n"
"toolchains.xml": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<toolchains>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-1.8</id>\n <version>1.8</version>\n <vendor>oracle</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-9</id>\n <version>9</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-9/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-10</id>\n <version>10</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-10/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-11</id>\n <version>11</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-12</id>\n <version>12</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-12/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-13</id>\n <version>13</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-13/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-14</id>\n <version>14</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-14/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-15</id>\n <version>15</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-15/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-16</id>\n <version>16</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-16/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-17</id>\n <version>17</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-18</id>\n <version>18</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-18/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-19</id>\n <version>19</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-19/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-20</id>\n <version>20</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-20/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-21</id>\n <version>21</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-21/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-22</id>\n <version>22</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-22/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-23</id>\n <version>23</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-23/latest</jdkHome></configuration>\n </toolchain>\n <toolchain>\n <type>jdk</type>\n <provides>\n <id>JavaSE-24</id>\n <version>24</version>\n <vendor>openjdk</vendor>\n </provides>\n <configuration><jdkHome>/opt/tools/java/openjdk/jdk-24/latest</jdkHome></configuration>\n </toolchain>\n</toolchains>\n"
},
"kind": "ConfigMap",
"metadata": {
Expand Down

0 comments on commit 5ccf544

Please sign in to comment.