Set distribution checker target JDK compatibility to 11.

dblock · dblock · commit 31b7fae05188 · 2022-03-08T18:28:09.000Z
Signed-off-by: dblock &lt;dblock@dblock.org&gt;
diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -61,15 +61,20 @@ Fork [opensearch-project/OpenSearch](https://github.com/opensearch-project/OpenS
 
 #### JDK 11
 
-OpenSearch builds using Java 11 at a minimum, using the Adoptium distribution. 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`. This is configured in [buildSrc/build.gradle](buildSrc/build.gradle).
+OpenSearch builds using Java 11 at a minimum, using the Adoptium distribution. 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`. This is configured in [buildSrc/build.gradle](buildSrc/build.gradle) and [distribution/tools/java-version-checker/build.gradle](distribution/tools/java-version-checker/build.gradle).
 
 ```
 allprojects {
-  targetCompatibility = 11
-  sourceCompatibility = 11
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
 }
 ```
 
+```
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+```
+
 Download Java 11 from [here](https://adoptium.net/releases.html?variant=openjdk11).
 
 #### JDK 14
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -158,8 +158,8 @@ if (project != rootProject) {
   apply plugin: 'opensearch.publish'
 
   allprojects {
-    targetCompatibility = 11
-    sourceCompatibility = 11
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
   }
 
   // groovydoc succeeds, but has some weird internal exception...
diff --git a/buildSrc/src/main/resources/minimumRuntimeVersion b/buildSrc/src/main/resources/minimumRuntimeVersion
@@ -1 +1 @@
-1.8
+11
diff --git a/client/rest/build.gradle b/client/rest/build.gradle
@@ -33,8 +33,8 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 apply plugin: 'opensearch.build'
 apply plugin: 'opensearch.publish'
 
-targetCompatibility = JavaVersion.VERSION_1_8
-sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_11
 
 group = 'org.opensearch.client'
 archivesBaseName = 'opensearch-rest-client'
diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle
@@ -30,8 +30,8 @@
 apply plugin: 'opensearch.build'
 apply plugin: 'opensearch.publish'
 
-targetCompatibility = JavaVersion.VERSION_1_8
-sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_11
 
 group = 'org.opensearch.client'
 archivesBaseName = 'opensearch-rest-client-sniffer'
diff --git a/client/test/build.gradle b/client/test/build.gradle
@@ -29,8 +29,8 @@
  */
 apply plugin: 'opensearch.build'
 
-targetCompatibility = JavaVersion.VERSION_1_8
-sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_11
 
 group = "${group}.client.test"
 
diff --git a/distribution/tools/java-version-checker/build.gradle b/distribution/tools/java-version-checker/build.gradle
@@ -11,8 +11,9 @@
 
 apply plugin: 'opensearch.build'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+
 // targetting very old java versions enables a warning by default on newer JDK: disable it.
 compileJava.options.compilerArgs += '-Xlint:-options'
 
diff --git a/libs/core/build.gradle b/libs/core/build.gradle
@@ -54,13 +54,13 @@ if (!isEclipse) {
   }
 
   compileJava11Java {
-    sourceCompatibility = 11
-    targetCompatibility = 11
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
   forbiddenApisJava11 {
     if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
-      targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
+      targetCompatibility = JavaVersion.VERSION_11
     }
     replaceSignatureFiles 'jdk-signatures'
   }
diff --git a/server/build.gradle b/server/build.gradle
@@ -64,14 +64,14 @@ if (!isEclipse) {
   }
 
   compileJava11Java {
-    sourceCompatibility = 11
-    targetCompatibility = 11
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
   tasks.named('forbiddenApisJava11').configure {
     doFirst {
       if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
-        targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
+        targetCompatibility = JavaVersion.VERSION_11
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ if (project != rootProject) {`
`158`	`158`	`apply plugin: 'opensearch.publish'`
`159`	`159`
`160`	`160`	`allprojects {`
`161`		`- targetCompatibility = 11`
`162`		`- sourceCompatibility = 11`
	`161`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`162`	`+ sourceCompatibility = JavaVersion.VERSION_11`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`// groovydoc succeeds, but has some weird internal exception...`
Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ if (!isEclipse) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`compileJava11Java {`
`57`		`- sourceCompatibility = 11`
`58`		`- targetCompatibility = 11`
	`57`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`58`	`+ targetCompatibility = JavaVersion.VERSION_11`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`forbiddenApisJava11 {`
`62`	`62`	`if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {`
`63`		`- targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()`
	`63`	`+ targetCompatibility = JavaVersion.VERSION_11`
`64`	`64`	`}`
`65`	`65`	`replaceSignatureFiles 'jdk-signatures'`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,14 @@ if (!isEclipse) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`compileJava11Java {`
`67`		`- sourceCompatibility = 11`
`68`		`- targetCompatibility = 11`
	`67`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`68`	`+ targetCompatibility = JavaVersion.VERSION_11`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`tasks.named('forbiddenApisJava11').configure {`
`72`	`72`	`doFirst {`
`73`	`73`	`if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {`
`74`		`- targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()`
	`74`	`+ targetCompatibility = JavaVersion.VERSION_11`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`