diff --git a/.github/workflows/CI-workflow.yml b/.github/workflows/CI-workflow.yml index d9fc74c080..4f8b27e272 100644 --- a/.github/workflows/CI-workflow.yml +++ b/.github/workflows/CI-workflow.yml @@ -11,7 +11,7 @@ jobs: Build-ml: strategy: matrix: - java: [11, 17] + java: [11, 17, 20] name: Build and Test MLCommons Plugin runs-on: ubuntu-latest @@ -89,7 +89,7 @@ jobs: Build-ml-windows: strategy: matrix: - java: [11, 17] + java: [11, 17, 20] name: Build and Test MLCommons Plugin on Windows runs-on: windows-latest diff --git a/build.gradle b/build.gradle index 6b1b4c6919..24e5f862f3 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,9 @@ allprojects { plugins.withId('java') { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11 } + plugins.withId('jacoco') { + jacoco.toolVersion = '0.8.10' + } } subprojects { @@ -82,4 +85,3 @@ task updateVersion { ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) } } - diff --git a/client/build.gradle b/client/build.gradle index 959197567e..8d0196075c 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation project(':opensearch-ml-common') compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1' } diff --git a/common/build.gradle b/common/build.gradle index e44eb95e33..6eef6c4616 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -19,6 +19,10 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0' } +lombok { + version = "1.18.28" +} + jacocoTestReport { reports { html.required = true diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle index 4396e1f6ec..8cd291b48e 100644 --- a/ml-algorithms/build.gradle +++ b/ml-algorithms/build.gradle @@ -32,8 +32,7 @@ dependencies { implementation group: 'io.protostuff', name: 'protostuff-api', version: '1.8.0' implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0' testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0' - testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.4.0' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1' implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation platform("ai.djl:bom:0.19.0") implementation group: 'ai.djl.pytorch', name: 'pytorch-model-zoo' @@ -55,6 +54,10 @@ dependencies { } } +lombok { + version = "1.18.28" +} + configurations.all { resolutionStrategy.force 'com.google.protobuf:protobuf-java:3.21.9' } diff --git a/plugin/build.gradle b/plugin/build.gradle index ef9c300e62..8db22b8e0b 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -35,6 +35,10 @@ checkstyle { toolVersion = '8.38' } +lombok { + version = "1.18.28" +} + opensearchplugin { name 'opensearch-ml' description 'machine learning plugin for opensearch'