Skip to content

Commit

Permalink
Set common-utils 3.0.0 baseline JDK version to JDK-21 (#744)
Browse files Browse the repository at this point in the history
  • Loading branch information
reta authored Oct 8, 2024
1 parent d7fd7b6 commit 2256957
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
strategy:
matrix:
java:
- 11
- 17
- 21
name: Build and Test
runs-on: ubuntu-latest
Expand Down Expand Up @@ -56,8 +54,6 @@ jobs:
strategy:
matrix:
java:
- 11
- 17
- 21
name: Build and Test
runs-on: windows-latest
Expand Down
6 changes: 3 additions & 3 deletions DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- [Developer Guide](#developer-guide)
- [Forking and Cloning](#forking-and-cloning)
- [Install Prerequisites](#install-prerequisites)
- [JDK 11](#jdk-11)
- [JDK 21](#jdk-21)
- [Building](#building)
- [Using IntelliJ IDEA](#using-intellij-idea)
- [Submitting Changes](#submitting-changes)
Expand All @@ -16,9 +16,9 @@ Fork this repository on GitHub, and clone locally with `git clone`.

### Install Prerequisites

#### JDK 11
#### JDK 21

OpenSearch components build using Java 11 at a minimum. 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`.
OpenSearch components build using Java 21 at a minimum. 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-21`.

### Building

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
kotlin_version = System.getProperty("kotlin.version", "1.8.21")
kotlin_version = System.getProperty("kotlin.version", "1.9.25")
}

repositories {
Expand All @@ -30,7 +30,7 @@ buildscript {
plugins {
id 'java-library'
id 'maven-publish'
id 'com.diffplug.spotless' version '6.22.0'
id 'com.diffplug.spotless' version '6.25.0'
}

repositories {
Expand All @@ -51,8 +51,8 @@ allprojects {
}
}

targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_21

apply plugin: 'java'
apply plugin: 'jacoco'
Expand Down Expand Up @@ -143,13 +143,13 @@ tasks.register('ktlintFormat', JavaExec) {
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = "11"
jvmTarget = "21"
}
}

compileTestKotlin {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "21"
}
}

Expand Down

0 comments on commit 2256957

Please sign in to comment.