From ebbb49da187885787dfedf736be8b4e6e484b36b Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 16 Jan 2018 11:52:39 -0500 Subject: [PATCH] SQL: fix compilation after merging master New version of lucene and new dependency `elasticsearch-core`. Original commit: elastic/x-pack-elasticsearch@95b940bd42092bf4522253c89e2388d104c882e0 --- sql/cli/build.gradle | 2 ++ sql/cli/licenses/lucene-core-7.2.0.jar.sha1 | 1 - sql/cli/licenses/lucene-core-7.2.1.jar.sha1 | 1 + sql/rest-proto/build.gradle | 10 ++++++---- sql/rest-proto/licenses/lucene-core-7.2.0.jar.sha1 | 1 - sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1 | 1 + sql/shared-client/build.gradle | 2 ++ sql/shared-client/licenses/lucene-core-7.2.0.jar.sha1 | 1 - sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1 | 1 + 9 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 sql/cli/licenses/lucene-core-7.2.0.jar.sha1 create mode 100644 sql/cli/licenses/lucene-core-7.2.1.jar.sha1 delete mode 100644 sql/rest-proto/licenses/lucene-core-7.2.0.jar.sha1 create mode 100644 sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1 delete mode 100644 sql/shared-client/licenses/lucene-core-7.2.0.jar.sha1 create mode 100644 sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1 diff --git a/sql/cli/build.gradle b/sql/cli/build.gradle index e8829b1c89d..84a3c3a47cb 100644 --- a/sql/cli/build.gradle +++ b/sql/cli/build.gradle @@ -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' } diff --git a/sql/cli/licenses/lucene-core-7.2.0.jar.sha1 b/sql/cli/licenses/lucene-core-7.2.0.jar.sha1 deleted file mode 100644 index 41e1103ca25..00000000000 --- a/sql/cli/licenses/lucene-core-7.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f88107aa577ce8edc0a5cee036b485943107a552 \ No newline at end of file diff --git a/sql/cli/licenses/lucene-core-7.2.1.jar.sha1 b/sql/cli/licenses/lucene-core-7.2.1.jar.sha1 new file mode 100644 index 00000000000..e2fd2d75337 --- /dev/null +++ b/sql/cli/licenses/lucene-core-7.2.1.jar.sha1 @@ -0,0 +1 @@ +91897dbbbbada95ccddbd90505f0a0ba6bf7c199 \ No newline at end of file diff --git a/sql/rest-proto/build.gradle b/sql/rest-proto/build.gradle index 9e97e10827a..57fcebd586f 100644 --- a/sql/rest-proto/build.gradle +++ b/sql/rest-proto/build.gradle @@ -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 = [ diff --git a/sql/rest-proto/licenses/lucene-core-7.2.0.jar.sha1 b/sql/rest-proto/licenses/lucene-core-7.2.0.jar.sha1 deleted file mode 100644 index 41e1103ca25..00000000000 --- a/sql/rest-proto/licenses/lucene-core-7.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f88107aa577ce8edc0a5cee036b485943107a552 \ No newline at end of file diff --git a/sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1 b/sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1 new file mode 100644 index 00000000000..e2fd2d75337 --- /dev/null +++ b/sql/rest-proto/licenses/lucene-core-7.2.1.jar.sha1 @@ -0,0 +1 @@ +91897dbbbbada95ccddbd90505f0a0ba6bf7c199 \ No newline at end of file diff --git a/sql/shared-client/build.gradle b/sql/shared-client/build.gradle index 98266d30f56..d9c4608d189 100644 --- a/sql/shared-client/build.gradle +++ b/sql/shared-client/build.gradle @@ -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 { diff --git a/sql/shared-client/licenses/lucene-core-7.2.0.jar.sha1 b/sql/shared-client/licenses/lucene-core-7.2.0.jar.sha1 deleted file mode 100644 index 41e1103ca25..00000000000 --- a/sql/shared-client/licenses/lucene-core-7.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f88107aa577ce8edc0a5cee036b485943107a552 \ No newline at end of file diff --git a/sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1 b/sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1 new file mode 100644 index 00000000000..e2fd2d75337 --- /dev/null +++ b/sql/shared-client/licenses/lucene-core-7.2.1.jar.sha1 @@ -0,0 +1 @@ +91897dbbbbada95ccddbd90505f0a0ba6bf7c199 \ No newline at end of file