From 351bbbbb4d71ba5fd29a8a78ec9dc2f0116a4cfa Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 15:57:17 +0530 Subject: [PATCH 1/7] WIP --- .github/workflows/build.yml | 2 +- Jenkinsfile | 4 ++-- build-tools/docker/Dockerfile | 8 ++++---- pom.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1148df52c9..968f5c7333 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: build: strategy: matrix: - java-version: [17] + java-version: [21] os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: diff --git a/Jenkinsfile b/Jenkinsfile index aa6263fa26..f3f895f313 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,8 +147,8 @@ pipeline { # help keep the ASF boxes clean YETUS_ARGS+=("--sentinel") - # test with Java 17 - YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-17-openjdk-amd64") + # test with Java 21 + YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-21-openjdk-amd64") YETUS_ARGS+=("--debug") # write Yetus report as GitHub comment (YETUS-1102) diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index d4cc574ed8..2f4e8220d5 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -24,7 +24,7 @@ # ############### -FROM ubuntu:jammy AS tezbase +FROM ubuntu:noble AS tezbase WORKDIR /root SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -168,15 +168,15 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # OpenJDK 17 # hadolint ignore=DL3008 RUN apt-get -q update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-17-jdk \ + && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-21-jdk \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Set JAVA_HOME and PATH environment variables -ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64 ENV PATH="${JAVA_HOME}/bin:${PATH}" # Set the default Java version using update-alternatives -RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-17-openjdk-amd64/bin/java 1 +RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-21-openjdk-amd64/bin/java 1 ####### # Install SpotBugs 4.9.3 diff --git a/pom.xml b/pom.xml index 93f761ec59..c5e4f88751 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ - 17 - 17 + 21 + 21 true 3.0.0-M4 false From 6175c8803efca4b045768504d36746c8dcf3d95a Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 16:28:10 +0530 Subject: [PATCH 2/7] Python --- build-tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index 2f4e8220d5..5a685744f0 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -225,7 +225,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ && curl -sSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \ && python3 /tmp/get-pip.py \ && rm /usr/local/bin/pip /tmp/get-pip.py \ - && pip3 install -v \ + && pip3 install --break-system-packages -v \ astroid==2.4.2 \ codespell==2.0 \ pylint==2.5.3 \ From b974d37361caaa84e8d21449cd3eb71759514795 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 16:33:17 +0530 Subject: [PATCH 3/7] Python-2 --- build-tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index 5a685744f0..9a332e2896 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -223,7 +223,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && curl -sSL https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \ - && python3 /tmp/get-pip.py \ + && python3 /tmp/get-pip.py --break-system-packages \ && rm /usr/local/bin/pip /tmp/get-pip.py \ && pip3 install --break-system-packages -v \ astroid==2.4.2 \ From c8cec0df69fe1f81b2d265f2ba362818d70691e9 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 16:35:20 +0530 Subject: [PATCH 4/7] Node --- build-tools/docker/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index 9a332e2896..f86c948aa0 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -239,14 +239,12 @@ RUN ln -s /usr/local/bin/pip3 /usr/local/bin/pip # Install npm and JSHint ### # hadolint ignore=DL3008 -RUN curl -sSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get -q install --no-install-recommends -y nodejs \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ +RUN apt-get update && apt-get install -y nodejs npm \ && npm install -g \ jshint@2.12.0 \ markdownlint-cli@0.23.2 \ - && rm -rf /root/.npm + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /root/.npm ##### # Now all the stuff that was built in parallel From 835f3cae3bfbd5ffb5a4a1dcc52852bc7d49af4e Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 17:49:43 +0530 Subject: [PATCH 5/7] Mockito --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5e4f88751..8dfdec9ec1 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 3.6.0 3.12.1 3.1.0 - 4.3.1 + 4.8.1 4.1.116.Final 0.13.0 3.25.5 @@ -106,6 +106,7 @@ --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED + -Dnet.bytebuddy.experimental=true true From 39eb7e630a743b95a200bdd6e44eda946a34228a Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 19:21:07 +0530 Subject: [PATCH 6/7] Fix HadoLint --- build-tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index f86c948aa0..1e7131e5f8 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -239,7 +239,7 @@ RUN ln -s /usr/local/bin/pip3 /usr/local/bin/pip # Install npm and JSHint ### # hadolint ignore=DL3008 -RUN apt-get update && apt-get install -y nodejs npm \ +RUN apt-get update && apt-get install --no-install-recommends -y nodejs npm \ && npm install -g \ jshint@2.12.0 \ markdownlint-cli@0.23.2 \ From 3f880c97ce3507ab3123514119bd48e5ea77a0c1 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 Jun 2025 19:21:34 +0530 Subject: [PATCH 7/7] Add Github Actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 968f5c7333..22a8a3711e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: build: strategy: matrix: - java-version: [21] + java-version: [21, 24] os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: