From 5041b33ebd68604eecbc592ae2f8d9b49424c71d Mon Sep 17 00:00:00 2001 From: cliu123 Date: Sat, 22 May 2021 16:07:59 -0700 Subject: [PATCH 1/4] Add build.version_qualifier and make security plugin compatible with OpenSearch 1.0.0-rc1 --- .github/workflows/ci.yml | 2 +- build.gradle | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7c4b6b8a9..333dec6e58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false - name: Checkstyle run: mvn -B checkstyle:checkstyle diff --git a/build.gradle b/build.gradle index 1bb6c81978..ef701ada86 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ plugins { buildDir = 'gradle-build' ext { - opensearchVersion = '1.0.0.0-beta1' + opensearchVersion = '1.0.0.0-rc1' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } @@ -67,7 +67,7 @@ ospackage { user 'root' permissionGroup 'root' - requires('opensearch-oss', "1.0.0-beta1", EQUAL) + requires('opensearch-oss', "1.0.0-rc1", EQUAL) packager = 'Amazon' vendor = 'Amazon' os = 'LINUX' diff --git a/pom.xml b/pom.xml index c0be91b696..27bc4e24f6 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.8 8 - 1.0.0-beta1 + 1.0.0-rc1 2.0.25.Final From 55fcef88e201117efa2cf2f62c09f995378ee474 Mon Sep 17 00:00:00 2001 From: cliu123 Date: Mon, 24 May 2021 10:44:24 -0700 Subject: [PATCH 2/4] update the opensearch dependency from rc1 to snapshot --- .github/workflows/ci.yml | 2 +- build.gradle | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 333dec6e58..ccf62899b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=snapshot -Dbuild.snapshot=false - name: Checkstyle run: mvn -B checkstyle:checkstyle diff --git a/build.gradle b/build.gradle index ef701ada86..8feef956fc 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ plugins { buildDir = 'gradle-build' ext { - opensearchVersion = '1.0.0.0-rc1' + opensearchVersion = '1.0.0.0-snapshot' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } @@ -67,7 +67,7 @@ ospackage { user 'root' permissionGroup 'root' - requires('opensearch-oss', "1.0.0-rc1", EQUAL) + requires('opensearch-oss', "1.0.0-snapshot", EQUAL) packager = 'Amazon' vendor = 'Amazon' os = 'LINUX' diff --git a/pom.xml b/pom.xml index 27bc4e24f6..fd679d37cc 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.8 8 - 1.0.0-rc1 + 1.0.0-snapshot 2.0.25.Final From 8704c155d22ece1f84b0f802b44006fe5fcaa55a Mon Sep 17 00:00:00 2001 From: cliu123 Date: Mon, 24 May 2021 11:25:54 -0700 Subject: [PATCH 3/4] Change qualifier and dependencies back from snapshot to rc1 --- .github/workflows/ci.yml | 2 +- build.gradle | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccf62899b9..333dec6e58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=snapshot -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false - name: Checkstyle run: mvn -B checkstyle:checkstyle diff --git a/build.gradle b/build.gradle index 8feef956fc..ef701ada86 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ plugins { buildDir = 'gradle-build' ext { - opensearchVersion = '1.0.0.0-snapshot' + opensearchVersion = '1.0.0.0-rc1' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } @@ -67,7 +67,7 @@ ospackage { user 'root' permissionGroup 'root' - requires('opensearch-oss', "1.0.0-snapshot", EQUAL) + requires('opensearch-oss', "1.0.0-rc1", EQUAL) packager = 'Amazon' vendor = 'Amazon' os = 'LINUX' diff --git a/pom.xml b/pom.xml index fd679d37cc..27bc4e24f6 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.8 8 - 1.0.0-snapshot + 1.0.0-rc1 2.0.25.Final From b478f832dbcb17272dae2b3d240ec3673a2ff68e Mon Sep 17 00:00:00 2001 From: cliu123 Date: Mon, 24 May 2021 11:29:55 -0700 Subject: [PATCH 4/4] Revert the change in plugin version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ef701ada86..cf838c6653 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ plugins { buildDir = 'gradle-build' ext { - opensearchVersion = '1.0.0.0-rc1' + opensearchVersion = '1.0.0.0-beta1' isSnapshot = "true" == System.getProperty("build.snapshot", "true") }