Revert "[Backport] [2.x] Restore support for Java 8 (#767) (#777)"

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
 

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
 

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,20 +146,15 @@ val integrationTest = task<Test>("integrationTest") {
  System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1"))
 }
 
-val opensearchVersion = "2.12.0-SNAPSHOT"
-
 dependencies {
 
+ val opensearchVersion = "2.7.0"
  val jacksonVersion = "2.15.2"
  val jacksonDatabindVersion = "2.15.2"
 
  // Apache 2.0
  implementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
  testImplementation("org.opensearch.test", "framework", opensearchVersion)
- testImplementation("org.hamcrest:hamcrest:2.2")
- testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1") {
- exclude(group = "junit")
- }
 
  // Apache 2.0
  // https://search.maven.org/artifact/com.google.code.findbugs/jsr305
@@ -332,38 +327,3 @@ publishing {
  }
  }
 }
-
-if (JavaVersion.current() >= JavaVersion.VERSION_11) {
- val java11: SourceSet = sourceSets.create("java11") {
- java {
- compileClasspath += sourceSets.main.get().output + sourceSets.test.get().output
- runtimeClasspath += sourceSets.main.get().output + sourceSets.test.get().output
- srcDir("src/test/java11")
- }
- }
-
- configurations[java11.implementationConfigurationName].extendsFrom(configurations.testImplementation.get())
- configurations[java11.runtimeOnlyConfigurationName].extendsFrom(configurations.testRuntimeOnly.get())
-
- dependencies {
- testImplementation("org.opensearch.test", "framework", opensearchVersion) {
- exclude(group = "org.hamcrest")
- }
- }
-
- tasks.named<JavaCompile>("compileJava11Java") {
- targetCompatibility = JavaVersion.VERSION_11.toString()
- sourceCompatibility = JavaVersion.VERSION_11.toString()
- }
-
- tasks.named<JavaCompile>("compileTestJava") {
- targetCompatibility = JavaVersion.VERSION_11.toString()
- sourceCompatibility = JavaVersion.VERSION_11.toString()
- }
-
- tasks.test {
- testClassesDirs += java11.output.classesDirs
- classpath = sourceSets["java11"].runtimeClasspath
- }
-
-}