Add JDK 17 support (#512)

* Upgrade lombok and JDK 17 Signed-off-by: Chen Dai <daichen@amazon.com> * Upgrade mockito for JDK17 Signed-off-by: Chen Dai <daichen@amazon.com> * Upgrade jacoco for JDK 17 Signed-off-by: Chen Dai <daichen@amazon.com> * Add JDK17 support in sql-jdbc Signed-off-by: Chen Dai <daichen@amazon.com> * Update developer guide doc Signed-off-by: Chen Dai <daichen@amazon.com> * Add JDK 11 in JDBC CI Signed-off-by: Chen Dai <daichen@amazon.com>
opensearch-project · Mar 25, 2022 · ab9c1fb · ab9c1fb
1 parent 217b100
commit ab9c1fb
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 34 deletions.
diff --git a/.github/workflows/sql-jdbc-test-and-build-workflow.yml b/.github/workflows/sql-jdbc-test-and-build-workflow.yml
@@ -4,19 +4,24 @@ on: [push, pull_request]
 
 jobs:
   build:
-
+    strategy:
+      matrix:
+        java:
+          - 11
+          - 14
+          - 17
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: sql-jdbc
 
     steps:
     - uses: actions/checkout@v1
-    
-    - name: Set up JDK 1.14
+
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
-        java-version: 1.14
+        java-version: ${{ matrix.java }}
 
     - name: Build with Gradle
       run: ./gradlew build test shadowJar

diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
@@ -12,6 +12,7 @@ jobs:
         java:
           - 11
           - 14
+          - 17
     runs-on: ubuntu-latest
 
     steps:

diff --git a/DEVELOPER_GUIDE.rst b/DEVELOPER_GUIDE.rst
@@ -17,7 +17,7 @@ Prerequisites
 JDK
 ---
 
-OpenSearch builds using Java 11 at a minimum. 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::
+OpenSearch builds using Java 11 at a minimum and supports JDK 11, 14 and 17. This means you must have a JDK of supported version installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK installation::
 
    $ echo $JAVA_HOME
    /Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id 'nebula.ospackage' version "8.3.0"
     id 'java-library'
     id 'checkstyle'
-    id "io.freefair.lombok" version "5.0.0-rc4"
+    id "io.freefair.lombok" version "6.4.0"
     id 'jacoco'
 }
 
@@ -80,7 +80,7 @@ compileTestJava {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.7"
 }
 jacocoTestReport {
     reports {

diff --git a/core/build.gradle b/core/build.gradle
@@ -50,8 +50,8 @@ dependencies {
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
     testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.19.RELEASE'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
 }
 
 test {
@@ -62,9 +62,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
 jacocoTestReport {
     reports {
         html.enabled true

diff --git a/legacy/build.gradle b/legacy/build.gradle
@@ -102,7 +102,7 @@ dependencies {
     compileOnly group: 'javax.servlet', name: 'servlet-api', version:'2.5'
 
     testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version:'2.2'
-    testImplementation group: 'org.mockito', name: 'mockito-inline', version:'3.5.0'
+    testImplementation group: 'org.mockito', name: 'mockito-inline', version:'3.12.4'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: "org.opensearch.client", name: 'transport', version: "${opensearch_version}"
 

diff --git a/opensearch/build.gradle b/opensearch/build.gradle
@@ -41,8 +41,8 @@ dependencies {
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.5.0'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.5.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
     testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     testImplementation group: 'org.opensearch.test', name: 'framework', version: "${opensearch_version}"
 }
@@ -55,9 +55,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
 jacocoTestReport {
     reports {
         html.enabled true

diff --git a/ppl/build.gradle b/ppl/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
 
 }
 
@@ -68,10 +68,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
-
 jacocoTestReport {
     reports {
         html.enabled true

diff --git a/protocol/build.gradle b/protocol/build.gradle
@@ -39,8 +39,8 @@ dependencies {
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
 }
 
 test {
@@ -51,9 +51,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
 jacocoTestReport {
     reports {
         html.enabled true

diff --git a/sql/build.gradle b/sql/build.gradle
@@ -55,8 +55,8 @@ dependencies {
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
 }
 
 test {
@@ -67,10 +67,6 @@ test {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
-
 jacocoTestReport {
     reports {
         html.enabled true