From 0a8d79b589e1b43aad6e38cb785f14397ba9f6b3 Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 3 Jan 2024 16:24:11 -0500 Subject: [PATCH] Revert support for JDK8. Signed-off-by: dblock --- CHANGELOG.md | 1 - COMPATIBILITY.md | 2 +- java-client/build.gradle.kts | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a8be39b1c..a48ae8b2bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.2.1 to 5.3 ### Changed -- Restore support for Java 8 ([#767](https://github.com/opensearch-project/opensearch-java/pull/767)) ### Deprecated diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index bdab6cc899..f439c8060e 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -19,7 +19,7 @@ The below matrix shows the compatibility of the [`opensearch-java-client`](https | Client Version | JDK | |----------------|--------------------| | 1.0.0 | 8 | -| 2.x.0 | 8 / 11 / 17 / 21 | +| 2.x.0 | 11 / 17 / 21 | ## Upgrading diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index a4a67c789b..63c6bef0ad 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -61,8 +61,8 @@ configurations { } java { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 withJavadocJar() withSourcesJar() @@ -146,7 +146,8 @@ val integrationTest = task("integrationTest") { System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1")) } -val opensearchVersion = "2.12.0-SNAPSHOT" +// TODO: Revert https://github.com/opensearch-project/opensearch-java/pull/799 when OpenSearch 2.12 ships. +val opensearchVersion = "2.7.0" dependencies {