Rename x-pack-common -> x-pack-core (elastic/x-pack-elasticsearch#3272)
The folder has to be named 'x-pack-core' (not 'core'), otherwise Gradle flips out and has circular dependencies. Relates to elastic/x-pack-elasticsearch#3233 Original commit: elastic/x-pack-elasticsearch@f756e5d356
This commit is contained in:
parent
a1d72fc004
commit
91d1812cb8
|
@ -51,7 +51,7 @@ subprojects {
|
||||||
additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
|
additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
|
||||||
}
|
}
|
||||||
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-pack-elasticsearch:plugin']
|
ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-pack-elasticsearch:plugin']
|
||||||
ext.projectSubstitutions += [ "org.elasticsearch:x-pack-common:${version}": ':x-pack-elasticsearch:plugin:common']
|
ext.projectSubstitutions += [ "org.elasticsearch:x-pack-core:${version}": ':x-pack-elasticsearch:plugin:x-pack-core']
|
||||||
|
|
||||||
for (final Version version : versionCollection.versionsIndexCompatibleWithCurrent) {
|
for (final Version version : versionCollection.versionsIndexCompatibleWithCurrent) {
|
||||||
if (version.branch != null) {
|
if (version.branch != null) {
|
||||||
|
|
|
@ -9,11 +9,11 @@ licenseHeaders.enabled = false
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
compile "org.elasticsearch:x-pack-common:${version}"
|
compile "org.elasticsearch:x-pack-core:${version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencyLicenses {
|
dependencyLicenses {
|
||||||
ignoreSha 'x-pack-common'
|
ignoreSha 'x-pack-core'
|
||||||
}
|
}
|
||||||
|
|
||||||
parent.bundlePlugin {
|
parent.bundlePlugin {
|
||||||
|
|
|
@ -7,21 +7,21 @@ test.enabled=false
|
||||||
licenseHeaders.enabled = false
|
licenseHeaders.enabled = false
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
nativeBundle {
|
nativeBundle {
|
||||||
resolutionStrategy.dependencySubstitution {
|
resolutionStrategy.dependencySubstitution {
|
||||||
if (findProject(':machine-learning-cpp') != null) {
|
if (findProject(':machine-learning-cpp') != null) {
|
||||||
substitute module("org.elasticsearch.ml:ml-cpp") with project(":machine-learning-cpp")
|
substitute module("org.elasticsearch.ml:ml-cpp") with project(":machine-learning-cpp")
|
||||||
} else {
|
} else {
|
||||||
substitute module("org.elasticsearch.ml:ml-cpp") with project("${project.path}:ml-cpp-snapshot")
|
substitute module("org.elasticsearch.ml:ml-cpp") with project("${project.path}:ml-cpp-snapshot")
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
compile "org.elasticsearch:x-pack-common:${version}"
|
compile "org.elasticsearch:x-pack-core:${version}"
|
||||||
|
|
||||||
// ml deps
|
// ml deps
|
||||||
compile 'net.sf.supercsv:super-csv:2.4.0'
|
compile 'net.sf.supercsv:super-csv:2.4.0'
|
||||||
|
@ -30,7 +30,7 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencyLicenses {
|
dependencyLicenses {
|
||||||
ignoreSha 'x-pack-common'
|
ignoreSha 'x-pack-core'
|
||||||
}
|
}
|
||||||
|
|
||||||
parent.bundlePlugin {
|
parent.bundlePlugin {
|
||||||
|
|
|
@ -12,7 +12,7 @@ licenseHeaders.enabled = false
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
compile "org.elasticsearch:x-pack-common:${version}"
|
compile "org.elasticsearch:x-pack-core:${version}"
|
||||||
|
|
||||||
// monitoring deps
|
// monitoring deps
|
||||||
compile "org.elasticsearch.client:elasticsearch-rest-client:${version}"
|
compile "org.elasticsearch.client:elasticsearch-rest-client:${version}"
|
||||||
|
@ -20,13 +20,13 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencyLicenses {
|
dependencyLicenses {
|
||||||
mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
|
mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
|
||||||
mapping from: /http.*/, to: 'httpclient' // pulled in by rest client
|
mapping from: /http.*/, to: 'httpclient' // pulled in by rest client
|
||||||
mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
|
mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
|
||||||
ignoreSha 'x-pack-common'
|
ignoreSha 'x-pack-core'
|
||||||
ignoreSha 'elasticsearch-rest-client'
|
ignoreSha 'elasticsearch-rest-client'
|
||||||
ignoreSha 'transport-netty4'
|
ignoreSha 'transport-netty4'
|
||||||
ignoreSha 'elasticsearch-rest-client-sniffer'
|
ignoreSha 'elasticsearch-rest-client-sniffer'
|
||||||
}
|
}
|
||||||
|
|
||||||
parent.bundlePlugin {
|
parent.bundlePlugin {
|
||||||
|
|
|
@ -9,7 +9,7 @@ licenseHeaders.enabled = false
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
compile "org.elasticsearch:x-pack-common:${version}"
|
compile "org.elasticsearch:x-pack-core:${version}"
|
||||||
// security deps
|
// security deps
|
||||||
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
|
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
|
||||||
compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
|
compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
|
||||||
|
@ -19,11 +19,11 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencyLicenses {
|
dependencyLicenses {
|
||||||
mapping from: /netty-.*/, to: 'netty'
|
mapping from: /netty-.*/, to: 'netty'
|
||||||
mapping from: /bc.*/, to: 'bouncycastle'
|
mapping from: /bc.*/, to: 'bouncycastle'
|
||||||
mapping from: /transport-netty.*/, to: 'elasticsearch'
|
mapping from: /transport-netty.*/, to: 'elasticsearch'
|
||||||
ignoreSha 'x-pack-common'
|
ignoreSha 'x-pack-core'
|
||||||
ignoreSha 'transport-netty4'
|
ignoreSha 'transport-netty4'
|
||||||
}
|
}
|
||||||
|
|
||||||
parent.bundlePlugin {
|
parent.bundlePlugin {
|
||||||
|
|
|
@ -8,13 +8,13 @@ licenseHeaders.enabled = false
|
||||||
|
|
||||||
dependencyLicenses {
|
dependencyLicenses {
|
||||||
mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
|
mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
|
||||||
ignoreSha 'x-pack-common'
|
ignoreSha 'x-pack-core'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
compile "org.elasticsearch:x-pack-common:${version}"
|
compile "org.elasticsearch:x-pack-core:${version}"
|
||||||
|
|
||||||
// watcher deps
|
// watcher deps
|
||||||
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
|
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
|
||||||
|
|
|
@ -4,7 +4,7 @@ dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
provided "org.elasticsearch:elasticsearch:${version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
archivesBaseName = 'x-pack-common'
|
archivesBaseName = 'x-pack-core'
|
||||||
|
|
||||||
// TODO: enable this once we have tests
|
// TODO: enable this once we have tests
|
||||||
test.enabled=false
|
test.enabled=false
|
Loading…
Reference in New Issue