From 6f3437cd4955bad80b1ab190e55791293931c0a3 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Thu, 23 Dec 2021 09:34:17 -0800 Subject: [PATCH] backporting log4j to main Signed-off-by: Shenoy Pratik --- .github/workflows/sql-test-and-build-workflow.yml | 2 +- build.gradle | 2 +- 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 ++++++ 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 release-notes/opensearch-sql.release-notes-1.2.3.0.md diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 6664fe063a..aa6dcb5ec5 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -3,7 +3,7 @@ name: SQL Java CI on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.2.2-SNAPSHOT' + OPENSEARCH_VERSION: '1.2.3-SNAPSHOT' jobs: build: diff --git a/build.gradle b/build.gradle index 35ec15e785..3e8230209d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.2-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.3-SNAPSHOT") } repositories { diff --git a/common/build.gradle b/common/build.gradle index ece9e85422..dc74236488 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -35,7 +35,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 9931e2a448..6b4f6ba2f0 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -60,7 +60,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 22742ea8df..e2836e2476 100644 --- a/ppl/build.gradle +++ b/ppl/build.gradle @@ -51,7 +51,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..fb3ab4dcf2 --- /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 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)) \ No newline at end of file