From d1f6515f7fa7d2c312c7eee65985d3520ba1f977 Mon Sep 17 00:00:00 2001 From: Zelin Hao <87548827+zelinh@users.noreply.github.com> Date: Mon, 11 Jul 2022 12:01:49 -0700 Subject: [PATCH] Incremented version to 1.3.4. (#237) * Incremented version to 1.3.4. Signed-off-by: Zelin Hao * Fix jackson version mismatch Signed-off-by: Zelin Hao --- .github/workflows/gradle.yml | 10 +++++----- build.gradle | 4 ++-- src/main/resources/plugin-descriptor.properties | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6f9edd3a..611914c3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,13 +41,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.3 \ - -Dopensearch.version=1.3.3-SNAPSHOT + -Dopensearch.version=1.3.4-SNAPSHOT - name: Assemble PA jar for BWC tests working-directory: ./tmp/performance-analyzer run: | - ./gradlew assemble -Dopensearch.version=1.3.3-SNAPSHOT - mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.3.3.0-SNAPSHOT - cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.3.3.0-SNAPSHOT + ./gradlew assemble -Dopensearch.version=1.3.4-SNAPSHOT + mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.3.4.0-SNAPSHOT + cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.3.4.0-SNAPSHOT - name: Generate Jacoco coverage report working-directory: ./tmp/performance-analyzer run: ./gradlew jacocoTestReport @@ -58,7 +58,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.3.3-SNAPSHOT + run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.3.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 385ff738..91cf31e7 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT") } // Used to resolve build file dependencies @@ -208,7 +208,7 @@ dependencies { compile files("${System.properties['java.home']}/../lib/tools.jar") } - def jacksonVersion = "2.12.6" + def jacksonVersion = "2.13.2" def nettyVersion = "4.1.73.Final" configurations { diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 53d20a73..3197bea8 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.3.3.0 +version=1.3.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.3.3 +opensearch.version=1.3.4