Skip to content

Commit d1f9aec

Browse files
ayushtknayushtkn
committed
WIP
1 parent 3bf43b4 commit d1f9aec

File tree

11 files changed

+29
-32
lines changed

11 files changed

+29
-32
lines changed

‎dev-support/Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pipeline {
5555
environment {
5656
YETUS='yetus'
5757
// Branch or tag name. Yetus release tags are 'rel/X.Y.Z'
58-
YETUS_VERSION='rel/0.14.0'
58+
YETUS_VERSION='a7d29a6a72750a0c5c39512f33945e773e69303e'
5959
}
6060

6161
parameters {
@@ -71,7 +71,7 @@ pipeline {
7171
checkout([
7272
$class: 'GitSCM',
7373
branches: [[name: "${env.YETUS_VERSION}"]],
74-
userRemoteConfigs: [[ url: 'https://github.com/apache/yetus.git']]]
74+
userRemoteConfigs: [[ url: 'https://github.com/ayushtkn/yetus.git']]]
7575
)
7676
}
7777
}

‎dev-support/docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8
5858
######
5959
ENV MAVEN_HOME /usr
6060
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
61-
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
61+
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
6262

6363
#######
6464
# Set env vars for SpotBugs 4.2.2

‎dev-support/docker/Dockerfile_aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8
5858
######
5959
ENV MAVEN_HOME /usr
6060
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
61-
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
61+
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-arm64
6262

6363
#######
6464
# Set env vars for SpotBugs 4.2.2

‎dev-support/docker/Dockerfile_centos_7‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,17 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info"
8080
ENV MAVEN_HOME /opt/maven
8181
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
8282
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
83-
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
83+
# Download and install OpenJDK 17
84+
RUN yum install -y wget && \
85+
wget https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-x64_bin.tar.gz && \
86+
mkdir -p /usr/lib/jvm && \
87+
tar -xzf jdk-17.0.12_linux-x64_bin.tar.gz -C /usr/lib/jvm && \
88+
rm -f jdk-17.0.12_linux-x64_bin.tar.gz
89+
90+
# Set JAVA_HOME and update PATH
91+
ENV JAVA_HOME=/usr/lib/jvm/jdk-17.0.12
92+
ENV PATH=$JAVA_HOME/bin:$PATH
93+
8494

8595
#######
8696
# Set env vars for SpotBugs

‎dev-support/docker/Dockerfile_centos_8‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,13 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info"
9393
ENV MAVEN_HOME /opt/maven
9494
ENV PATH "${PATH}:${MAVEN_HOME}/bin"
9595
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
96-
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
96+
# Update the system and install OpenJDK 17
97+
RUN dnf update -y && \
98+
dnf install -y java-17-openjdk-devel && \
99+
dnf clean all
100+
101+
# Set JAVA_HOME and update PATH
102+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
97103

98104
#######
99105
# Set env vars for SpotBugs

‎dev-support/docker/Dockerfile_debian_10‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ RUN apt-get -q update \
5353

5454
# TODO : Set locale
5555

56+
RUN apt-get install -y openjdk-17-jdk
57+
5658
######
5759
# Set env vars required to build Hadoop
5860
######
5961
ENV MAVEN_HOME /usr
6062
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
61-
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
63+
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
6264

6365
#######
6466
# Set env vars for SpotBugs 4.2.2

‎dev-support/docker/pkg-resolver/packages.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,9 @@
260260
"java": {
261261
"debian:10": "openjdk-11-jdk",
262262
"ubuntu:focal": [
263-
"openjdk-8-jdk",
264-
"openjdk-11-jdk",
265263
"openjdk-17-jdk"
266264
],
267265
"ubuntu:focal::arch64": [
268-
"openjdk-8-jdk",
269-
"openjdk-11-jdk",
270266
"openjdk-17-jdk"
271267
]
272268
},

‎dev-support/jenkins.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ function run_ci() {
125125
YETUS_ARGS+=("--dockermemlimit=22g")
126126

127127
# test with Java 8 and 11
128-
YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-8-openjdk-amd64")
129-
YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64")
130-
YETUS_ARGS+=("--multijdktests=compile")
128+
YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-17-openjdk-amd64")
131129
fi
132130

133131
if [[ "$IS_NIGHTLY_BUILD" && "$IS_NIGHTLY_BUILD" == 1 ]]; then

‎hadoop-common-project/hadoop-annotations/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,6 @@
3838
</dependencies>
3939

4040
<profiles>
41-
<profile>
42-
<id>jdk1.8</id>
43-
<activation>
44-
<jdk>1.8</jdk>
45-
</activation>
46-
<dependencies>
47-
<dependency>
48-
<groupId>jdk.tools</groupId>
49-
<artifactId>jdk.tools</artifactId>
50-
<version>1.8</version>
51-
<scope>system</scope>
52-
<systemPath>${java.home}/../lib/tools.jar</systemPath>
53-
</dependency>
54-
</dependencies>
55-
</profile>
5641
<profile>
5742
<id>jdk10</id>
5843
<activation>

‎hadoop-project/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
158158

159159
<!-- define the Java language version used by the compiler -->
160-
<javac.version>1.8</javac.version>
160+
<javac.version>17</javac.version>
161161

162162
<!-- The java version enforced by the maven enforcer -->
163163
<!-- more complex patterns can be used here, such as

0 commit comments

Comments
 (0)