From 7e2902c7d3dfc4768b21c9be0f34aecdcc587e31 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 21:05:45 +0530 Subject: [PATCH] Fix build failures (#1315) (#1316) * Fix build failures Signed-off-by: monusingh-1 * Enable xml report Signed-off-by: monusingh-1 --------- Signed-off-by: monusingh-1 (cherry picked from commit 043a7882a369399b07fead3b1d146aefc359d03a) Co-authored-by: Monu Singh --- build.gradle | 9 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 5b671ff1..5c701433 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ buildscript { } plugins { - id 'nebula.ospackage' version "8.3.0" + id 'com.netflix.nebula.ospackage' version "11.6.0" id "com.dorongold.task-tree" version "1.5" id "jacoco" } @@ -162,15 +162,14 @@ repositories { compileKotlin { kotlinOptions { - // This should be 11, but the OpenSearch logger usage checker tool doesn't like classes > 1.8 - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs = ['-Xjsr305=strict'] // Handle OpenSearch @Nullable annotation correctly } } compileTestKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs = ['-Xjsr305=strict'] } } @@ -536,7 +535,7 @@ jacocoTestReport { dependsOn test dependsOn integTest reports { - xml.enabled true + xml.required.set(true) } // We're combining the coverage data for both test and integ tests. getExecutionData().setFrom(fileTree(buildDir).include("/jacoco/*.exec")) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 68efe1de..8d687878 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -11,6 +11,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists