Skip to content

Commit 943c32b

Browse files
authored
Revert Disable detekt and force choose snakeyml 1.32 (#528)
* Revert Disable detekt: 50ac1e9 Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com> * Remove force choosing snakeyml 1.31 Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com> * Force snakeyaml 1.32 Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com> * Empty commit Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com> Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
1 parent fadc553 commit 943c32b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ buildscript {
5959
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
6060
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
6161
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
62-
// TODO because snakeyaml CVE issue is on the latest version, have to disable detekt for now
63-
// classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
62+
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
6463
classpath "org.jacoco:org.jacoco.agent:0.8.7"
6564
}
6665
}
@@ -76,7 +75,7 @@ apply plugin: 'idea'
7675
apply plugin: 'opensearch.opensearchplugin'
7776
apply plugin: 'opensearch.testclusters'
7877
apply plugin: 'opensearch.rest-test'
79-
//apply plugin: 'io.gitlab.arturbosch.detekt'
78+
apply plugin: 'io.gitlab.arturbosch.detekt'
8079
apply plugin: 'org.jetbrains.kotlin.jvm'
8180
apply plugin: 'org.jetbrains.kotlin.plugin.allopen'
8281
apply plugin: 'opensearch.pluginzip'
@@ -96,7 +95,7 @@ configurations.all {
9695
force 'org.apache.httpcomponents.client5:httpclient5:5.0.3'
9796
force 'org.apache.httpcomponents.client5:httpclient5-osgi:5.0.3'
9897
force 'com.fasterxml.jackson.core:jackson-databind:2.10.4'
99-
force 'org.yaml:snakeyaml:1.31'
98+
force 'org.yaml:snakeyaml:1.32'
10099
force 'org.codehaus.plexus:plexus-utils:3.0.24'
101100
}
102101
}
@@ -148,10 +147,10 @@ task ktlintFormat(type: JavaExec, group: "formatting") {
148147
args "-F", "src/**/*.kt", "spi/src/main/**/*.kt"
149148
}
150149

151-
//detekt {
152-
// config = files("detekt.yml")
153-
// buildUponDefaultConfig = true
154-
//}
150+
detekt {
151+
config = files("detekt.yml")
152+
buildUponDefaultConfig = true
153+
}
155154

156155
configurations.testImplementation {
157156
exclude module: "securemock"

0 commit comments

Comments
 (0)