Increment version to 1.2.2 and backport log4j upgrade to 2.16. (#1728)

* Increment version to 1.2.2. Signed-off-by: dblock <[email protected]> * Upgrade to log4j 2.16.0 (#1721) (#1723) Signed-off-by: Andriy Redko <[email protected]> * Moving DCO to workflows (#1458) Signed-off-by: CEHENKLE <[email protected]> Co-authored-by: Andriy Redko <[email protected]> Co-authored-by: CEHENKLE <[email protected]>
opensearch-project · Dec 15, 2021 · 123d41c · 123d41c
1 parent e3a44fa
commit 123d41c
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 11 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -79,3 +79,4 @@ BWC_VERSION:
   - "1.1.0"
   - "1.1.1"
   - "1.2.0"
+  - "1.2.1"
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
@@ -0,0 +1,18 @@
+name: Developer Certificate of Origin Check
+
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get PR Commits
+        id: 'get-pr-commits'
+        uses: tim-actions/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: DCO Check
+        uses: tim-actions/[email protected]
+        with:
+          commits: ${{ steps.get-pr-commits.outputs.commits }}
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,4 +1,4 @@
-opensearch        = 1.2.1
+opensearch        = 1.2.2
 lucene            = 8.10.1
 
 bundled_jdk_vendor = adoptopenjdk
@@ -13,7 +13,7 @@ jackson           = 2.12.5
 snakeyaml         = 1.26
 icu4j             = 62.1
 supercsv          = 2.4.0
-log4j             = 2.15.0
+log4j             = 2.16.0
 slf4j             = 1.6.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle

diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
@@ -0,0 +1 @@
+d4cc7712ebb4744681db815679248e4312f61b32
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
diff --git a/server/licenses/log4j-api-2.15.0.jar.sha1 b/server/licenses/log4j-api-2.15.0.jar.sha1
diff --git a/server/licenses/log4j-api-2.16.0.jar.sha1 b/server/licenses/log4j-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+4727d93a76616ffc4149dffac5801827c0f4ac71
diff --git a/server/licenses/log4j-core-2.15.0.jar.sha1 b/server/licenses/log4j-core-2.15.0.jar.sha1
diff --git a/server/licenses/log4j-core-2.16.0.jar.sha1 b/server/licenses/log4j-core-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ca12fb3902ecfcba1e1357ebfc55407acec30ede
diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -76,7 +76,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_1_1_1 = new Version(1010199, org.apache.lucene.util.Version.LUCENE_8_9_0);
     public static final Version V_1_2_0 = new Version(1020099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_1_2_1 = new Version(1020199, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version CURRENT = V_1_2_1;
+    public static final Version V_1_2_2 = new Version(1020299, org.apache.lucene.util.Version.LUCENE_8_10_1);
+    public static final Version CURRENT = V_1_2_2;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,3 +79,4 @@ BWC_VERSION: @@
       - "1.1.0"
       - "1.1.1"
       - "1.2.0"
+      - "1.2.1"