From cfbd0f842ecc743761922d7bfbf10054ed13b9ad Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Mon, 20 Dec 2021 08:13:45 -0800 Subject: [PATCH 1/2] Bump log4j to 2.17 Signed-off-by: Shenoy Pratik --- common/build.gradle | 2 +- integ-test/build.gradle | 2 +- ppl/build.gradle | 2 +- release-notes/opensearch-sql.release-notes-1.2.3.0.md | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 release-notes/opensearch-sql.release-notes-1.2.3.0.md diff --git a/common/build.gradle b/common/build.gradle index b0cda850d3..5cb4d55be6 100644 --- 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 index fa72a6c5b8..e6fea70051 100644 --- 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 index d93ff1d9a5..e17b07be32 100644 --- 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 new file mode 100644 index 0000000000..60b61a3966 --- /dev/null +++ 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 and OpenSearch Dashboards Version 1.2.3 + +### Bug fixes + +* Bump log4j to 2.17 and plugin to 1.2.3 ([#345](https://github.com/opensearch-project/sql/pull/345)) From 1f593550846f46e5446e241dc4b27810a5a86061 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Mon, 20 Dec 2021 08:49:45 -0800 Subject: [PATCH 2/2] updated release notes Signed-off-by: Shenoy Pratik --- release-notes/opensearch-sql.release-notes-1.2.3.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 60b61a3966..ddd70ff742 100644 --- a/release-notes/opensearch-sql.release-notes-1.2.3.0.md +++ b/release-notes/opensearch-sql.release-notes-1.2.3.0.md @@ -1,5 +1,5 @@ ### Version 1.2.3.0 Release Notes -Compatible with OpenSearch and OpenSearch Dashboards Version 1.2.3 +Compatible with OpenSearch Version 1.2.3 and OpenSearch Dashboards Version 1.2.x ### Bug fixes