Skip to content

Commit

Permalink
Upgrade plugin and log4j version
Browse files Browse the repository at this point in the history
Signed-off-by: Sruti Parthiban <[email protected]>
  • Loading branch information
sruti1312 committed Dec 15, 2021
1 parent 534d43d commit 4066d4b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=main \
-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
Expand All @@ -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
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
}

Expand Down Expand Up @@ -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<RegularFile>(){
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -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))
4 changes: 2 additions & 2 deletions src/main/resources/plugin-descriptor.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 4066d4b

Please sign in to comment.