Skip to content

Commit a1e17bf

Browse files
committed
Bump Java version to 21
1 parent 5ba6e68 commit a1e17bf

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
FROM registry.fedoraproject.org/fedora:rawhide
1818

1919
ENV LC_ALL=C.utf8 \
20-
JAVA_HOME=/usr/lib/jvm/java-17
20+
JAVA_HOME=/usr/lib/jvm/java-21
2121

2222
RUN dnf -y update \
2323
&& dnf -y install git-core \
2424
unzip \
25-
java-17-devel \
25+
java-21-devel \
2626
byaccj \
2727
gcc \
2828
rpm-devel \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ directory with patched upstream sources that are ready to be built.
156156

157157
Modules are built by executing `./mbi.sh build` command. It allows the
158158
environment variable `JAVA_HOME` to be set and pointed to JDK installation
159-
which will be used (e. g. `/usr/lib/jvm/java-17`). The minimal required
159+
which will be used (e. g. `/usr/lib/jvm/java-21`). The minimal required
160160
version of JDK is 17.
161161

162162
The `build` command accepts a few options:
@@ -177,7 +177,7 @@ that allow you to control the shape and the location of binary
177177
distribution:
178178

179179
* `-javaCmdPath` points to `java` executable, for use in launcher
180-
shebangs (defaults to `/usr/lib/jvm/java-17`).
180+
shebangs (defaults to `/usr/lib/jvm/java-21`).
181181

182182
* `-installRoot` specifies directory into which distribution will be
183183
installed (equivalent to `$RPM_BUILD_ROOT` in RPM build), by default

mbi/core/src/org/fedoraproject/mbi/dist/DistCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void run()
4242
Path workDir = reactor.getTargetDir( distModule ).resolve( "dist-work" );
4343
Util.delete( workDir );
4444

45-
String javaCmdPath = getOption( "javaCmdPath", "/usr/lib/jvm/java-17/bin/java" );
45+
String javaCmdPath = getOption( "javaCmdPath", "/usr/lib/jvm/java-21/bin/java" );
4646
String basePackageName = getOption( "basePackageName", "mbi" );
4747
String installRoot = getOption( "installRoot", "/" );
4848
String mavenHomePath = getOption( "mavenHomePath", "/opt/mbi/maven" );

0 commit comments

Comments
 (0)