Skip to content

Commit 8a0dc33

Browse files
committed
Upgrade to lucene-7.3.0-snapshot-98a6b3d. (#29298)
Most notable changes include: - this release doesn't have the 7.2.1 version constant so I had to create one - spatial4j and jts were upgraded
1 parent 2173918 commit 8a0dc33

File tree

92 files changed

+164
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+164
-282
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public class PluginBuildPlugin extends BuildPlugin {
9595
// we "upgrade" these optional deps to provided for plugins, since they will run
9696
// with a full elasticsearch server that includes optional deps
9797
compileOnly "org.locationtech.spatial4j:spatial4j:${project.versions.spatial4j}"
98-
compileOnly "com.vividsolutions:jts:${project.versions.jts}"
98+
compileOnly "org.locationtech.jts:jts-core:${project.versions.jts}"
9999
compileOnly "org.apache.logging.log4j:log4j-api:${project.versions.log4j}"
100100
compileOnly "org.apache.logging.log4j:log4j-core:${project.versions.log4j}"
101101
compileOnly "org.elasticsearch:jna:${project.versions.jna}"

buildSrc/version.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
elasticsearch = 6.3.0
2-
lucene = 7.2.1
2+
lucene = 7.3.0-snapshot-98a6b3d
33

44
# optional dependencies
5-
spatial4j = 0.6
6-
jts = 1.13
5+
spatial4j = 0.7
6+
jts = 1.15.0
77
jackson = 2.8.10
88
snakeyaml = 1.17
99
# when updating log4j, please update also docs/java-api/index.asciidoc

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:version: 6.3.0
22
:major-version: 6.x
3-
:lucene_version: 7.2.1
4-
:lucene_version_path: 7_2_0
3+
:lucene_version: 7.3.0
4+
:lucene_version_path: 7_3_0
55
:branch: 6.x
66
:jdk: 1.8.0_131
77
:jdk_major: 8

docs/java-api/query-dsl/geo-shape-query.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ to your classpath in order to use this type:
1212
<dependency>
1313
<groupId>org.locationtech.spatial4j</groupId>
1414
<artifactId>spatial4j</artifactId>
15-
<version>0.6</version> <1>
15+
<version>0.7</version> <1>
1616
</dependency>
1717
1818
<dependency>
19-
<groupId>com.vividsolutions</groupId>
20-
<artifactId>jts</artifactId>
21-
<version>1.13</version> <2>
19+
<groupId>org.locationtech.jts</groupId>
20+
<artifactId>jts-core</artifactId>
21+
<version>1.15.0</version> <2>
2222
<exclusions>
2323
<exclusion>
2424
<groupId>xerces</groupId>
@@ -28,7 +28,7 @@ to your classpath in order to use this type:
2828
</dependency>
2929
-----------------------------------------------
3030
<1> check for updates in http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.locationtech.spatial4j%22%20AND%20a%3A%22spatial4j%22[Maven Central]
31-
<2> check for updates in http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.vividsolutions%22%20AND%20a%3A%22jts%22[Maven Central]
31+
<2> check for updates in http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.locationtech.jts%22%20AND%20a%3A%22jts-core%22[Maven Central]
3232

3333
[source,java]
3434
--------------------------------------------------

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TrimTokenFilterFactory.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
import org.elasticsearch.env.Environment;
2626
import org.elasticsearch.index.IndexSettings;
2727
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
28+
import org.elasticsearch.index.analysis.MultiTermAwareComponent;
2829

29-
public class TrimTokenFilterFactory extends AbstractTokenFilterFactory {
30+
public class TrimTokenFilterFactory extends AbstractTokenFilterFactory implements MultiTermAwareComponent {
3031

3132
private static final String UPDATE_OFFSETS_KEY = "update_offsets";
3233

@@ -41,4 +42,9 @@ public class TrimTokenFilterFactory extends AbstractTokenFilterFactory {
4142
public TokenStream create(TokenStream tokenStream) {
4243
return new TrimFilter(tokenStream);
4344
}
45+
46+
@Override
47+
public Object getMultiTermComponent() {
48+
return this;
49+
}
4450
}

modules/lang-expression/licenses/lucene-expressions-7.2.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
38ff5a1f4bcbfb6e1ffacd3263175c2a1ba23e9f

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.2.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ece1b4232697fad170c589f0df887efa6e66dd4f

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.2.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)