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:
Lee Hinman 2017-12-08 14:42:50 -07:00 committed by GitHub
parent a1d72fc004
commit 91d1812cb8
17 changed files with 30 additions and 30 deletions

View File

@ -51,7 +51,7 @@ subprojects {
additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
}
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) {
if (version.branch != null) {

View File

@ -9,11 +9,11 @@ licenseHeaders.enabled = false
dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
compile "org.elasticsearch:x-pack-common:${version}"
compile "org.elasticsearch:x-pack-core:${version}"
}
dependencyLicenses {
ignoreSha 'x-pack-common'
ignoreSha 'x-pack-core'
}
parent.bundlePlugin {

View File

@ -21,7 +21,7 @@ configurations {
dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
compile "org.elasticsearch:x-pack-common:${version}"
compile "org.elasticsearch:x-pack-core:${version}"
// ml deps
compile 'net.sf.supercsv:super-csv:2.4.0'
@ -30,7 +30,7 @@ dependencies {
}
dependencyLicenses {
ignoreSha 'x-pack-common'
ignoreSha 'x-pack-core'
}
parent.bundlePlugin {

View File

@ -12,7 +12,7 @@ licenseHeaders.enabled = false
dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
compile "org.elasticsearch:x-pack-common:${version}"
compile "org.elasticsearch:x-pack-core:${version}"
// monitoring deps
compile "org.elasticsearch.client:elasticsearch-rest-client:${version}"
@ -23,7 +23,7 @@ dependencyLicenses {
mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
mapping from: /http.*/, to: 'httpclient' // 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 'transport-netty4'
ignoreSha 'elasticsearch-rest-client-sniffer'

View File

@ -9,7 +9,7 @@ licenseHeaders.enabled = false
dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
compile "org.elasticsearch:x-pack-common:${version}"
compile "org.elasticsearch:x-pack-core:${version}"
// security deps
compile project(path: ':modules:transport-netty4', configuration: 'runtime')
compile 'com.unboundid:unboundid-ldapsdk:3.2.0'
@ -22,7 +22,7 @@ dependencyLicenses {
mapping from: /netty-.*/, to: 'netty'
mapping from: /bc.*/, to: 'bouncycastle'
mapping from: /transport-netty.*/, to: 'elasticsearch'
ignoreSha 'x-pack-common'
ignoreSha 'x-pack-core'
ignoreSha 'transport-netty4'
}

View File

@ -8,13 +8,13 @@ licenseHeaders.enabled = false
dependencyLicenses {
mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
ignoreSha 'x-pack-common'
ignoreSha 'x-pack-core'
}
dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
compile "org.elasticsearch:x-pack-common:${version}"
compile "org.elasticsearch:x-pack-core:${version}"
// watcher deps
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'

View File

@ -4,7 +4,7 @@ dependencies {
provided "org.elasticsearch:elasticsearch:${version}"
}
archivesBaseName = 'x-pack-common'
archivesBaseName = 'x-pack-core'
// TODO: enable this once we have tests
test.enabled=false