Move test under Java 11

Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Nov 4, 2024 · c8a4344 · c8a4344
1 parent 4b6bd3a
commit c8a4344
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -239,9 +239,6 @@ dependencies {
     testImplementation("junit", "junit" , "4.13.2") {
         exclude(group = "org.hamcrest")
     }
-
-    // Apache 2.0
-    testImplementation("org.wiremock", "wiremock", "3.9.2")
 }
 
 licenseReport {
@@ -354,40 +351,43 @@ publishing {
 }
 
 if (runtimeJavaVersion >= 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")
+    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())
+    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")
+        }
+
+        // Apache 2.0
+        testImplementation("org.wiremock", "wiremock", "3.9.2")
+    }
+
+    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.named<Test>("integrationTest") {
+        testClassesDirs += java11.output.classesDirs
+        classpath = sourceSets["java11"].runtimeClasspath
+    }
 
-  dependencies {
-    testImplementation("org.opensearch.test", "framework", opensearchVersion) {
-      exclude(group = "org.hamcrest")
+    tasks.named<Test>("unitTest") {
+        testClassesDirs += java11.output.classesDirs
+        classpath = sourceSets["java11"].runtimeClasspath
     }
-  }
-
-  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.named<Test>("integrationTest") {
-    testClassesDirs += java11.output.classesDirs
-    classpath = sourceSets["java11"].runtimeClasspath
-  }
-
-  tasks.named<Test>("unitTest") {
-    testClassesDirs += java11.output.classesDirs
-    classpath = sourceSets["java11"].runtimeClasspath
-  }
 }
diff --git a/.../transport/aws/AwsSdk2TransportTests.java → .../transport/aws/AwsSdk2TransportTests.java b/.../transport/aws/AwsSdk2TransportTests.java → .../transport/aws/AwsSdk2TransportTests.java