Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
build:
strategy:
matrix:
java-version: [17]
java-version: [21, 24]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 9 additions & 11 deletions build-tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#
###############

FROM ubuntu:jammy AS tezbase
FROM ubuntu:noble AS tezbase

WORKDIR /root
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -223,9 +223,9 @@ 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 -v \
&& pip3 install --break-system-packages -v \
astroid==2.4.2 \
codespell==2.0 \
pylint==2.5.3 \
Expand All @@ -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 --no-install-recommends -y nodejs npm \
&& npm install -g \
[email protected] \
[email protected] \
&& rm -rf /root/.npm
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /root/.npm

#####
# Now all the stuff that was built in parallel
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@

<properties>
<!-- Build Properties -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<surefire.version>3.0.0-M4</surefire.version>
<failIfNoTests>false</failIfNoTests>
Expand Down Expand Up @@ -88,7 +88,7 @@
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<metrics-core.version>3.1.0</metrics-core.version>
<mockito-core.version>4.3.1</mockito-core.version>
<mockito-core.version>4.8.1</mockito-core.version>
<netty.version>4.1.116.Final</netty.version>
<pig.version>0.13.0</pig.version>
<protobuf.version>3.25.5</protobuf.version>
Expand All @@ -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
</test.jvm.args>

<maven.javadoc.skip>true</maven.javadoc.skip> <!-- enabled only in relevant modules separately -->
Expand Down