Skip to content

Commit d95978f

Browse files
authoredFeb 6, 2024
Update dependency com.pinterest:kitlint to 0.47.1 and fix CVE-2023-6378 for common-utils (#585)
Signed-off-by: Joanne Wang <jowg@amazon.com>
1 parent 0c23cc5 commit d95978f

File tree

62 files changed

+323
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+323
-147
lines changed
 

‎build.gradle

+8-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ apply plugin: 'opensearch.repositories'
6666
apply from: 'build-tools/opensearchplugin-coverage.gradle'
6767

6868
configurations {
69-
ktlint
69+
ktlint {
70+
resolutionStrategy {
71+
force "ch.qos.logback:logback-classic:1.3.14"
72+
force "ch.qos.logback:logback-core:1.3.14"
73+
}
74+
}
7075
}
7176

7277
dependencies {
@@ -86,7 +91,7 @@ dependencies {
8691
testImplementation "commons-validator:commons-validator:1.7"
8792
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
8893

89-
ktlint "com.pinterest:ktlint:0.44.0"
94+
ktlint "com.pinterest:ktlint:0.47.1"
9095
}
9196

9297
test {
@@ -226,4 +231,4 @@ task updateVersion {
226231
// Include the required files that needs to be updated with new Version
227232
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
228233
}
229-
}
234+
}

‎src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class AcknowledgeAlertResponse : BaseResponse {
4545

4646
@Throws(IOException::class)
4747
override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
48-
4948
builder.startObject().startArray("success")
5049
acknowledged.forEach { builder.value(it.id) }
5150
builder.endArray().startArray("failed")

0 commit comments

Comments
 (0)