apache · ayushtkn · Jan 20, 2025
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
     environment {
         YETUS='yetus'
         // Branch or tag name.  Yetus release tags are 'rel/X.Y.Z'
-        YETUS_VERSION='rel/0.14.0'
+        YETUS_VERSION='a7d29a6a72750a0c5c39512f33945e773e69303e'
     }
 
     parameters {
@@ -71,7 +71,7 @@ pipeline {
                     checkout([
                         $class: 'GitSCM',
                         branches: [[name: "${env.YETUS_VERSION}"]],
-                        userRemoteConfigs: [[ url: 'https://github.com/apache/yetus.git']]]
+                        userRemoteConfigs: [[ url: 'https://github.com/ayushtkn/yetus.git']]]
                     )
                 }
             }

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
@@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8
 ######
 ENV MAVEN_HOME /usr
 # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 
 #######
 # Set env vars for SpotBugs 4.2.2

diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64
@@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8
 ######
 ENV MAVEN_HOME /usr
 # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
+ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-arm64
 
 #######
 # Set env vars for SpotBugs 4.2.2

diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7
@@ -80,7 +80,17 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info"
 ENV MAVEN_HOME /opt/maven
 ENV PATH "${PATH}:${MAVEN_HOME}/bin"
 # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
+# Download and install OpenJDK 17
+RUN yum install -y wget && \
+    wget https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-x64_bin.tar.gz && \
+    mkdir -p /usr/lib/jvm && \
+    tar -xzf jdk-17.0.12_linux-x64_bin.tar.gz -C /usr/lib/jvm && \
+    rm -f jdk-17.0.12_linux-x64_bin.tar.gz
+
+# Set JAVA_HOME and update PATH
+ENV JAVA_HOME=/usr/lib/jvm/jdk-17.0.12
+ENV PATH=$JAVA_HOME/bin:$PATH
+
 
 #######
 # Set env vars for SpotBugs

diff --git a/dev-support/docker/Dockerfile_centos_8 b/dev-support/docker/Dockerfile_centos_8
@@ -93,7 +93,13 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info"
 ENV MAVEN_HOME /opt/maven
 ENV PATH "${PATH}:${MAVEN_HOME}/bin"
 # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
+# Update the system and install OpenJDK 17
+RUN dnf update -y && \
+    dnf install -y java-17-openjdk-devel && \
+    dnf clean all
+
+# Set JAVA_HOME and update PATH
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 
 #######
 # Set env vars for SpotBugs

diff --git a/dev-support/docker/Dockerfile_debian_10 b/dev-support/docker/Dockerfile_debian_10
@@ -53,12 +53,14 @@ RUN apt-get -q update \
 
 # TODO : Set locale
 
+RUN apt-get install -y openjdk-17-jdk
+
 ######
 # Set env vars required to build Hadoop
 ######
 ENV MAVEN_HOME /usr
 # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
 
 #######
 # Set env vars for SpotBugs 4.2.2

diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json
@@ -260,13 +260,9 @@
   "java": {
     "debian:10": "openjdk-11-jdk",
     "ubuntu:focal": [
-      "openjdk-8-jdk",
-      "openjdk-11-jdk",
       "openjdk-17-jdk"
     ],
     "ubuntu:focal::arch64": [
-      "openjdk-8-jdk",
-      "openjdk-11-jdk",
       "openjdk-17-jdk"
     ]
   },

diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh
@@ -125,9 +125,7 @@ function run_ci() {
     YETUS_ARGS+=("--dockermemlimit=22g")
 
     # test with Java 8 and 11
-    YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-8-openjdk-amd64")
-    YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
-    YETUS_ARGS+=("--multijdktests=compile")
+    YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-17-openjdk-amd64")
   fi
 
   if [[ "$IS_NIGHTLY_BUILD" && "$IS_NIGHTLY_BUILD" == 1 ]]; then

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -38,21 +38,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>jdk1.8</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>jdk.tools</groupId>
-          <artifactId>jdk.tools</artifactId>
-          <version>1.8</version>
-          <scope>system</scope>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>jdk10</id>
       <activation>

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
@@ -157,7 +157,7 @@
     <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
 
     <!-- define the Java language version used by the compiler -->
-    <javac.version>1.8</javac.version>
+    <javac.version>17</javac.version>
 
     <!-- The java version enforced by the maven enforcer -->
     <!-- more complex patterns can be used here, such as

diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
     <maven-stylus-skin.version>1.5</maven-stylus-skin.version>
     <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
     <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
-    <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
+    <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
     <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
     <restrict-imports.enforcer.version>2.0.0</restrict-imports.enforcer.version>
     <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
@@ -171,7 +171,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
                 <version>[3.0.2,)</version>
               </requireMavenVersion>
               <requireJavaVersion>
-                <version>[1.8,)</version>
+                <version>[17,)</version>
               </requireJavaVersion>
             </rules>
           </configuration>