Merge pull request #345 from ps48/1.2

ps48 · web-flow · commit 9bc9ddaf31e5 · 2021-12-20T14:55:24.000-08:00
Bump log4j to 2.17
diff --git a/common/build.gradle b/common/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     compile "org.antlr:antlr4-runtime:4.7.1"
     // https://github.com/google/guava/wiki/CVE-2018-10237
     compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.16.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     testCompile group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
     testCompile group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
     testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
-    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.16.0'
+    testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
     testCompile project(':plugin')
     testCompile project(':legacy')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2')
diff --git a/ppl/build.gradle b/ppl/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     compile group: 'org.json', name: 'json', version: '20180813'
     compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
     compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.16.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'
     compile project(':common')
     compile project(':core')
     compile project(':protocol')
diff --git a/release-notes/opensearch-sql.release-notes-1.2.3.0.md b/release-notes/opensearch-sql.release-notes-1.2.3.0.md
@@ -0,0 +1,6 @@
+### Version 1.2.3.0 Release Notes
+Compatible with OpenSearch Version 1.2.3 and OpenSearch Dashboards Version 1.2.x
+
+### Bug fixes
+
+* Bump log4j to 2.17 and plugin to 1.2.3 ([#345](https://github.com/opensearch-project/sql/pull/345))

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ dependencies {`
`41`	`41`	`compile "org.antlr:antlr4-runtime:4.7.1"`
`42`	`42`	`// https://github.com/google/guava/wiki/CVE-2018-10237`
`43`	`43`	`compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'`
`44`		`- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.16.0'`
	`44`	`+ compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.0'`
`45`	`45`
`46`	`46`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`47`	`47`	`}`