From 31eb00e5624bddad0bf0896b20facf40dac18658 Mon Sep 17 00:00:00 2001 From: Sruti Parthiban Date: Thu, 1 Jul 2021 14:45:43 -0700 Subject: [PATCH] Update version from 1.0.0.0-rc1 to 1.0.0.0 (#24) Signed-off-by: Sruti Parthiban --- .github/workflows/gradle.yml | 8 ++++---- INSTALL.md | 4 ++-- build.gradle | 8 ++++---- docker/Dockerfile | 6 +++--- src/main/resources/plugin-descriptor.properties | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e0220e19e..c0599f9c3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,11 +3,11 @@ name: Java CI on: push: branches: - - main + - "*" pull_request: branches: - - main + - "*" jobs: build_rca_pkg: @@ -52,7 +52,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-rc1.jar.sha1 + run: rm -f licenses/performanceanalyzer-rca-1.0.0.0.jar.sha1 # PA depends on OpenSearch. Checkout and publish to maven local for PA build. - name: Checkout OpenSearch uses: actions/checkout@v2 @@ -62,7 +62,7 @@ jobs: ref: '1.0' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false - name: Update SHA working-directory: ./tmp/pa run: ./gradlew updateShas diff --git a/INSTALL.md b/INSTALL.md index 8214d5024..7edb9a108 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -73,7 +73,7 @@ This package uses the [Gradle](https://docs.gradle.org/current/userguide/usergui 4. Because we are supplying our own version of the RCA framework, the SHA might have changed. So, delete the old SHA file if it exists. The SHA will get updated during build time. - `rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1` + `rm -f licenses/performanceanalyzer-rca-1.0.0.0.jar.sha1` 5. Trigger a gradle build. This builds the plugin, runs unit tests and creates the plugin jar. @@ -106,7 +106,7 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker 4. Copy the RCA framework artifact and the Performance Analyzer plugin JAR into this folder `cp /build/distributions/performance-analyzer-rca.zip ./` - `cp /build/distributions/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip ./` + `cp /build/distributions/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip ./` ### Installation diff --git a/build.gradle b/build.gradle index d490364f2..57aa4a3cd 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ publishing { maven(MavenPublication) { groupId = 'org.opensearch' artifactId = 'performanceanalyzer-rca' - version = '1.0.0.0-rc1' + version = '1.0.0.0' from components.java } } @@ -209,7 +209,7 @@ jacocoTestCoverageVerification { check.dependsOn jacocoTestCoverageVerification -version = "${rca_version}.0.0-rc1" +version = "${rca_version}.0.0" if (isSnapshot) { version += "-SNAPSHOT" } @@ -376,7 +376,7 @@ task cloneGitRepo(type: GitClone) { task removeLicenses(type: Delete) { dependsOn(cloneGitRepo) - def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1') + def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0.jar.sha1') delete(toDelete) } @@ -399,7 +399,7 @@ task copyAllArtifacts(type: Copy) { def projectPathStr = getProjectDir().toPath().toString() def dockerArtifacts = Paths.get(projectPathStr, 'docker').toString() def rcaArtifacts = Paths.get(projectPathStr, 'build', 'distributions', 'performance-analyzer-rca.zip') - def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip') + def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip') dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker') from(dockerArtifacts) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5ccf026b2..5766c30f4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -60,10 +60,10 @@ COPY --chown=1000:0 opensearch.yml log4j2.properties config/ COPY --chown=1000:0 performance-analyzer-rca.zip config/ -COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip /tmp/ -RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip; \ - rm /tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip +RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip; \ + rm /tmp/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip USER 0 diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 118009430..8db2769a7 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-rc1 +version=1.0.0.0 # # '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-rc1 +opensearch.version=1.0.0