From 98a9dfd4c223bbc2b4a80b3487411945e84c219a Mon Sep 17 00:00:00 2001 From: Karishma Joseph Date: Mon, 3 Jan 2022 17:32:33 -0800 Subject: [PATCH] Upgrade plugin version to 1.2.4 and log4j to 2.17.1 Signed-off-by: Karishma Joseph --- .github/workflows/gradle.yml | 10 +++++----- build.gradle | 8 ++++---- src/main/resources/plugin-descriptor.properties | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2ed48ced..349523ce 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.3-SNAPSHOT + -Dopensearch.version=1.2.4-SNAPSHOT - name: Assemble PA jar for BWC tests working-directory: ./tmp/performance-analyzer run: | - ./gradlew assemble -Dopensearch.version=1.2.3-SNAPSHOT - mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.3.0-SNAPSHOT - cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.3.0-SNAPSHOT + ./gradlew assemble -Dopensearch.version=1.2.4-SNAPSHOT + mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.4.0-SNAPSHOT + cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.4.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.3-SNAPSHOT + run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.4-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 e0597659..22401a32 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.3-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.4-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.17.0') { + compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1') { force = 'true' } - compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.0') { + compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1') { 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.3-SNAPSHOT"] + versions = ["7.10.2","1.2.4-SNAPSHOT"] numberOfNodes = 3 plugin(provider(new Callable(){ @Override diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 7361dbcc..4c35def5 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.3.0 +version=1.2.4.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.3 +opensearch.version=1.2.4