Centralises where the version is defined

Original commit: elastic/x-pack-elasticsearch@e822136d97
This commit is contained in:
Colin Goodheart-Smithe 2016-12-02 15:17:40 +00:00
parent 3173f7a727
commit d530edc263
3 changed files with 12 additions and 10 deletions

View File

@ -51,6 +51,7 @@ if (cppEnabledStr == 'auto') {
allprojects {
group = 'org.elasticsearch.prelert'
version = VersionProperties.elasticsearch
}
String packArtifactName = 'prelert'
@ -96,7 +97,7 @@ task bundlePack(type: Zip) {
from { zipTree(project('kibana').bundlePlugin.outputs.files.singleFile) }
destinationDir file('build/distributions')
baseName = packArtifactName
version = VersionProperties.elasticsearch
version = project.version
}
task assemble(dependsOn: bundlePack) {
@ -124,7 +125,7 @@ task uploadPackToS3(type: UploadS3Task, dependsOn: [build]) {
enabled project.uploadEnabled
description = 'upload pack zip to S3 Bucket'
bucket 'prelert-artifacts'
upload bundlePack.outputs.files.singleFile, "maven/${project.group}/${packArtifactName}/${elasticsearchVersion}/${bundlePack.outputs.files.singleFile.name}"
upload bundlePack.outputs.files.singleFile, "maven/${project.group}/${packArtifactName}/${project.version}/${bundlePack.outputs.files.singleFile.name}"
}
task deploy(dependsOn: [uploadPackToS3, ':cpp:upload']) {

View File

@ -9,13 +9,13 @@ esplugin {
classname 'org.elasticsearch.xpack.prelert.PrelertPlugin'
}
version = "${elasticsearchVersion}"
version = project.version
thirdPartyAudit.enabled = false
dependencies {
compile group: 'net.sf.supercsv', name: 'super-csv', version:"${supercsvVersion}"
testCompile group: 'org.ini4j', name: 'ini4j', version:'0.5.2'
testCompile group: 'org.ini4j', name: 'ini4j', version:"${ini4jVersion}"
}
test {
@ -46,12 +46,12 @@ task downloadCppDist(type: DownloadS3Task) {
bucket 'prelert-artifacts'
destDir file("${buildDir}/cppDist")
flatten true
download "maven/${project.group}/prelert-cpp/${elasticsearchVersion}/prelert-cpp-windows-x86_64-${elasticsearchVersion}.zip"
download "maven/${project.group}/prelert-cpp/${elasticsearchVersion}/prelert-cpp-linux-x86_64-${elasticsearchVersion}.zip"
download "maven/${project.group}/prelert-cpp/${elasticsearchVersion}/prelert-cpp-darwin-x86_64-${elasticsearchVersion}.zip"
outputs.file(file("${buildDir}/cppDist/prelert-cpp-windows-x86_64-${elasticsearchVersion}.zip"))
outputs.file(file("${buildDir}/cppDist/prelert-cpp-darwin-x86_64-${elasticsearchVersion}.zip"))
outputs.file(file("${buildDir}/cppDist/prelert-cpp-linux-x86_64-${elasticsearchVersion}.zip"))
download "maven/${project.group}/prelert-cpp/${project.version}/prelert-cpp-windows-x86_64-${project.version}.zip"
download "maven/${project.group}/prelert-cpp/${project.version}/prelert-cpp-linux-x86_64-${project.version}.zip"
download "maven/${project.group}/prelert-cpp/${project.version}/prelert-cpp-darwin-x86_64-${project.version}.zip"
outputs.file(file("${buildDir}/cppDist/prelert-cpp-windows-x86_64-${project.version}.zip"))
outputs.file(file("${buildDir}/cppDist/prelert-cpp-darwin-x86_64-${project.version}.zip"))
outputs.file(file("${buildDir}/cppDist/prelert-cpp-linux-x86_64-${project.version}.zip"))
}
bundlePlugin {

View File

@ -1 +1,2 @@
supercsvVersion=2.4.0
ini4jVersion=0.5.2