From b7f4a6d0a1d34ea4b8cff1bc1f4c42bdbcf7d4e0 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Wed, 26 Oct 2022 17:12:58 -0700 Subject: [PATCH 1/3] disable detekt to avoid using snakeyaml <= 1.31 Signed-off-by: Rupal Mahajan --- reports-scheduler/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index f2af2968..d1264f0a 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -40,7 +40,7 @@ buildscript { classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}" - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0" + // classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0" classpath "org.jacoco:org.jacoco.agent:0.8.5" } } @@ -57,7 +57,7 @@ apply plugin: 'idea' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.pluginzip' apply plugin: 'opensearch.testclusters' -apply plugin: 'io.gitlab.arturbosch.detekt' +// apply plugin: 'io.gitlab.arturbosch.detekt' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.jetbrains.kotlin.plugin.allopen' @@ -107,10 +107,10 @@ configurations { testRuntime } -detekt { +/*detekt { config = files("detekt.yml") buildUponDefaultConfig = true -} +}*/ configurations.testCompile { exclude module: "securemock" From 151c75cadf747fc34277e73548ba63b4b8b6edc0 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Wed, 26 Oct 2022 17:20:20 -0700 Subject: [PATCH 2/3] add comment Signed-off-by: Rupal Mahajan --- reports-scheduler/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index d1264f0a..cd3e478f 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -107,6 +107,7 @@ configurations { testRuntime } +// TODO: enable detekt when snakeyaml vulnerability is fixed /*detekt { config = files("detekt.yml") buildUponDefaultConfig = true From b618f5d1dc57a6b16297a535edd3401f47464b77 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Thu, 27 Oct 2022 12:02:52 -0700 Subject: [PATCH 3/3] remove comments, track enable Detekt with https://github.com/opensearch-project/dashboards-reports/issues/520 Signed-off-by: Rupal Mahajan --- reports-scheduler/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index cd3e478f..8eca8b39 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -40,7 +40,6 @@ buildscript { classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}" - // classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0" classpath "org.jacoco:org.jacoco.agent:0.8.5" } } @@ -57,7 +56,6 @@ apply plugin: 'idea' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.pluginzip' apply plugin: 'opensearch.testclusters' -// apply plugin: 'io.gitlab.arturbosch.detekt' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.jetbrains.kotlin.plugin.allopen' @@ -107,12 +105,6 @@ configurations { testRuntime } -// TODO: enable detekt when snakeyaml vulnerability is fixed -/*detekt { - config = files("detekt.yml") - buildUponDefaultConfig = true -}*/ - configurations.testCompile { exclude module: "securemock" }