Skip to content

Commit

Permalink
[COMMON] upgrade jdk from 11 to 17 (#1683)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chia7712
chia7712 authored Apr 30, 2023
1 parent afbeb60 commit 5711be3
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 21 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ application {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

ext {
Expand Down
4 changes: 2 additions & 2 deletions common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

ext {
Expand Down
4 changes: 2 additions & 2 deletions connector/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion docker/build_deps_image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y \
git \
openjdk-11-jdk \
openjdk-17-jdk \
wget \
unzip \
curl
Expand Down
2 changes: 1 addition & 1 deletion docker/start_app.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN tar -xvf \$(find ./app/build/distributions/ -maxdepth 1 -type f -name app-*.
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy astraea
COPY --from=build /opt/astraea /opt/astraea
Expand Down
4 changes: 2 additions & 2 deletions docker/start_broker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RUN tar -zxvf \$(find ./core/build/distributions/ -maxdepth 1 -type f \( -iname
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/jmx_exporter /opt/jmx_exporter
Expand Down Expand Up @@ -134,7 +134,7 @@ WORKDIR /opt/kafka
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/jmx_exporter /opt/jmx_exporter
Expand Down
4 changes: 2 additions & 2 deletions docker/start_controller.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN tar -zxvf \$(find ./core/build/distributions/ -maxdepth 1 -type f \( -iname
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/jmx_exporter /opt/jmx_exporter
Expand Down Expand Up @@ -122,7 +122,7 @@ WORKDIR /opt/kafka
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/jmx_exporter /opt/jmx_exporter
Expand Down
1 change: 1 addition & 0 deletions docker/start_hadoop.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ RUN tar -zxvf hadoop-${VERSION}.tar.gz -C /opt/hadoop --strip-components=1
FROM ubuntu:22.04
#install tools
# TODO: upgrade to jdk 11 (https://github.com/skiptests/astraea/issues/1681)
RUN apt-get update && apt-get install -y openjdk-11-jre
#copy hadoop
Expand Down
4 changes: 2 additions & 2 deletions docker/start_worker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ RUN cp /tmp/astraea/connector/build/libs/astraea-*-all.jar /opt/kafka/libs/
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/kafka /opt/kafka
Expand Down Expand Up @@ -135,7 +135,7 @@ RUN cp /tmp/astraea/connector/build/libs/astraea-*-all.jar /opt/kafka/libs/
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy kafka
COPY --from=build /opt/kafka /opt/kafka
Expand Down
2 changes: 1 addition & 1 deletion docker/start_zookeeper.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN tar -zxvf apache-zookeeper-${VERSION}-bin.tar.gz -C /opt/zookeeper --strip-c
FROM ubuntu:22.04
# install tools
RUN apt-get update && apt-get install -y openjdk-11-jre
RUN apt-get update && apt-get install -y openjdk-17-jre
# copy zookeeper
COPY --from=build /opt/zookeeper /opt/zookeeper
Expand Down
3 changes: 3 additions & 0 deletions etl/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ ext {
archivesBaseName = "astraea-etl"

tasks.named('test') {
// spark can't run with JDK 17 as it uses internal class
// see https://lists.apache.org/thread/814cpb1rpp73zkhtv9t4mkzzrznl82yn
jvmArgs '--add-opens=java.base/sun.nio.ch=ALL-UNNAMED'
// Use JUnit Platform for unit tests.
useJUnitPlatform()

Expand Down
4 changes: 2 additions & 2 deletions fs/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ dependencies {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

ext {
Expand Down
4 changes: 2 additions & 2 deletions gui/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ repositories {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

javafx {
Expand Down
4 changes: 2 additions & 2 deletions it/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
}

java {
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
}

ext {
Expand Down

0 comments on commit 5711be3

Please sign in to comment.