Skip to content

Commit

Permalink
Default to building -SNAPSHOT and require OpenSearch 1.1.0.
Browse files Browse the repository at this point in the history
Signed-off-by: dblock <[email protected]>
  • Loading branch information
dblock committed Aug 30, 2021
1 parent bbc650c commit efad3d8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 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

- name: Checkstyle
run: mvn -B checkstyle:checkstyle
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ buildDir = 'gradle-build'

ext {
securityPluginVersion = '1.1.0.0'
opensearchVersion = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
}

Expand Down Expand Up @@ -67,7 +68,7 @@ ospackage {
user 'root'
permissionGroup 'root'

requires('opensearch-oss', "1.1.0", EQUAL)
requires('opensearch-oss', opensearchVersion - '-SNAPSHOT', EQUAL)
packager = 'Amazon'
vendor = 'Amazon'
os = 'LINUX'
Expand Down
2 changes: 1 addition & 1 deletion plugin-descriptor.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
description=Provide access control related features for OpenSearch 1.0.0
#
# 'version': plugin's version
version=1.1.0.0-SNAPSHOT
version=1.1.0.0
#
# 'name': the plugin name
name=opensearch-security
Expand Down
17 changes: 14 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<groupId>org.opensearch</groupId>
<artifactId>opensearch-security</artifactId>
<packaging>jar</packaging>
<version>1.1.0.0-SNAPSHOT</version>
<version>${version}</version>
<name>OpenSearch Security</name>
<description>OpenSearch Security</description>
<url>https://github.com/opensearch-project/security</url>
Expand Down Expand Up @@ -68,7 +68,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>

<opensearch.version>1.1.0</opensearch.version>
<opensearch.version>1.1.0-SNAPSHOT</opensearch.version>
<version>1.1.0.0</version>

<!-- deps -->
<netty-native.version>2.0.25.Final</netty-native.version>
Expand Down Expand Up @@ -103,7 +104,6 @@
<url>https://github.com/opensearch-project/security</url>
<connection>scm:git:[email protected]:opensearch-project/security.git</connection>
<developerConnection>scm:git:[email protected]:opensearch-project/security.git</developerConnection>
<tag>1.0.1.0</tag>
</scm>

<issueManagement>
Expand Down Expand Up @@ -831,6 +831,17 @@
</resources>
</build>
<profiles>
<profile>
<activation>
<property>
<name>build.snapshot</name>
<value>!false</value>
</property>
</activation>
<properties>
<version>1.1.0.0-SNAPSHOT</version>
</properties>
</profile>
<profile>
<id>advanced</id>
<build>
Expand Down

0 comments on commit efad3d8

Please sign in to comment.