parent
3169e4c70e
commit
bd2dd81bc6
|
@ -108,8 +108,8 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
|
|||
tasks.withType(AbstractArchiveTask).configureEach {
|
||||
dependsOn createLogsDir, createPluginsDir, createJvmOptionsDir
|
||||
String subdir = it.name.substring('build'.size()).replaceAll(/[A-Z]/) { '-' + it.toLowerCase() }.substring(1)
|
||||
destinationDir = file("${subdir}/build/distributions")
|
||||
baseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}"
|
||||
destinationDirectory = file("${subdir}/build/distributions")
|
||||
archiveBaseName = "elasticsearch${subdir.contains('oss') ? '-oss' : ''}"
|
||||
}
|
||||
|
||||
Closure commonZipConfig = {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apply plugin: 'base'
|
||||
|
||||
task buildDockerBuildContext(type: Tar) {
|
||||
extension = 'tar.gz'
|
||||
archiveExtension = 'tar.gz'
|
||||
compression = Compression.GZIP
|
||||
archiveClassifier = "docker-build-context"
|
||||
archiveBaseName = "elasticsearch"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apply plugin: 'base'
|
||||
|
||||
task buildOssDockerBuildContext(type: Tar) {
|
||||
extension = 'tar.gz'
|
||||
archiveExtension = 'tar.gz'
|
||||
compression = Compression.GZIP
|
||||
archiveClassifier = "docker-build-context"
|
||||
archiveBaseName = "elasticsearch-oss"
|
||||
|
|
|
@ -50,7 +50,7 @@ dependencies {
|
|||
}
|
||||
|
||||
war {
|
||||
archiveName 'example-app.war'
|
||||
archiveFileName = 'example-app.war'
|
||||
}
|
||||
|
||||
elasticsearch_distributions {
|
||||
|
|
|
@ -13,7 +13,7 @@ project.forbiddenPatterns {
|
|||
tasks.named("dependencyLicenses").configure { it.enabled = false }
|
||||
|
||||
task buildZip(type: Zip, dependsOn: jar) {
|
||||
String parentDir = "license-tools-${version}"
|
||||
String parentDir = "license-tools-${archiveVersion}"
|
||||
into(parentDir + '/lib') {
|
||||
from jar
|
||||
from configurations.runtime
|
||||
|
|
Loading…
Reference in New Issue