@@ -9,7 +9,7 @@ apply plugin: 'opensearch.pluginzip'
99apply plugin : ' opensearch.yaml-rest-test'
1010apply plugin : ' maven-publish'
1111apply plugin : ' jacoco'
12- apply plugin : ' com.form.diff-coverage '
12+
1313
1414ext. opensearch_tmp_dir = rootProject. file(' build/private/opensearch_tmp' ). absoluteFile
1515opensearch_tmp_dir. mkdirs()
@@ -62,8 +62,7 @@ buildscript {
6262
6363 dependencies {
6464 classpath " org.opensearch.gradle:build-tools:${ opensearch_version} "
65- classpath " com.github.form-com.diff-coverage-gradle:diff-coverage:0.9.5"
66- }
65+ }
6766}
6867
6968repositories {
@@ -93,6 +92,7 @@ dependencies {
9392 configurations. all {
9493 resolutionStrategy {
9594 force(" com.google.errorprone:error_prone_annotations:2.41.0" ) // Fix version conflict
95+ force(" io.projectreactor:reactor-core:3.8.0" ) // Fix reactor-core version conflict
9696 }
9797 }
9898}
@@ -116,8 +116,10 @@ allprojects {
116116 }
117117
118118 plugins. withId(' java' ) {
119- targetCompatibility = JavaVersion . VERSION_21
120- sourceCompatibility = JavaVersion . VERSION_21
119+ java {
120+ targetCompatibility = JavaVersion . VERSION_21
121+ sourceCompatibility = JavaVersion . VERSION_21
122+ }
121123 }
122124}
123125
@@ -139,6 +141,7 @@ publishing {
139141 }
140142 publications {
141143 pluginZip(MavenPublication ) { publication ->
144+ artifact bundlePlugin
142145 pom {
143146 name = " opensearch-ubi"
144147 description = " OpenSearch User Behavior Insights plugin"
@@ -273,37 +276,7 @@ testClusters.integTest {
273276 }
274277}
275278
276- ext. createDiffFile = { ->
277- def file = Files . createTempFile(URLEncoder . encode(project. name, ' UTF-8' ), ' .diff' ). toFile()
278- def diffBase = ' refs/remotes/origin/main'
279- // Only run locally
280- if (! System . getenv(' CI' )) {
281- file. withOutputStream { out ->
282- exec {
283- commandLine ' git' , ' diff' , ' --no-color' , ' --minimal' , diffBase
284- standardOutput = out
285- }
286- }
287- }
288- return file
289- }
290-
291- diffCoverageReport {
292- afterEvaluate {
293- diffSource. file = createDiffFile()
294- }
295279
296- // View report at build/reports/jacoco/diffCoverage/html/index.html
297- reports {
298- html = true
299- }
300-
301- violationRules {
302- minBranches = 0.00
303- minLines = 0.00
304- failOnViolation = true
305- }
306- }
307280
308281run {
309282 useCluster testClusters. integTest
0 commit comments