Browse Source

Upgrade to Lucene-7.5.0-snapshot-b9e064b935 (#31839)

This snapshot includes LUCENE-8384 which blocks work in Lucene rollback.
Nhat Nguyen 7 years ago
parent
commit
5875399738
54 changed files with 30 additions and 30 deletions
  1. 1 1
      buildSrc/version.properties
  2. 2 2
      docs/Versions.asciidoc
  3. 0 1
      modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1
  4. 1 0
      modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-b9e064b935.jar.sha1
  5. 1 1
      plugins/analysis-icu/build.gradle
  6. 0 1
      plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1
  7. 1 0
      plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1
  8. 0 1
      plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1
  9. 1 0
      plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-b9e064b935.jar.sha1
  10. 0 1
      plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1
  11. 1 0
      plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-b9e064b935.jar.sha1
  12. 0 1
      plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1
  13. 1 0
      plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-b9e064b935.jar.sha1
  14. 0 1
      plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1
  15. 1 0
      plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-b9e064b935.jar.sha1
  16. 0 1
      plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1
  17. 1 0
      plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-b9e064b935.jar.sha1
  18. 0 1
      plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1
  19. 1 0
      plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-b9e064b935.jar.sha1
  20. 0 1
      plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1
  21. 1 0
      plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-b9e064b935.jar.sha1
  22. 0 1
      server/licenses/lucene-analyzers-common-7.4.0.jar.sha1
  23. 1 0
      server/licenses/lucene-analyzers-common-7.5.0-snapshot-b9e064b935.jar.sha1
  24. 0 1
      server/licenses/lucene-backward-codecs-7.4.0.jar.sha1
  25. 1 0
      server/licenses/lucene-backward-codecs-7.5.0-snapshot-b9e064b935.jar.sha1
  26. 0 1
      server/licenses/lucene-core-7.4.0.jar.sha1
  27. 1 0
      server/licenses/lucene-core-7.5.0-snapshot-b9e064b935.jar.sha1
  28. 0 1
      server/licenses/lucene-grouping-7.4.0.jar.sha1
  29. 1 0
      server/licenses/lucene-grouping-7.5.0-snapshot-b9e064b935.jar.sha1
  30. 0 1
      server/licenses/lucene-highlighter-7.4.0.jar.sha1
  31. 1 0
      server/licenses/lucene-highlighter-7.5.0-snapshot-b9e064b935.jar.sha1
  32. 0 1
      server/licenses/lucene-join-7.4.0.jar.sha1
  33. 1 0
      server/licenses/lucene-join-7.5.0-snapshot-b9e064b935.jar.sha1
  34. 0 1
      server/licenses/lucene-memory-7.4.0.jar.sha1
  35. 1 0
      server/licenses/lucene-memory-7.5.0-snapshot-b9e064b935.jar.sha1
  36. 0 1
      server/licenses/lucene-misc-7.4.0.jar.sha1
  37. 1 0
      server/licenses/lucene-misc-7.5.0-snapshot-b9e064b935.jar.sha1
  38. 0 1
      server/licenses/lucene-queries-7.4.0.jar.sha1
  39. 1 0
      server/licenses/lucene-queries-7.5.0-snapshot-b9e064b935.jar.sha1
  40. 0 1
      server/licenses/lucene-queryparser-7.4.0.jar.sha1
  41. 1 0
      server/licenses/lucene-queryparser-7.5.0-snapshot-b9e064b935.jar.sha1
  42. 0 1
      server/licenses/lucene-sandbox-7.4.0.jar.sha1
  43. 1 0
      server/licenses/lucene-sandbox-7.5.0-snapshot-b9e064b935.jar.sha1
  44. 0 1
      server/licenses/lucene-spatial-7.4.0.jar.sha1
  45. 1 0
      server/licenses/lucene-spatial-7.5.0-snapshot-b9e064b935.jar.sha1
  46. 0 1
      server/licenses/lucene-spatial-extras-7.4.0.jar.sha1
  47. 1 0
      server/licenses/lucene-spatial-extras-7.5.0-snapshot-b9e064b935.jar.sha1
  48. 0 1
      server/licenses/lucene-spatial3d-7.4.0.jar.sha1
  49. 1 0
      server/licenses/lucene-spatial3d-7.5.0-snapshot-b9e064b935.jar.sha1
  50. 0 1
      server/licenses/lucene-suggest-7.4.0.jar.sha1
  51. 1 0
      server/licenses/lucene-suggest-7.5.0-snapshot-b9e064b935.jar.sha1
  52. 1 1
      server/src/main/java/org/elasticsearch/Version.java
  53. 0 1
      x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1
  54. 1 0
      x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-b9e064b935.jar.sha1

+ 1 - 1
buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0-alpha1
-lucene            = 7.4.0
+lucene            = 7.5.0-snapshot-b9e064b935
 
 # optional dependencies
 spatial4j         = 0.7

+ 2 - 2
docs/Versions.asciidoc

@@ -1,7 +1,7 @@
 :version:               7.0.0-alpha1
 :major-version:         7.x
-:lucene_version:        7.4.0
-:lucene_version_path:   7_4_0
+:lucene_version:        7.5.0
+:lucene_version_path:   7_5_0
 :branch:                master
 :jdk:                   1.8.0_131
 :jdk_major:             8

+ 0 - 1
modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1

@@ -1 +0,0 @@
-9f0a326f7ec1671ffb07f95b27f1a5812b7dc1c3

+ 1 - 0
modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+3ef67619b7f6d891a0bc1f8c19bf6ab6a7106de1

+ 1 - 1
plugins/analysis-icu/build.gradle

@@ -30,7 +30,7 @@ forbiddenApis {
 
 dependencies {
   compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
-  compile 'com.ibm.icu:icu4j:61.1'
+  compile 'com.ibm.icu:icu4j:62.1'
 }
 
 dependencyLicenses {

+ 0 - 1
plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1

@@ -1 +0,0 @@
-28d33b5e44e72edcc66a5da7a34a42147f38d987

+ 1 - 0
plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1

@@ -0,0 +1 @@
+7a4d00d5ec5febd252a6182e8b6e87a0a9821f81

+ 0 - 1
plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1

@@ -1 +0,0 @@
-394e811e9d9bf0b9fba837f7ceca9e8f3e39d1c2

+ 1 - 0
plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+332410cfb49be3ec445ccf4a10164baf8e1b2f81

+ 0 - 1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1

@@ -1 +0,0 @@
-5cd56acfa16ba20e19b5d21d90b510eada841431

+ 1 - 0
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+b77a0a1c35a76cff47a61134da83fb1b414312cf

+ 0 - 1
plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1

@@ -1 +0,0 @@
-db7b56f4cf533ad9022d2312c5ee48331edccca3

+ 1 - 0
plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+644f7bfdd2a35784c64e45a924859d85776955a8

+ 0 - 1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1

@@ -1 +0,0 @@
-e8dba4d28a595eab2e8fb6095d1ac5f2d3872144

+ 1 - 0
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+6bbe2a89387a4aa7ddca3ec519e03df75b21020a

+ 0 - 1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1

@@ -1 +0,0 @@
-1243c771ee824c46a3d66ae3e4256d919fc06fbe

+ 1 - 0
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+dd36711a33c2ba2b32f3cf16892923c69b573075

+ 0 - 1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1

@@ -1 +0,0 @@
-c783794b0d20d8dc1285edc7701f386b1f0e2fb8

+ 1 - 0
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+1d3aa77ed0374da5f1e3224f9548caaa61494ce7

+ 0 - 1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1

@@ -1 +0,0 @@
-9438efa504a89afb6cb4c66448c257f865164d23

+ 1 - 0
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+aeeca8f686c68c940451322104392ba3ed3d602c

+ 0 - 1
server/licenses/lucene-analyzers-common-7.4.0.jar.sha1

@@ -1 +0,0 @@
-e1afb580df500626a1c695e0fc9a7e8a8f58bcac

+ 1 - 0
server/licenses/lucene-analyzers-common-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+0cf871ea421568e15d4e1082bbd578cabef563ae

+ 0 - 1
server/licenses/lucene-backward-codecs-7.4.0.jar.sha1

@@ -1 +0,0 @@
-a6ad941ef1fdad48673ed511631b7e48a9456bf7

+ 1 - 0
server/licenses/lucene-backward-codecs-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+996a66191c4f06769374204dd16be8b4f8d3cbd6

+ 0 - 1
server/licenses/lucene-core-7.4.0.jar.sha1

@@ -1 +0,0 @@
-730d9ac80436c8cbc0b2a8a749259be536b97316

+ 1 - 0
server/licenses/lucene-core-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+d954838b60bc2681f4eddc1af76958b2cb36e385

+ 0 - 1
server/licenses/lucene-grouping-7.4.0.jar.sha1

@@ -1 +0,0 @@
-56f99858a4421a517b52da36a222debcccab80c6

+ 1 - 0
server/licenses/lucene-grouping-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+0b4fa3b0e68a9933bbb4f97be4c821060ec33ead

+ 0 - 1
server/licenses/lucene-highlighter-7.4.0.jar.sha1

@@ -1 +0,0 @@
-5266b45d7f049662817d739881765904621876d0

+ 1 - 0
server/licenses/lucene-highlighter-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+1ac754cc9e64e994fcfb3a494bd22d9e63f51e57

+ 0 - 1
server/licenses/lucene-join-7.4.0.jar.sha1

@@ -1 +0,0 @@
-c77154d18c4944ceb6ce0741060632f57d623fdc

+ 1 - 0
server/licenses/lucene-join-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+5f632e7809257ff31613e04cdc81be8181e7b76a

+ 0 - 1
server/licenses/lucene-memory-7.4.0.jar.sha1

@@ -1 +0,0 @@
-186ff981feec1bdbf1a6236e786ec171b5fbe3e0

+ 1 - 0
server/licenses/lucene-memory-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+b1414f30a441c74acdf36270a6f7197fa12b6bbe

+ 0 - 1
server/licenses/lucene-misc-7.4.0.jar.sha1

@@ -1 +0,0 @@
-bf844bb6f6d84da19e8c79ce5fbb4cf6d00f2611

+ 1 - 0
server/licenses/lucene-misc-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+b34840bcf4d0e754df8214b4a4ea646cdb6a5dfa

+ 0 - 1
server/licenses/lucene-queries-7.4.0.jar.sha1

@@ -1 +0,0 @@
-229a50e6d9d4db076f671c230d493000c6e2972c

+ 1 - 0
server/licenses/lucene-queries-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+1e303bc0028a5d81408f41ad5d96dec1ae141dd8

+ 0 - 1
server/licenses/lucene-queryparser-7.4.0.jar.sha1

@@ -1 +0,0 @@
-8e58add0d0c39df97d07c8e343041989bf4b3a3f

+ 1 - 0
server/licenses/lucene-queryparser-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+d873d397f02fb5c1c014276f7108193a378942e1

+ 0 - 1
server/licenses/lucene-sandbox-7.4.0.jar.sha1

@@ -1 +0,0 @@
-1692604fa06a945d1ee19939022ef1a912235db3

+ 1 - 0
server/licenses/lucene-sandbox-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+b9e10faf31108795ae6fd445de3743a5f5e7e672

+ 0 - 1
server/licenses/lucene-spatial-7.4.0.jar.sha1

@@ -1 +0,0 @@
-847d2f897961124e2fc7d5e55d8309635bb026bc

+ 1 - 0
server/licenses/lucene-spatial-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+6e375f38d95d8ae1bacb3259c89e7ef0a89c7ac0

+ 0 - 1
server/licenses/lucene-spatial-extras-7.4.0.jar.sha1

@@ -1 +0,0 @@
-586892eefc0546643d7f5d7f83659c7db0d534ff

+ 1 - 0
server/licenses/lucene-spatial-extras-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+d335c114a2fe51dea8fc7ddb6d60b1c5b2ae29d2

+ 0 - 1
server/licenses/lucene-spatial3d-7.4.0.jar.sha1

@@ -1 +0,0 @@
-32cd2854f39ff453a5d128ce40e11eea4168abbf

+ 1 - 0
server/licenses/lucene-spatial3d-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+8648cf47ca1300e578059834c9ad9c0b566ee2cf

+ 0 - 1
server/licenses/lucene-suggest-7.4.0.jar.sha1

@@ -1 +0,0 @@
-0cdc1a512032f8b23dd4b1add0f5cd06325addc3

+ 1 - 0
server/licenses/lucene-suggest-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+504eb2913530aaf4f314254ec121a01581a7f5d3

+ 1 - 1
server/src/main/java/org/elasticsearch/Version.java

@@ -178,7 +178,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_6_4_0 = new Version(V_6_4_0_ID, org.apache.lucene.util.Version.LUCENE_7_4_0);
     public static final int V_7_0_0_alpha1_ID = 7000001;
     public static final Version V_7_0_0_alpha1 =
-        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_4_0);
+        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
     public static final Version CURRENT = V_7_0_0_alpha1;
 
     static {

+ 0 - 1
x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1

@@ -1 +0,0 @@
-730d9ac80436c8cbc0b2a8a749259be536b97316

+ 1 - 0
x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-b9e064b935.jar.sha1

@@ -0,0 +1 @@
+d954838b60bc2681f4eddc1af76958b2cb36e385