Skip to content

Commit 123d41c

Browse files
dblockretaCEHENKLE
authored
Increment version to 1.2.2 and backport log4j upgrade to 2.16. (#1728)
* Increment version to 1.2.2. Signed-off-by: dblock <dblock@amazon.com> * Upgrade to log4j 2.16.0 (#1721) (#1723) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Moving DCO to workflows (#1458) Signed-off-by: CEHENKLE <henkle@amazon.com> Co-authored-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: CEHENKLE <henkle@amazon.com>
1 parent e3a44fa commit 123d41c

File tree

20 files changed

+31
-11
lines changed

20 files changed

+31
-11
lines changed

.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ BWC_VERSION:
7979
- "1.1.0"
8080
- "1.1.1"
8181
- "1.2.0"
82+
- "1.2.1"

.github/workflows/dco.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Developer Certificate of Origin Check
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
check:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Get PR Commits
11+
id: 'get-pr-commits'
12+
uses: tim-actions/get-pr-commits@v1.1.0
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
- name: DCO Check
16+
uses: tim-actions/dco@v1.1.0
17+
with:
18+
commits: ${{ steps.get-pr-commits.outputs.commits }}

buildSrc/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opensearch = 1.2.1
1+
opensearch = 1.2.2
22
lucene = 8.10.1
33

44
bundled_jdk_vendor = adoptopenjdk
@@ -13,7 +13,7 @@ jackson = 2.12.5
1313
snakeyaml = 1.26
1414
icu4j = 62.1
1515
supercsv = 2.4.0
16-
log4j = 2.15.0
16+
log4j = 2.16.0
1717
slf4j = 1.6.2
1818

1919
# when updating the JNA version, also update the version in buildSrc/build.gradle

plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecbcfa4162e35b831705e97bbee546f81280ee6f

plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecbcfa4162e35b831705e97bbee546f81280ee6f

plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ecbcfa4162e35b831705e97bbee546f81280ee6f

plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)