Skip to content

Commit

Permalink
Add build.version_qualifier and make security plugin compatible with …
Browse files Browse the repository at this point in the history
…OpenSearch 1.0.0-rc1
  • Loading branch information
cliu123 committed May 22, 2021
1 parent ea101e2 commit cfd1dc4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand All @@ -47,6 +47,7 @@ group = "org.opensearch"
version = "${opensearchVersion}" + (isSnapshot ? "-SNAPSHOT" : "")

if (!project.hasProperty("archivePath")) {

throw new GradleException("Missing -ParchivePath command line switch pointing to built plugin ZIP")
}
if (!project.file(archivePath).exists()) {
Expand All @@ -67,7 +68,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'
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>

<opensearch.version>1.0.0-beta1</opensearch.version>
<opensearch.version>1.0.0-rc1</opensearch.version>

<!-- deps -->
<netty-native.version>2.0.25.Final</netty-native.version>
Expand Down

0 comments on commit cfd1dc4

Please sign in to comment.