SQL: fix compilation after merging master

New version of lucene and new dependency `elasticsearch-core`.

Original commit: elastic/x-pack-elasticsearch@95b940bd42
This commit is contained in:
Nik Everett 2018-01-16 11:52:39 -05:00
parent e91269e022
commit ebbb49da18
9 changed files with 13 additions and 7 deletions

View File

@ -17,6 +17,7 @@ dependencies {
dependencyLicenses {
mapping from: /rest-proto.*/, to: 'elasticsearch'
mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
mapping from: /shared-client.*/, to: 'elasticsearch'
mapping from: /shared-proto.*/, to: 'elasticsearch'
mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
@ -26,6 +27,7 @@ dependencyLicenses {
ignoreSha 'shared-client'
ignoreSha 'shared-proto'
ignoreSha 'elasticsearch-cli'
ignoreSha 'elasticsearch-core'
ignoreSha 'elasticsearch'
}

View File

@ -1 +0,0 @@
f88107aa577ce8edc0a5cee036b485943107a552

View File

@ -0,0 +1 @@
91897dbbbbada95ccddbd90505f0a0ba6bf7c199

View File

@ -6,6 +6,9 @@ dependencies {
compile (project(':server')) {
transitive = false
}
compile (project(':libs:elasticsearch-core')) {
transitive = false
}
compile "org.apache.lucene:lucene-core:${versions.lucene}"
compile 'joda-time:joda-time:2.9.5'
runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
@ -17,13 +20,12 @@ dependencies {
dependencyLicenses {
mapping from: /shared-proto.*/, to: 'elasticsearch'
ignoreSha 'shared-proto'
}
dependencyLicenses {
mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
mapping from: /jackson-.*/, to: 'jackson'
mapping from: /lucene-.*/, to: 'lucene'
ignoreSha 'shared-proto'
ignoreSha 'elasticsearch'
ignoreSha 'elasticsearch-core'
}
thirdPartyAudit.excludes = [

View File

@ -1 +0,0 @@
f88107aa577ce8edc0a5cee036b485943107a552

View File

@ -0,0 +1 @@
91897dbbbbada95ccddbd90505f0a0ba6bf7c199

View File

@ -10,10 +10,12 @@ dependencyLicenses {
mapping from: /rest-proto.*/, to: 'elasticsearch'
mapping from: /shared-proto.*/, to: 'elasticsearch'
mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
mapping from: /lucene-.*/, to: 'lucene'
ignoreSha 'rest-proto'
ignoreSha 'shared-proto'
ignoreSha 'elasticsearch'
ignoreSha 'elasticsearch-core'
}
forbiddenApisMain {

View File

@ -1 +0,0 @@
f88107aa577ce8edc0a5cee036b485943107a552

View File

@ -0,0 +1 @@
91897dbbbbada95ccddbd90505f0a0ba6bf7c199