Skip to content
Open
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
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 21
YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-21-openjdk-amd64")
# test with Java 25
YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-25-openjdk-amd64")
YETUS_ARGS+=("--debug")

# write Yetus report as GitHub comment (YETUS-1102)
Expand Down
10 changes: 5 additions & 5 deletions build-tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
####

####
# OpenJDK 21
# OpenJDK 25
# hadolint ignore=DL3008
RUN apt-get -q update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-21-jdk \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-25-jdk \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

# Set JAVA_HOME and PATH environment variables
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
# Set JAVA_HOME and PATH environment variables for JDK 25
ENV JAVA_HOME=/usr/lib/jvm/java-25-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-21-openjdk-amd64/bin/java 1
RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-25-openjdk-amd64/bin/java 1

#######
# Install SpotBugs 4.9.3
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<!-- Build Properties -->
<!-- Default empty argLine to prevent Surefire crashes when the 'jacoco' profile is inactive -->
<argLine/>
<javaVersion>21</javaVersion>
<maven.compiler.release>21</maven.compiler.release>
<javaVersion>25</javaVersion>
<maven.compiler.release>25</maven.compiler.release>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<failIfNoTests>false</failIfNoTests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
8 changes: 8 additions & 0 deletions tez-plugins/tez-aux-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.2</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.8</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>package</phase>
Expand Down