Skip to content

Commit

Permalink
bump así nomás a java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
santiago-requena-despegar committed Nov 28, 2024
1 parent e6aad56 commit 069630b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
3 changes: 1 addition & 2 deletions src/packaging/docker-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ RUN apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y \
build-essential \
git \
openjdk-8-jdk \
openjdk-11-jdk \
openjdk-21-jdk \
maven \
nodejs \
python2 \
Expand Down
17 changes: 4 additions & 13 deletions src/packaging/docker-build/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,14 @@ arch=$(dpkg-architecture -q DEB_BUILD_ARCH)
pushd ${WORKDIR}/cassandra-reaper > /dev/null
export VERSION=$(printf 'VER\t${project.version}' | mvn help:evaluate 2>/dev/null | grep '^VER' | cut -f2)
echo "Building package for version ${VERSION}"
# From version 3.1 onwards JDK11 is needed to build Reaper (e9cfc20)
java_home=""
java_path=""
javac_path=""
javadoc_path=""
if [ "$(cut -d'.' -f1 <<<${VERSION})" -ge 3 ] && [ "$(cut -d'.' -f2 <<<${VERSION})" -ge 1 ]
then
java_home="/usr/lib/jvm/java-11-openjdk-${arch}"
java_path="bin/java"
javac_path="bin/javac"
javadoc_path="bin/javadoc"
else
java_home="/usr/lib/jvm/java-8-openjdk-${arch}"
java_path="jre/bin/java"
javac_path="bin/javac"
javadoc_path="bin/javadoc"
fi
java_home="/usr/lib/jvm/java-21-openjdk-${arch}"
java_path="bin/java"
javac_path="bin/javac"
javadoc_path="bin/javadoc"
export JAVA_HOME=${java_home}
update-alternatives --set java "${JAVA_HOME}/${java_path}"
update-alternatives --set javac "${JAVA_HOME}/${javac_path}"
Expand Down
2 changes: 1 addition & 1 deletion src/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.4.0</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 069630b

Please sign in to comment.