diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5e8cdfcd..4e0547b4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 092e9ae7..666fdf1f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -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 diff --git a/build.gradle b/build.gradle index bf2bc500..59f87d43 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { @@ -72,7 +72,7 @@ ext { } group = "org.opensearch" -version = "${opensearchVersion}.0-beta1" +version = "${opensearchVersion}.0-rc1" if (isSnapshot) { version += "-SNAPSHOT" } @@ -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}" @@ -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") @@ -482,8 +482,8 @@ afterEvaluate { prefix '/usr' license 'ASL-2.0' - maintainer 'OpenDistro for Elasticsearch Team ' - url 'https://opendistro.github.io/for-elasticsearch/downloads.html' + maintainer 'OpenSearch ' + url 'https://opensearch.org/downloads.html' summary ''' Performance Analyzer plugin for OpenSearch. Reference documentation can be found at https://docs-beta.opensearch.org/. diff --git a/pa_bin/performance-analyzer-agent b/pa_bin/performance-analyzer-agent index 451fe216..52d59878 100755 --- a/pa_bin/performance-analyzer-agent +++ b/pa_bin/performance-analyzer-agent @@ -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=$! diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 4a6ec464..9104e3fc 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.0.0.0-beta1 +version=1.0.0.0-rc1 # # '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.0.0-beta1 +opensearch.version=1.0.0-rc1