Set ml-commons plugin 3.0.0 baseline JDK version to JDK-21 (opensearch-project#2583)

reta · web-flow · commit 20255e341b53 · 2024-07-08T16:44:19.000-07:00
Signed-off-by: Andriy Redko &lt;andriy.redko@aiven.io&gt;
diff --git a/.github/workflows/CI-workflow.yml b/.github/workflows/CI-workflow.yml
@@ -101,6 +101,11 @@ jobs:
           role-to-assume: ${{ secrets.ML_ROLE }}
           aws-region: us-west-2
 
+      - name: Setup Java ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
       - name: Checkout MLCommons
         uses: actions/checkout@v3
         with:
diff --git a/build.gradle b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        asm_version = "9.7"
 
         // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -43,6 +44,16 @@ buildscript {
             }
         }
     }
+
+    configurations {
+        classpath {
+            resolutionStrategy {
+                //in order to handle jackson's higher release version in shadow, this needs to be upgraded to latest
+                force(group: "org.ow2.asm", name: "asm", version: asm_version)
+                force(group: "org.ow2.asm", name: "asm-commons", version: asm_version)
+            }
+        }
+    }
 }
 
 plugins {
@@ -61,8 +72,10 @@ allprojects {
     apply from: "$rootDir/build-tools/repositories.gradle"
 
     plugins.withId('java') {
-        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21;
+        targetCompatibility = JavaVersion.VERSION_21;
     }
+
     plugins.withId('jacoco') {
         jacoco.toolVersion = '0.8.10'
     }
diff --git a/client/build.gradle b/client/build.gradle
@@ -7,9 +7,9 @@ plugins {
     id 'java'
     id "io.freefair.lombok"
     id 'jacoco'
-    id 'com.github.johnrengelman.shadow'
+    id 'io.github.goooler.shadow' version "8.1.7"
     id 'maven-publish'
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.25.0'
     id 'signing'
 }
 
diff --git a/common/build.gradle b/common/build.gradle
@@ -6,7 +6,7 @@
 //TODO: cleanup gradle config file, some overlap
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow'
+    id 'io.github.goooler.shadow' version "8.1.7"
     id 'jacoco'
     id "io.freefair.lombok"
     id 'maven-publish'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/memory/build.gradle b/memory/build.gradle
@@ -20,7 +20,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 dependencies {
diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 repositories {
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -13,7 +13,7 @@ plugins {
     id "io.freefair.lombok"
     id 'jacoco'
     id 'java-library'
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 ext {
@@ -30,6 +30,11 @@ ext {
     noticeFile = rootProject.file('NOTICE')
 }
 
+java {
+    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_21
+}
+
 lombok {
     version = "1.18.30"
 }
diff --git a/search-processors/build.gradle b/search-processors/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'java'
     id 'jacoco'
     id "io.freefair.lombok"
-    id 'com.diffplug.spotless' version '6.23.0'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 repositories {
diff --git a/spi/build.gradle b/spi/build.gradle
@@ -7,7 +7,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin
 import org.opensearch.gradle.test.RestIntegTestTask
 
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'io.github.goooler.shadow' version "8.1.7"
     id 'jacoco'
     id 'maven-publish'
     id 'signing'

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ buildscript {`
`11`	`11`	`isSnapshot = "true" == System.getProperty("build.snapshot", "true")`
`12`	`12`	`opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")`
`13`	`13`	`buildVersionQualifier = System.getProperty("build.version_qualifier", "")`
	`14`	`+ asm_version = "9.7"`
`14`	`15`
`15`	`16`	`// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT`
`16`	`17`	`version_tokens = opensearch_version.tokenize('-')`
`@@ -43,6 +44,16 @@ buildscript {`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`}`
	`47`	`+`
	`48`	`+ configurations {`
	`49`	`+ classpath {`
	`50`	`+ resolutionStrategy {`
	`51`	`+ //in order to handle jackson's higher release version in shadow, this needs to be upgraded to latest`
	`52`	`+ force(group: "org.ow2.asm", name: "asm", version: asm_version)`
	`53`	`+ force(group: "org.ow2.asm", name: "asm-commons", version: asm_version)`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+ }`
`46`	`57`	`}`
`47`	`58`
`48`	`59`	`plugins {`
`@@ -61,8 +72,10 @@ allprojects {`
`61`	`72`	`apply from: "$rootDir/build-tools/repositories.gradle"`
`62`	`73`
`63`	`74`	`plugins.withId('java') {`
`64`		`- sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11`
	`75`	`+ sourceCompatibility = JavaVersion.VERSION_21;`
	`76`	`+ targetCompatibility = JavaVersion.VERSION_21;`
`65`	`77`	`}`
	`78`	`+`
`66`	`79`	`plugins.withId('jacoco') {`
`67`	`80`	`jacoco.toolVersion = '0.8.10'`
`68`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ plugins {`
`20`	`20`	`id 'java'`
`21`	`21`	`id 'jacoco'`
`22`	`22`	`id "io.freefair.lombok"`
`23`		`- id 'com.diffplug.spotless' version '6.23.0'`
	`23`	`+ id 'com.diffplug.spotless' version '6.25.0'`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`id 'java'`
`10`	`10`	`id 'jacoco'`
`11`	`11`	`id "io.freefair.lombok"`
`12`		`- id 'com.diffplug.spotless' version '6.23.0'`
	`12`	`+ id 'com.diffplug.spotless' version '6.25.0'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ plugins {`
`13`	`13`	`id "io.freefair.lombok"`
`14`	`14`	`id 'jacoco'`
`15`	`15`	`id 'java-library'`
`16`		`- id 'com.diffplug.spotless' version '6.23.0'`
	`16`	`+ id 'com.diffplug.spotless' version '6.25.0'`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`ext {`
`@@ -30,6 +30,11 @@ ext {`
`30`	`30`	`noticeFile = rootProject.file('NOTICE')`
`31`	`31`	`}`
`32`	`32`
	`33`	`+java {`
	`34`	`+ targetCompatibility = JavaVersion.VERSION_21`
	`35`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`36`	`+}`
	`37`	`+`
`33`	`38`	`lombok {`
`34`	`39`	`version = "1.18.30"`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ plugins {`
`19`	`19`	`id 'java'`
`20`	`20`	`id 'jacoco'`
`21`	`21`	`id "io.freefair.lombok"`
`22`		`- id 'com.diffplug.spotless' version '6.23.0'`
	`22`	`+ id 'com.diffplug.spotless' version '6.25.0'`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`repositories {`