From 89f46420e0b958841d145d4ecbca3d0549513f54 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 10 Dec 2021 18:49:29 -0800 Subject: [PATCH] [1.2] Bump log4j to 2.15 and bump plugin to 1.2.1 (#325) * Pick log4j version bump Signed-off-by: Joshua Li * Update release notes Signed-off-by: Joshua Li * Revert version bump for workbench Signed-off-by: Joshua Li --- .github/workflows/sql-test-and-build-workflow.yml | 6 +++++- build.gradle | 2 +- common/build.gradle | 2 +- integ-test/build.gradle | 2 +- ppl/build.gradle | 2 +- release-notes/opensearch-sql.release-notes-1.2.1.0.md | 6 ++++++ 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 release-notes/opensearch-sql.release-notes-1.2.1.0.md diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 622bbfcef5..ffb5a838fb 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -2,6 +2,9 @@ name: SQL Java CI on: [push, pull_request] +env: + OPENSEARCH_VERSION: '1.2.1-SNAPSHOT' + jobs: build: @@ -16,7 +19,7 @@ jobs: java-version: 1.14 - name: Build with Gradle - run: ./gradlew build assemble -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew build assemble -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} - name: Create Artifact Path run: | @@ -27,6 +30,7 @@ jobs: - name: Upload SQL Coverage Report uses: codecov/codecov-action@v1 with: + flags: sql-engine token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Artifacts diff --git a/build.gradle b/build.gradle index 7c8708fb34..3f32d5da52 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT") } repositories { diff --git a/common/build.gradle b/common/build.gradle index 481f2e541a..8e1403ae9f 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.11.1' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0' testCompile group: 'junit', name: 'junit', version: '4.12' } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index d87e68ac9b..a1d6b61903 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.11.1' + testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.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 d9c5e20616..c7476339a3 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.11.1' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0' compile project(':common') compile project(':core') compile project(':protocol') diff --git a/release-notes/opensearch-sql.release-notes-1.2.1.0.md b/release-notes/opensearch-sql.release-notes-1.2.1.0.md new file mode 100644 index 0000000000..bf4e491943 --- /dev/null +++ b/release-notes/opensearch-sql.release-notes-1.2.1.0.md @@ -0,0 +1,6 @@ +### 2021-12-10 Version 1.2.1.0 Release Notes +Compatible with OpenSearch and OpenSearch Dashboards Version 1.2.1 + +### Bug fixes + +* Bumping log4j to 2.15.0 ([#324](https://github.com/opensearch-project/sql/pull/324))