mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-09 14:34:43 +00:00
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:
parent
e91269e022
commit
ebbb49da18
@ -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'
|
||||
}
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
f88107aa577ce8edc0a5cee036b485943107a552
|
1
sql/cli/licenses/lucene-core-7.2.1.jar.sha1
Normal file
1
sql/cli/licenses/lucene-core-7.2.1.jar.sha1
Normal file
@ -0,0 +1 @@
|
||||
91897dbbbbada95ccddbd90505f0a0ba6bf7c199
|
@ -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 = [
|
||||
|
@ -1 +0,0 @@
|
||||
f88107aa577ce8edc0a5cee036b485943107a552
|
1
sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1
Normal file
1
sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1
Normal file
@ -0,0 +1 @@
|
||||
91897dbbbbada95ccddbd90505f0a0ba6bf7c199
|
@ -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 {
|
||||
|
@ -1 +0,0 @@
|
||||
f88107aa577ce8edc0a5cee036b485943107a552
|
1
sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1
Normal file
1
sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1
Normal file
@ -0,0 +1 @@
|
||||
91897dbbbbada95ccddbd90505f0a0ba6bf7c199
|
Loading…
x
Reference in New Issue
Block a user