diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle index 89358425..723acaa1 100644 --- a/build-tools/pkgbuild.gradle +++ b/build-tools/pkgbuild.gradle @@ -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 } @@ -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 ' - url 'https://opensearch.org/downloads.html' + maintainer 'Wazuh Team ' + 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() } diff --git a/build.gradle b/build.gradle index 383b6b17..57442cc3 100644 --- a/build.gradle +++ b/build.gradle @@ -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) @@ -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"