From 725be0b70401f8fe8c1afe0579d7444dcf2d24ee Mon Sep 17 00:00:00 2001 From: Sruti Parthiban Date: Wed, 15 Dec 2021 09:59:28 -0800 Subject: [PATCH] Upgrade plugin and log4j version (#103) (#104) Signed-off-by: Sruti Parthiban --- .github/workflows/gradle.yml | 10 +++++----- build.gradle | 8 ++++---- ... performanceanalyzer-rca-1.2.2.0-SNAPSHOT.jar.sha1} | 0 ...earch-performance-analyzer.release-notes-1.2.2.0.md | 8 ++++++++ src/main/resources/plugin-descriptor.properties | 4 ++-- 5 files changed, 19 insertions(+), 11 deletions(-) rename licenses/{performanceanalyzer-rca-1.2.1.0-SNAPSHOT.jar.sha1 => performanceanalyzer-rca-1.2.2.0-SNAPSHOT.jar.sha1} (100%) create mode 100644 release-notes/opensearch-performance-analyzer.release-notes-1.2.2.0.md diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7f48e305..d6cd5116 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -35,13 +35,13 @@ jobs: ./gradlew build -Dperformance-analyzer-rca.build=true \ -Dperformance-analyzer-rca.repo="https://github.com/opensearch-project/performance-analyzer-rca.git" \ -Dperformance-analyzer-rca.branch=1.2 \ - -Dopensearch.version=1.2.1-SNAPSHOT + -Dopensearch.version=1.2.2-SNAPSHOT - name: Assemble PA jar for BWC tests working-directory: ./tmp/performance-analyzer run: | - ./gradlew assemble -Dopensearch.version=1.2.1-SNAPSHOT - mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.1.0-SNAPSHOT - cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.1.0-SNAPSHOT + ./gradlew assemble -Dopensearch.version=1.2.2-SNAPSHOT + mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.2.0-SNAPSHOT + cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.2.0-SNAPSHOT - name: Generate Jacoco coverage report working-directory: ./tmp/performance-analyzer run: ./gradlew jacocoTestReport @@ -52,7 +52,7 @@ jobs: run: bash <(curl -s https://codecov.io/bash) -f ./build/reports/jacoco/test/jacocoTestReport.xml - name: Run Integration Tests working-directory: ./tmp/performance-analyzer - run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.1-SNAPSHOT + run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.2-SNAPSHOT - name: Run PerformanceAnalzyer Backwards Compatibility Tests working-directory: ./tmp/performance-analyzer run: ./gradlew bwcTestSuite -Dtests.security.manager=false diff --git a/build.gradle b/build.gradle index 6cf4f07b..2bb4c952 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.2-SNAPSHOT") } // Used to resolve build file dependencies @@ -259,10 +259,10 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" compile "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}" - compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0') { + compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0') { force = 'true' } - compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0') { + compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0') { force = 'true' } @@ -476,7 +476,7 @@ String bwcFilePath = "src/test/resources/org/opensearch/performanceanalyzer/bwc/ testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["7.10.2","1.2.1-SNAPSHOT"] + versions = ["7.10.2","1.2.2-SNAPSHOT"] numberOfNodes = 3 plugin(provider(new Callable(){ @Override diff --git a/licenses/performanceanalyzer-rca-1.2.1.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-1.2.2.0-SNAPSHOT.jar.sha1 similarity index 100% rename from licenses/performanceanalyzer-rca-1.2.1.0-SNAPSHOT.jar.sha1 rename to licenses/performanceanalyzer-rca-1.2.2.0-SNAPSHOT.jar.sha1 diff --git a/release-notes/opensearch-performance-analyzer.release-notes-1.2.2.0.md b/release-notes/opensearch-performance-analyzer.release-notes-1.2.2.0.md new file mode 100644 index 00000000..15343b3c --- /dev/null +++ b/release-notes/opensearch-performance-analyzer.release-notes-1.2.2.0.md @@ -0,0 +1,8 @@ +## Version 1.2.2.0 Release Notes + +Compatible with OpenSearch 1.2.2 + +### Bug fixes + +* Upgrade plugin and log4j version ([#101](https://github.com/opensearch-project/performance-analyzer-rca/pull/101)) +* Upgrade plugin and log4j version ([#100](https://github.com/opensearch-project/performance-analyzer/pull/100)) diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 9ce156ea..80d34be1 100644 --- a/src/main/resources/plugin-descriptor.properties +++ b/src/main/resources/plugin-descriptor.properties @@ -27,7 +27,7 @@ description=Performance Analyzer Plugin # # 'version': plugin's version -version=1.2.1.0 +version=1.2.2.0 # # 'name': the plugin name name=performance-analyzer @@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin java.version=1.8 # # 'opensearch.version' version of opensearch compiled against -opensearch.version=1.2.1 +opensearch.version=1.2.2