Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 1.3] Forced ktlint to use logback-core:1.2.13, and logback-classic:1.2.13 to address CVE. #602 #603

Merged
merged 30 commits into from
Feb 29, 2024
Merged

[Backport 1.3] Forced ktlint to use logback-core:1.2.13, and logback-classic:1.2.13 to address CVE. #602 #603

Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
10ac92e
Merge changes in the main branch to the 1.x branch. (#42)
adityaj1107 Jul 26, 2021
800c0d5
[1.x] Bumping common-utils to build with OpenSearch(1.x) 1.1.0 (#52)
saratvemulapalli Aug 10, 2021
694781e
Backport 1.1 changes to 1.x (#72)
skkosuri-amzn Sep 13, 2021
a6987af
Backport main changes to 1.x (#93)
lezzago Nov 6, 2021
1a8a885
Backport main changes to 1.x (#126)
getsaurabh02 Mar 10, 2022
fac9347
Add release notes for version 1.3.0.0 (#134)
getsaurabh02 Mar 11, 2022
9701933
Bump version to 1.3.1 (#145)
gaiksaya Mar 28, 2022
4a1a6d0
Incremented version to 1.3.2 (#148)
opensearch-trigger-bot[bot] Apr 1, 2022
91e387a
Adding signoff option for version workflow PR (#143) (#150)
opensearch-trigger-bot[bot] May 9, 2022
e759eaf
Incremented version to 1.3.3. (#180)
dblock Jun 2, 2022
b34e23c
Incremented version to 1.3.4. (#198)
zelinh Jul 8, 2022
281bb54
Staging for version increment automation (#200) (#208)
opensearch-trigger-bot[bot] Aug 16, 2022
c73cbc7
release 1.3.5 (#219)
prudhvigodithi Aug 16, 2022
b6e99b5
Increment version to 1.3.6-SNAPSHOT (#243)
opensearch-trigger-bot[bot] Sep 26, 2022
9b54a95
Change TrustStoreTest to use File.separator to support Windows path (…
opensearch-trigger-bot[bot] Sep 30, 2022
dfd68f8
disable detekt so that snakeyaml <= 1.31 is not used (#266)
sbcd90 Oct 4, 2022
686e180
add release-notes for 1.3.6 (#267)
sbcd90 Oct 4, 2022
01d719d
[AUTO] Increment version to 1.3.7-SNAPSHOT (#276)
opensearch-trigger-bot[bot] Nov 28, 2022
1770dab
Adding CI workflow for Windows OS (#333)
sbcd90 Dec 1, 2022
292c4ce
Increment version to 1.3.8-SNAPSHOT (#338)
opensearch-trigger-bot[bot] Jan 24, 2023
1d06557
Add auto-release workflow (#376) (#377)
opensearch-trigger-bot[bot] Mar 1, 2023
d620c32
Increment version to 1.3.9-SNAPSHOT (#355)
opensearch-trigger-bot[bot] Mar 7, 2023
384af9e
Incremented version to 1.3.10 (#388)
opensearch-trigger-bot[bot] Apr 5, 2023
57a5a2c
Increment version to 1.3.11-SNAPSHOT (#453)
opensearch-trigger-bot[bot] Jun 15, 2023
a628e45
Increment version to 1.3.12-SNAPSHOT (#471)
opensearch-trigger-bot[bot] Aug 2, 2023
33f5f7a
Increment version to 1.3.13-SNAPSHOT (#504)
opensearch-trigger-bot[bot] Sep 8, 2023
2b56ba4
Increment version to 1.3.14-SNAPSHOT (#540)
opensearch-trigger-bot[bot] Oct 11, 2023
a45cd3c
[AUTO] Increment version to 1.3.15-SNAPSHOT (#575)
opensearch-trigger-bot[bot] Feb 28, 2024
10966b8
Forced ktlint to use logback-core:1.2.13, and logback-classic:1.2.13 …
AWSHurneyt Feb 29, 2024
aa44b3f
Merge branch '1.3' into 1.3-pr602-backport
AWSHurneyt Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ dependencies {
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'

ktlint "com.pinterest:ktlint:0.45.1"
add("ktlint", "com.pinterest:ktlint:0.45.1") {
exclude group: "ch.qos.logback", module: "logback-classic"
exclude group: "ch.qos.logback", module: "logback-core"
}
add("ktlint", "ch.qos.logback:logback-core:1.2.13")
add("ktlint", "ch.qos.logback:logback-classic:1.2.13")
}

test {
Expand Down
Loading