Skip to content

Commit e03bb96

Browse files
wernerdvwernerdv
committed
IGNITE-28531 Change Ignite maven.source.version to 17
1 parent d377032 commit e03bb96

40 files changed

Lines changed: 86 additions & 381 deletions

File tree

‎bin/control.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if "%OS%" == "Windows_NT" setlocal
2828
if defined JAVA_HOME goto checkJdk
2929
echo %0, ERROR:
3030
echo JAVA_HOME environment variable is not found.
31-
echo Please point JAVA_HOME variable to location of JDK 11 or later.
31+
echo Please point JAVA_HOME variable to location of JDK 17 or later.
3232
echo You can also download latest JDK at http://java.com/download.
3333
goto error_finish
3434

@@ -37,7 +37,7 @@ goto error_finish
3737
if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
3838
echo %0, ERROR:
3939
echo JAVA is not found in JAVA_HOME=%JAVA_HOME%.
40-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
40+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
4141
echo You can also download latest JDK at http://java.com/download.
4242
goto error_finish
4343

@@ -55,10 +55,10 @@ set JAVA_VER_STR=%JAVA_VER_STR:"=%
5555
for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
5656
if %MAJOR_JAVA_VER% == 1 set MAJOR_JAVA_VER=%MINOR_JAVA_VER%
5757

58-
if %MAJOR_JAVA_VER% LSS 11 (
58+
if %MAJOR_JAVA_VER% LSS 17 (
5959
echo %0, ERROR:
6060
echo The version of JAVA installed in %JAVA_HOME% is incorrect.
61-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
61+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
6262
echo You can also download latest JDK at http://java.com/download.
6363
goto error_finish
6464
)

‎bin/ignite.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if "%OS%" == "Windows_NT" setlocal
2828
if defined JAVA_HOME goto checkJdk
2929
echo %0, ERROR:
3030
echo JAVA_HOME environment variable is not found.
31-
echo Please point JAVA_HOME variable to location of JDK 11 or later.
31+
echo Please point JAVA_HOME variable to location of JDK 17 or later.
3232
echo You can also download latest JDK at http://java.com/download.
3333
goto error_finish
3434

@@ -37,7 +37,7 @@ goto error_finish
3737
if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
3838
echo %0, ERROR:
3939
echo JAVA is not found in JAVA_HOME=%JAVA_HOME%.
40-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
40+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
4141
echo You can also download latest JDK at http://java.com/download.
4242
goto error_finish
4343

@@ -55,10 +55,10 @@ set JAVA_VER_STR=%JAVA_VER_STR:"=%
5555
for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
5656
if %MAJOR_JAVA_VER% == 1 set MAJOR_JAVA_VER=%MINOR_JAVA_VER%
5757

58-
if %MAJOR_JAVA_VER% LSS 11 (
58+
if %MAJOR_JAVA_VER% LSS 17 (
5959
echo %0, ERROR:
6060
echo The version of JAVA installed in %JAVA_HOME% is incorrect.
61-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
61+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
6262
echo You can also download latest JDK at http://java.com/download.
6363
goto error_finish
6464
)

‎bin/include/functions.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ checkJava() {
6666
if [ $RETCODE -ne 0 ]; then
6767
echo $0", ERROR:"
6868
echo "JAVA_HOME environment variable is not found."
69-
echo "Please point JAVA_HOME variable to location of JDK 11 or later."
69+
echo "Please point JAVA_HOME variable to location of JDK 17 or later."
7070
echo "You can also download latest JDK at http://java.com/download"
7171

7272
exit 1
@@ -82,10 +82,10 @@ checkJava() {
8282
#
8383
javaMajorVersion "$JAVA"
8484

85-
if [ $version -lt 11 ]; then
85+
if [ $version -lt 17 ]; then
8686
echo "$0, ERROR:"
8787
echo "The $version version of JAVA installed in JAVA_HOME=$JAVA_HOME is incompatible."
88-
echo "Please point JAVA_HOME variable to installation of JDK 11 or later."
88+
echo "Please point JAVA_HOME variable to installation of JDK 17 or later."
8989
echo "You can also download latest JDK at http://java.com/download"
9090
exit 1
9191
fi

‎bin/index-reader.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if "%OS%" == "Windows_NT" setlocal
2727
if defined JAVA_HOME goto checkJdk
2828
echo %0, ERROR:
2929
echo JAVA_HOME environment variable is not found.
30-
echo Please point JAVA_HOME variable to location of JDK 11 or later.
30+
echo Please point JAVA_HOME variable to location of JDK 17 or later.
3131
echo You can also download latest JDK at http://java.com/download.
3232
goto error_finish
3333

@@ -36,7 +36,7 @@ goto error_finish
3636
if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
3737
echo %0, ERROR:
3838
echo JAVA is not found in JAVA_HOME=%JAVA_HOME%.
39-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
39+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
4040
echo You can also download latest JDK at http://java.com/download.
4141
goto error_finish
4242

@@ -54,10 +54,10 @@ set JAVA_VER_STR=%JAVA_VER_STR:"=%
5454
for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
5555
if %MAJOR_JAVA_VER% == 1 set MAJOR_JAVA_VER=%MINOR_JAVA_VER%
5656

57-
if %MAJOR_JAVA_VER% LSS 11 (
57+
if %MAJOR_JAVA_VER% LSS 17 (
5858
echo %0, ERROR:
5959
echo The version of JAVA installed in %JAVA_HOME% is incorrect.
60-
echo Please point JAVA_HOME variable to installation of JDK 11 or later.
60+
echo Please point JAVA_HOME variable to installation of JDK 17 or later.
6161
echo You can also download latest JDK at http://java.com/download.
6262
goto error_finish
6363
)

‎deliveries/docker/apache-ignite-net/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN mkdir -p /usr/share/man/man1
2323
RUN apt update && apt install apt-utils -y --no-install-recommends
2424

2525
## Install JRE
26-
RUN apt update && apt install openjdk-11-jre-headless -y --no-install-recommends
26+
RUN apt update && apt install openjdk-17-jre-headless -y --no-install-recommends
2727

2828
WORKDIR /app
2929

‎deliveries/docker/apache-ignite/arm64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# limitations under the License.
1616
#
1717

18-
# Start from Java 11 based on Ubuntu Focal Linux image (there is no Alpine Linux image with Java 11 on ARM64)
19-
ARG JDK_VERSION=11
18+
# Start from Java 17 based on Ubuntu Focal Linux image (there is no Alpine Linux image with Java 17 on ARM64)
19+
ARG JDK_VERSION=17
2020
FROM eclipse-temurin:${JDK_VERSION}-jre-focal
2121

2222
# Settings

‎deliveries/docker/apache-ignite/s390x/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ FROM s390x/ubuntu:20.04
2323
ARG IGNITE_VER
2424

2525
# Set Environment Variables
26-
ENV JAVA_HOME="/opt/jdk-11.0.14.1+1"
26+
ENV JAVA_HOME="/opt/jdk-17.0.9.9"
2727
ENV IGNITE_HOME="/opt/apache-ignite-${IGNITE_VER}-bin"
2828
ENV PATH="${JAVA_HOME}/bin:/opt/apache-ignite-${IGNITE_VER}-bin/bin:${PATH}"
29-
ENV JDK_FILE="ibm-semeru-open-jdk_s390x_linux_11.0.14.1_1_openj9-0.30.1.tar.gz"
29+
ENV JDK_FILE="ibm-semeru-open-jdk_s390x_linux_17.0.9_9_openj9-0.41.0.tar.gz"
3030

3131
# The Author
3232
LABEL maintainer="LoZ Open Source Ecosystem (https://www.ibm.com/community/z/usergroups/opensource)"
@@ -44,8 +44,8 @@ RUN apt-get update && \
4444
apt-get -y clean autoremove && \
4545
rm -rf /var/lib/apt/lists/*
4646

47-
# Download JDK 11
48-
RUN wget https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.14.1%2B1_openj9-0.30.1/${JDK_FILE} && \
47+
# Download JDK 17
48+
RUN wget https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.9%2B9_openj9-0.41.0/${JDK_FILE} && \
4949
tar xvf ${JDK_FILE} && \
5050
rm -rf ${JDK_FILE}
5151

‎deliveries/docker/apache-ignite/x86_64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
# limitations under the License.
1616
#
1717

18-
# Start from Java 11 based on Alpine Linux image
19-
ARG JDK_VERSION=11
18+
# Start from Java 17 based on Alpine Linux image
19+
ARG JDK_VERSION=17
2020
FROM eclipse-temurin:${JDK_VERSION}-jre-alpine
2121

2222
# Settings

‎docs/_docs/includes/cpp-linux-build-prerequisites.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ Installation instructions for several popular distributions are listed below:
2626
tab:Ubuntu 18.04/20.04[]
2727
[source,bash,subs="attributes,specialchars"]
2828
----
29-
sudo apt-get install -y build-essential cmake openjdk-11-jdk unixodbc-dev libssl-dev
29+
sudo apt-get install -y build-essential cmake openjdk-17-jdk unixodbc-dev libssl-dev
3030
----
3131

3232
tab:CentOS/RHEL 7[]
3333
[source,shell,subs="attributes,specialchars"]
3434
----
3535
sudo yum install -y epel-release
36-
sudo yum install -y java-11-openjdk-devel cmake3 unixODBC-devel openssl-devel make gcc-c++
36+
sudo yum install -y java-17-openjdk-devel cmake3 unixODBC-devel openssl-devel make gcc-c++
3737
----
3838

3939
tab:CentOS/RHEL 8[]
4040
[source,shell,subs="attributes,specialchars"]
4141
----
42-
sudo yum install -y java-11-openjdk-devel cmake3 unixODBC-devel openssl-devel make gcc-c++
42+
sudo yum install -y java-17-openjdk-devel cmake3 unixODBC-devel openssl-devel make gcc-c++
4343
----
4444

4545
--

‎docs/_docs/includes/cpp-prerequisites.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// limitations under the License.
1515
[width="100%",cols="1,3"]
1616
|===
17-
|JDK|Oracle JDK 11 or 17, Open JDK 11 or 17, IBM JDK 11 or 17
17+
|JDK|Oracle JDK 17, Open JDK 17, IBM JDK 17
1818
|OS|Windows Vista, Windows Server 2008 and later versions, Ubuntu (18.04 64 bit)
1919
|Network|No restrictions (10G recommended)
2020
|Hardware|No restrictions

0 commit comments

Comments
 (0)