Skip to content

Commit

Permalink
Fix revision in Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexRuiz7 committed Sep 24, 2024
1 parent 2318505 commit a4260e8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
17 changes: 8 additions & 9 deletions build-tools/pkgbuild.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ apply plugin: 'com.netflix.nebula.ospackage'
afterEvaluate {
ospackage {
packageName = "${name}"
release = isSnapshot ? "0.1" : '1'
version = "${project.version}" - "-SNAPSHOT"
version = "${project.version}"

into '/usr/share/opensearch/plugins'
into '/usr/share/wazuh-indexer/plugins'
from(zipTree(bundlePlugin.archivePath)) {
into opensearchplugin.name
}
Expand All @@ -23,17 +22,17 @@ afterEvaluate {
dirMode 0755

requires('opensearch-oss', versions.opensearch, EQUAL)
packager = 'Amazon'
vendor = 'Amazon'
packager = 'Wazuh'
vendor = 'Wazuh'
os = 'LINUX'
prefix '/usr'

license 'ASL-2.0'
maintainer 'OpenSearch Team <opensearch@amazon.com>'
url 'https://opensearch.org/downloads.html'
maintainer 'Wazuh Team <info@wazuh.com>'
url 'https://wazuh.com'
summary '''
OpenSearch reports scheduler.
Reference documentation can be found at https://docs-beta.opensearch.org/.
Wazuh Indexer reports scheduler.
Reference documentation can be found at https://opensearch.org/docs/latest/reporting/report-dashboard-index/.
'''.stripIndent().replace('\n', ' ').trim()
}

Expand Down
14 changes: 2 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,12 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask

buildscript {
ext {
opensearch_group = "org.opensearch"

isSnapshot = "true" == System.getProperty("build.snapshot", "false")
opensearch_version = System.getProperty("opensearch.version", "2.16.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
wazuh_version = System.getProperty("version", "5.0.0")
revision = System.getProperty("build.revision", "0")
revision = System.getProperty("revision", "0")
// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
if (buildVersionQualifier) {
opensearch_build += "-${buildVersionQualifier}"
}
if (isSnapshot) {
opensearch_build += "-SNAPSHOT"
}

common_utils_version = System.getProperty("common_utils.version", opensearch_build)
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
Expand All @@ -40,7 +30,7 @@ buildscript {
}

dependencies {
classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4"
Expand Down

0 comments on commit a4260e8

Please sign in to comment.