Skip to content

Commit

Permalink
[Backport 1.3] Forced ktlint to use logback-core:1.2.13, and logback-…
Browse files Browse the repository at this point in the history
…classic:1.2.13 to address CVE. #602 (#603)

* Merge changes in the main branch to the 1.x branch. (#42)

* Update Release Notes for GA (#36)

* Update Release Notes for GA

* Update Release Notes for GA include RC1 Changes as well.

Signed-off-by: Aditya Jindal <aditjind@amazon.com>

* add method type in CustomWebhook data model (#39)

Signed-off-by: Zhongnan Su <szhongna@amazon.com>

* Fix class loader issue for notifications response (#40)

* Fix class loader issue for notifications

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix formatting

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Refactor creation of action listener object

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Fix indentation

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Remove unused suppresses

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Add UT for notification API

Signed-off-by: Chen Dai <daichen@amazon.com>

* Add UT for notification API

Signed-off-by: Chen Dai <daichen@amazon.com>

* Add UT for send notification API

Signed-off-by: Chen Dai <daichen@amazon.com>

* Fix Github workflow failure

Signed-off-by: Chen Dai <daichen@amazon.com>

* Fix Github workflow failure

Signed-off-by: Chen Dai <daichen@amazon.com>

* Refactor UT code

Signed-off-by: Chen Dai <daichen@amazon.com>

Co-authored-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Zhongnan Su <szhongna@amazon.com>
Co-authored-by: Chen Dai <46505291+dai-chen@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [1.x] Bumping common-utils to build with OpenSearch(1.x) 1.1.0 (#52)

* Bumping common-utils to build with OpenSearch(main) 1.1.0 (#48)

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Updating 1.x to work with OpenSearch 1.x

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Backport 1.1 changes to 1.x (#72)

* Add Commits related to Snapshot build of Common Utils on 1.1 (#67)

* Using 1.1 snapshot version for OpenSearch (#57)

Signed-off-by: Vacha <vachshah@amazon.com>

* Build snapshot build by default with the same version as OpenSearch. (#58)

Signed-off-by: dblock <dblock@amazon.com>

* Update build.gradle to reflect 1.1.0.0 version

Co-authored-by: Vacha <vachshah@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>

* Build snapshot build by default with the same version as OpenSearch. (#58) (#69)

Signed-off-by: dblock <dblock@amazon.com>

* Adding an utility method that allows consumers to set custom thread context property in InjectSecurity class (#47) (#70)

Signed-off-by: Ravi Thaluru <ravi1092@gmail.com>

Co-authored-by: Ravi <6005951+thalurur@users.noreply.github.com>

* Add release notes for version 1.1.0.0

* Add release notes for version 1.1.0.0

Co-authored-by: Aditya Jindal <13850971+aditjind@users.noreply.github.com>
Co-authored-by: Vacha <vachshah@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Bowen Lan <62091230+bowenlan-amzn@users.noreply.github.com>
Co-authored-by: Ravi <6005951+thalurur@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Backport main changes to 1.x (#93)

* Add themed logo to README (#41)

Signed-off-by: Miki <mehranb@amazon.com>

* Updates common-utils version to 1.2 (#77)

* Updates common-utils version to 1.2 and Uses Maven for 1.2 dependencies

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Publish .md5 and .sha1 signatures. (#79) (#80)

* Publish .md5 and .sha1 signatures.

Signed-off-by: dblock <dblock@dblock.org>

* Use OpenSearch 1.1.

Signed-off-by: dblock <dblock@dblock.org>

* Publish source and javadoc checksums. (#81)

Signed-off-by: dblock <dblock@dblock.org>

* Update copyright notice (#90)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update maven publication to include cksums. (#91)

This change adds a local staging repo task that will include cksums.  It will also update build.sh to use this new task and copy the contents of the staging repo to the output directory.
The maven publish plugin will not include these cksums when publishing to maven local but will when published to a separate folder.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add release notes for version 1.2.0.0 (#92)

* Add release notes for version 1.2.0.0

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

Co-authored-by: Miki <mehranb@amazon.com>
Co-authored-by: Clay Downs <89109232+downsrob@users.noreply.github.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Backport main changes to 1.x (#126)

* Fix copyright notice and add DCO check workflow (#94)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Update build.sh script to include optional platform param. (#95)

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add codeowners support for repo (#96)

Signed-off-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com>

* Bump version to 1.3 (#99)

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Auto-increment version on new release tags. (#106)

Signed-off-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>

* Remove jcenter repository (#115)

Signed-off-by: Peter Nied <peternied@hotmail.com>

* Using Github App token to trigger CI for version increment PRs (#116)

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixes copyright headers (#117)

Signed-off-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>

* Remove jcenter repository missed on first pass (#118)

Signed-off-by: Peter Nied <petern@amazon.com>

* Run CI/CD on Java 8, 11, 14 and 17. (#121)

* Run CI/CD on Java 8, 11, 14 and 17.

Signed-off-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>

* Add JDK 17.

Signed-off-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>

* Add .whitesource configuration file (#109)

Co-authored-by: whitesource-for-github-com[bot] <50673670+whitesource-for-github-com[bot]@users.noreply.github.com>

Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Peter Nied <peternied@hotmail.com>
Co-authored-by: Vacha Shah <vachshah@amazon.com>
Co-authored-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
Co-authored-by: Peter Nied <petern@amazon.com>
Co-authored-by: whitesource-for-github-com[bot] <50673670+whitesource-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Add release notes for version 1.3.0.0 (#134)

Signed-off-by: Saurabh Singh <sisurab@amazon.com>

Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Bump version to 1.3.1 (#145)

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Incremented version to 1.3.2 (#148)

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>

Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Adding signoff option for version workflow PR (#143) (#150)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
(cherry picked from commit 6e78f69)

Co-authored-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Incremented version to 1.3.3. (#180)

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Incremented version to 1.3.4. (#198)

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Staging for version increment automation (#200) (#208)

* Version increment automation

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Version increment automation: task rename updateVersion

Signed-off-by: pgodithi <pgodithi@amazon.com>
(cherry picked from commit 366bf16)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Signed-off-by: pgodithi <pgodithi@amazon.com>
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* release 1.3.5 (#219)

Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.6-SNAPSHOT (#243)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Change TrustStoreTest to use File.separator to support Windows path (#258) (#260)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 7dcb3a0)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* disable detekt so that snakeyaml <= 1.31 is not used (#266)

* disable detekt so that snakeyaml <= 1.31 is not used

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* add release-notes for 1.3.6 (#267)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [AUTO] Increment version to 1.3.7-SNAPSHOT (#276)

* Increment version to 1.3.7-SNAPSHOT

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* empty commit trigger

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Adding CI workflow for Windows OS (#333)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: Surya Sashank Nistala <sashank.nistala@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.8-SNAPSHOT (#338)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Add auto-release workflow (#376) (#377)

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 89b7457)

Co-authored-by: Craig Perkins <craig5008@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.9-SNAPSHOT (#355)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Incremented version to 1.3.10 (#388)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.11-SNAPSHOT (#453)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.12-SNAPSHOT (#471)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.13-SNAPSHOT (#504)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Increment version to 1.3.14-SNAPSHOT (#540)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [AUTO] Increment version to 1.3.15-SNAPSHOT (#575)

* Increment version to 1.3.15-SNAPSHOT

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* Empty-Commit

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Remove jdk 8 CI test

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

---------

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Forced ktlint to use logback-core:1.2.13, and logback-classic:1.2.13 to address CVE. (#602)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: pgodithi <pgodithi@amazon.com>
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Aditya Jindal <13850971+aditjind@users.noreply.github.com>
Co-authored-by: Zhongnan Su <szhongna@amazon.com>
Co-authored-by: Chen Dai <46505291+dai-chen@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Co-authored-by: Sriram <59816283+skkosuri-amzn@users.noreply.github.com>
Co-authored-by: Vacha <vachshah@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Bowen Lan <62091230+bowenlan-amzn@users.noreply.github.com>
Co-authored-by: Ravi <6005951+thalurur@users.noreply.github.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Miki <mehranb@amazon.com>
Co-authored-by: Clay Downs <89109232+downsrob@users.noreply.github.com>
Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Co-authored-by: Saurabh Singh <getsaurabh02@gmail.com>
Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com>
Co-authored-by: Peter Nied <peternied@hotmail.com>
Co-authored-by: Drew Baugher <46505179+dbbaughe@users.noreply.github.com>
Co-authored-by: Peter Nied <petern@amazon.com>
Co-authored-by: whitesource-for-github-com[bot] <50673670+whitesource-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Co-authored-by: Sayali Gaikawad <61760125+gaiksaya@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Zelin Hao <87548827+zelinh@users.noreply.github.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Surya Sashank Nistala <sashank.nistala@gmail.com>
Co-authored-by: Craig Perkins <craig5008@gmail.com>
  • Loading branch information
1 parent 0a876ba commit a0baf55
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build.gradle
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

0 comments on commit a0baf55

Please sign in to comment.