Skip to content

Commit f1a1e53

Browse files
committed
Upgrade plugin version (1.2.3) and log4j version (2.17.0)
Signed-off-by: Joshua Tokle <[email protected]>
1 parent caa5ed6 commit f1a1e53

7 files changed

+14
-12
lines changed

.github/workflows/gradle.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
./gradlew build -Dperformance-analyzer-rca.build=true \
3636
-Dperformance-analyzer-rca.repo="https://github.com/opensearch-project/performance-analyzer-rca.git" \
3737
-Dperformance-analyzer-rca.branch=main \
38-
-Dopensearch.version=1.2.2-SNAPSHOT
38+
-Dopensearch.version=1.2.3-SNAPSHOT
3939
- name: Assemble PA jar for BWC tests
4040
working-directory: ./tmp/performance-analyzer
4141
run: |
42-
./gradlew assemble -Dopensearch.version=1.2.2-SNAPSHOT
43-
mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.2.0-SNAPSHOT
44-
cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.2.0-SNAPSHOT
42+
./gradlew assemble -Dopensearch.version=1.2.3-SNAPSHOT
43+
mkdir -p ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.3.0-SNAPSHOT
44+
cp ./build/distributions/*.zip ./src/test/resources/org/opensearch/performanceanalyzer/bwc/1.2.3.0-SNAPSHOT
4545
- name: Generate Jacoco coverage report
4646
working-directory: ./tmp/performance-analyzer
4747
run: ./gradlew jacocoTestReport
@@ -52,7 +52,7 @@ jobs:
5252
run: bash <(curl -s https://codecov.io/bash) -f ./build/reports/jacoco/test/jacocoTestReport.xml
5353
- name: Run Integration Tests
5454
working-directory: ./tmp/performance-analyzer
55-
run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.2-SNAPSHOT
55+
run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster -Dopensearch.version=1.2.3-SNAPSHOT
5656
- name: Run PerformanceAnalzyer Backwards Compatibility Tests
5757
working-directory: ./tmp/performance-analyzer
5858
run: ./gradlew bwcTestSuite -Dtests.security.manager=false

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
buildscript {
2828

2929
ext {
30-
opensearch_version = System.getProperty("opensearch.version", "1.2.2-SNAPSHOT")
30+
opensearch_version = System.getProperty("opensearch.version", "1.2.3-SNAPSHOT")
3131
}
3232

3333
// Used to resolve build file dependencies
@@ -259,10 +259,10 @@ dependencies {
259259
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
260260
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
261261
compile "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
262-
compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0') {
262+
compile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.0') {
263263
force = 'true'
264264
}
265-
compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0') {
265+
compile(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.0') {
266266
force = 'true'
267267
}
268268

@@ -476,7 +476,7 @@ String bwcFilePath = "src/test/resources/org/opensearch/performanceanalyzer/bwc/
476476
testClusters {
477477
"${baseName}$i" {
478478
testDistribution = "ARCHIVE"
479-
versions = ["7.10.2","1.2.2-SNAPSHOT"]
479+
versions = ["7.10.2","1.2.3-SNAPSHOT"]
480480
numberOfNodes = 3
481481
plugin(provider(new Callable<RegularFile>(){
482482
@Override

licenses/log4j-api-2.17.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bbd791e9c8c9421e45337c4fe0a10851c086e36c

licenses/log4j-core-2.17.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fe6e7a32c1228884b9691a744f953a55d0dd8ead

licenses/performanceanalyzer-rca-1.2.2.0-SNAPSHOT.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3ba39e719df9638a1305ee37aae7c19c3d2a3167

src/main/resources/plugin-descriptor.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
description=Performance Analyzer Plugin
2828
#
2929
# 'version': plugin's version
30-
version=1.2.2.0
30+
version=1.2.3.0
3131
#
3232
# 'name': the plugin name
3333
name=performance-analyzer
@@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
4242
java.version=1.8
4343
#
4444
# 'opensearch.version' version of opensearch compiled against
45-
opensearch.version=1.2.2
45+
opensearch.version=1.2.3

0 commit comments

Comments
 (0)