Skip to content

Upgrade plugin and log4j version #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sruti1312 merged 2 commits into from
Dec 11, 2021
Merged

Upgrade plugin and log4j version #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ede88f
Bump log4j to 2.15.0
sruti1312 Dec 10, 2021
bcdac1e
Update plugin version to 1.2.1
sruti1312 Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:
working-directory: ./tmp/performance-analyzer
run: |
./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.0-SNAPSHOT
-Dperformance-analyzer-rca.repo="https://github.com/sruti1312/performance-analyzer-rca-1.git" \
-Dperformance-analyzer-rca.branch=feature/upgrade-1.2.1 \
-Dopensearch.version=1.2.1-SNAPSHOT
- name: Assemble PA jar for BWC tests
working-directory: ./tmp/performance-analyzer
run: |
./gradlew assemble -Dopensearch.version=1.2.0-SNAPSHOT
mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.0.0-SNAPSHOT
cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.0.0-SNAPSHOT
./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
- 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.0-SNAPSHOT
run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.1-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
View file
Open in desktop
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.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "1.2.1-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.11.1') {
compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0') {
force = 'true'
}
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') {
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.0-SNAPSHOT"]
versions = ["7.10.2","1.2.1-SNAPSHOT"]
numberOfNodes = 3
plugin(provider(new Callable<RegularFile>(){
@Override
Expand Down
1 change: 0 additions & 1 deletion licenses/commons-io-2.3.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions licenses/commons-io-2.7.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3f2bd4ba11c4162733c13cc90ca7c7ea09967102
1 change: 0 additions & 1 deletion licenses/performanceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions licenses/performanceanalyzer-rca-1.2.1.0-SNAPSHOT.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aca2cece58e62fbf1c6919048f504eebff90fc5b
4 changes: 2 additions & 2 deletions src/main/resources/plugin-descriptor.properties
View file
Open in desktop
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.0.0
version=1.2.1.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.0
opensearch.version=1.2.1