Skip to content
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.

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

Update version to rc1 #16

Merged
merged 1 commit into from
May 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: ./gradlew publishToMavenLocal
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/pa
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1
- name: Update SHA
working-directory: ./tmp/pa
run: ./gradlew updateShas
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ jobs:
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: '1.0.0-beta1'
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=beta1 -Dbuild.snapshot=false
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/pa
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1
- name: Update SHA
working-directory: ./tmp/pa
run: ./gradlew updateShas
Expand Down
12 changes: 6 additions & 6 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.0.0-beta1")
opensearch_version = System.getProperty("opensearch.version", "1.0.0-rc1")
}
// This isn't applying from repositories.gradle so repeating it here
repositories {
Expand Down Expand Up @@ -72,7 +72,7 @@ ext {
}

group = "org.opensearch"
version = "${opensearchVersion}.0-beta1"
version = "${opensearchVersion}.0-rc1"
if (isSnapshot) {
version += "-SNAPSHOT"
}
Expand Down Expand Up @@ -249,7 +249,7 @@ dependencies {
compile 'org.apache.commons:commons-lang3:3.9'
compile 'org.bouncycastle:bcprov-jdk15on:1.68'
compile 'org.bouncycastle:bcpkix-jdk15on:1.68'
compile 'com.amazon.opensearch:performanceanalyzer-rca:1.0.0.0-beta1'
compile 'org.opensearch:performanceanalyzer-rca:1.0.0.0-rc1'
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}"
Expand Down Expand Up @@ -341,7 +341,7 @@ task buildRca() {
exec {
def licenseDir = "$projectDir/licenses"
workingDir("$licenseDir")
commandLine 'rm', "performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1"
commandLine 'rm', "performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1"
}
exec {
workingDir("$projectDir")
Expand Down Expand Up @@ -482,8 +482,8 @@ afterEvaluate {
prefix '/usr'

license 'ASL-2.0'
maintainer 'OpenDistro for Elasticsearch Team <opendistro@amazon.com>'
url 'https://opendistro.github.io/for-elasticsearch/downloads.html'
maintainer 'OpenSearch <opensearch@amazon.com>'
url 'https://opensearch.org/downloads.html'
summary '''
Performance Analyzer plugin for OpenSearch.
Reference documentation can be found at https://docs-beta.opensearch.org/.
Expand Down
4 changes: 2 additions & 2 deletions pa_bin/performance-analyzer-agent
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ fi
# We need to change this file: https://github.com/opensearch-project/opensearch-build/blob/main/release/docker/config/opensearch/opensearch-docker-entrypoint.sh

if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' >/dev/null; then
export JAVA_OPTS=-Des.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml
export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml
exec $OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/bin/performance-analyzer-rca
else
echo 'Starting deamon'
export JAVA_OPTS=-Des.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml
export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml
exec $OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/bin/performance-analyzer-rca &

pid=$!
Expand Down
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.0.0.0-beta1
version=1.0.0.0-rc1
#
# '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.0.0-beta1
opensearch.version=1.0.0-rc1