From 99208382367425d63b6777e804e1403a9ff7f5a0 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Thu, 2 Jan 2025 11:53:07 -0500 Subject: [PATCH 1/2] Set alerting plugin 3.0.0 baseline JDK version to JDK-21 (#1695) Signed-off-by: Andriy Redko --- .github/workflows/bwc-test-workflow.yml | 2 +- DEVELOPER_GUIDE.md | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index e6230bce3..7ec1f42cd 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -19,7 +19,7 @@ jobs: needs: Get-CI-Image-Tag strategy: matrix: - java: [ 11 ] + java: [ 21 ] # Job name name: Build and test Alerting # This job runs on Linux diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index 38bb99af3..1bbf9e245 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -1,8 +1,7 @@ - [Developer Guide](#developer-guide) - [Forking and Cloning](#forking-and-cloning) - [Install Prerequisites](#install-prerequisites) - - [JDK 11](#jdk-11) - - [JDK 14](#jdk-14) + - [JDK 21](#jdk-21) - [Setup](#setup) - [Build](#build) - [Building from the command line](#building-from-the-command-line) @@ -19,32 +18,28 @@ Fork this repository on GitHub, and clone locally with `git clone`. ### Install Prerequisites -#### JDK 11 +#### JDK 21 -OpenSearch builds using Java 11 at a minimum, using the Adoptium distribution. This means you must have a JDK 11 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 11 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-11`. This is configured in [buildSrc/build.gradle](buildSrc/build.gradle) and [distribution/tools/java-version-checker/build.gradle](distribution/tools/java-version-checker/build.gradle). +OpenSearch builds using Java 21 at a minimum, using the Adoptium distribution. This means you must have a JDK 21 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 21 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-11`. This is configured in [buildSrc/build.gradle](buildSrc/build.gradle) and [distribution/tools/java-version-checker/build.gradle](distribution/tools/java-version-checker/build.gradle). ``` allprojects { - targetCompatibility = JavaVersion.VERSION_11 - sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_21 } ``` ``` -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 ``` -Download Java 11 from [here](https://adoptium.net/releases.html?variant=openjdk11). - -#### JDK 14 - -To run the full suite of tests, download and install [JDK 14](https://jdk.java.net/archive/) and set `JAVA11_HOME`, and `JAVA14_HOME`. They are required by the [backwards compatibility test](./TESTING.md#testing-backwards-compatibility). +Download Java 21 from [here](https://adoptium.net/releases.html?variant=openjdk21). ### Setup 1. Clone the repository (see [Forking and Cloning](#forking-and-cloning)) -2. Make sure `JAVA_HOME` is pointing to a Java 11 JDK (see [Install Prerequisites](#install-prerequisites)) +2. Make sure `JAVA_HOME` is pointing to a Java 21 JDK (see [Install Prerequisites](#install-prerequisites)) 3. Launch Intellij IDEA, Choose Import Project and select the settings.gradle file in the root of this package. ### Build From 2e1cc91eeeb4e41b03070f728c89d6f081a11971 Mon Sep 17 00:00:00 2001 From: AWSHurneyt Date: Mon, 6 Jan 2025 14:55:30 -0800 Subject: [PATCH 2/2] Fixed typo. (#1753) Signed-off-by: AWSHurneyt --- .github/workflows/multi-node-test-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 85b9fb168..14e1ec3df 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -28,7 +28,7 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - ooptions: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: - name: Run start commands