fix gradle run (#717)

Signed-off-by: Hailong Cui <[email protected]>
opensearch-project · Jul 21, 2023 · 8efd279 · 8efd279
1 parent 6e1e2e5
commit 8efd279
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/notifications/build-tools/merged-coverage.gradle b/notifications/build-tools/merged-coverage.gradle
@@ -15,6 +15,9 @@ allprojects {
 
 task jacocoReport(type: JacocoReport, group: 'verification') {
     description = 'Generates an aggregate report from all subprojects'
+    onlyIf {
+        gradle.taskGraph.hasTask("jacocoTestReport")
+    }
     gradle.projectsEvaluated {
         subprojects.each {
             jacocoReport.dependsOn it.tasks.withType(JacocoReport)

diff --git a/notifications/build.gradle b/notifications/build.gradle
@@ -40,7 +40,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
 // TODO: enable detekt only when snakeyaml vulnerability is fixed
 //        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.17.1"
-        classpath "org.jacoco:org.jacoco.agent:0.8.5"
+        classpath "org.jacoco:org.jacoco.agent:0.8.7"
     }
 }
 
@@ -83,7 +83,7 @@ dependencies {
 
 task ktlint(type: JavaExec, group: "verification") {
     description = "Check Kotlin code style."
-    main = "com.pinterest.ktlint.Main"
+    mainClass = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
     args "notifications/**/*.kt", "core/**/*.kt", "core-spi/**/*.kt"
     // to generate report in checkstyle format prepend following args:
@@ -93,7 +93,7 @@ task ktlint(type: JavaExec, group: "verification") {
 
 task ktlintFormat(type: JavaExec, group: "formatting") {
     description = "Fix Kotlin code style deviations."
-    main = "com.pinterest.ktlint.Main"
+    mainClass = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
     args "-F", "notifications/**/*.kt", "core/**/*.kt", "core-spi/**/*.kt"
     // https://github.com/pinterest/ktlint/issues/1391

diff --git a/notifications/core-spi/build.gradle b/notifications/core-spi/build.gradle
@@ -20,8 +20,6 @@ repositories {
 }
 
 apply plugin: 'opensearch.java'
-apply plugin: 'opensearch.testclusters'
-apply plugin: 'opensearch.java-rest-test'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'org.jetbrains.kotlin.plugin.allopen'
 

diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle
@@ -74,14 +74,6 @@ publishing {
     }
 }
 
-task integTest(type: RestIntegTestTask) {
-    description = "Run tests against a cluster that has security enabled"
-    testClassesDirs = sourceSets.test.output.classesDirs
-    classpath = sourceSets.test.runtimeClasspath
-    systemProperty 'tests.security.manager', 'false'
-}
-
-tasks.named("check").configure { dependsOn(integTest) }
 check.dependsOn jacocoTestReport
 
 // turn off javadoc as it barfs on Kotlin code
@@ -107,6 +99,11 @@ test {
     systemProperty 'tests.security.manager', 'false'
 }
 
+// disable for core, we don't need to run test cluster
+run {
+    onlyIf { false }
+}
+
 //TODO: see if this can be only set at top level and apply to subprojects, or we remove from top project if possible
 configurations.all {
     if (it.state != Configuration.State.UNRESOLVED) return