Skip to content

Commit 2256957

Browse files
authored
Set common-utils 3.0.0 baseline JDK version to JDK-21 (#744)
1 parent d7fd7b6 commit 2256957

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
strategy:
2121
matrix:
2222
java:
23-
- 11
24-
- 17
2523
- 21
2624
name: Build and Test
2725
runs-on: ubuntu-latest
@@ -56,8 +54,6 @@ jobs:
5654
strategy:
5755
matrix:
5856
java:
59-
- 11
60-
- 17
6157
- 21
6258
name: Build and Test
6359
runs-on: windows-latest

DEVELOPER_GUIDE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- [Developer Guide](#developer-guide)
22
- [Forking and Cloning](#forking-and-cloning)
33
- [Install Prerequisites](#install-prerequisites)
4-
- [JDK 11](#jdk-11)
4+
- [JDK 21](#jdk-21)
55
- [Building](#building)
66
- [Using IntelliJ IDEA](#using-intellij-idea)
77
- [Submitting Changes](#submitting-changes)
@@ -16,9 +16,9 @@ Fork this repository on GitHub, and clone locally with `git clone`.
1616

1717
### Install Prerequisites
1818

19-
#### JDK 11
19+
#### JDK 21
2020

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`.
21+
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`.
2222

2323
### Building
2424

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
1010
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1111
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
12-
kotlin_version = System.getProperty("kotlin.version", "1.8.21")
12+
kotlin_version = System.getProperty("kotlin.version", "1.9.25")
1313
}
1414

1515
repositories {
@@ -30,7 +30,7 @@ buildscript {
3030
plugins {
3131
id 'java-library'
3232
id 'maven-publish'
33-
id 'com.diffplug.spotless' version '6.22.0'
33+
id 'com.diffplug.spotless' version '6.25.0'
3434
}
3535

3636
repositories {
@@ -51,8 +51,8 @@ allprojects {
5151
}
5252
}
5353

54-
targetCompatibility = JavaVersion.VERSION_11
55-
sourceCompatibility = JavaVersion.VERSION_11
54+
targetCompatibility = JavaVersion.VERSION_21
55+
sourceCompatibility = JavaVersion.VERSION_21
5656

5757
apply plugin: 'java'
5858
apply plugin: 'jacoco'
@@ -143,13 +143,13 @@ tasks.register('ktlintFormat', JavaExec) {
143143
compileKotlin {
144144
kotlinOptions {
145145
freeCompilerArgs = ['-Xjsr305=strict']
146-
jvmTarget = "11"
146+
jvmTarget = "21"
147147
}
148148
}
149149

150150
compileTestKotlin {
151151
kotlinOptions {
152-
jvmTarget = "11"
152+
jvmTarget = "21"
153153
}
154154
}
155155

0 commit comments

Comments
 (0)