Gehel has submitted this change and it was merged.
Change subject: Upgrade to elastic 2.3.0
......................................................................
Upgrade to elastic 2.3.0
Bug: T132153
Change-Id: Ib6e6ae3941aa4dc01a16d532d70c7bcfab954e0d
---
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/weight/DefaultSimilarityTermWeigher.java
M pom.xml
6 files changed, 14 insertions(+), 17 deletions(-)
Approvals:
Gehel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index f1eb4f1..da0ac1d 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,8 @@
| Experimental Highlighter Plugin | ElasticSearch |
|---------------------------------|-----------------|
-| 2.2.0, master branch | 2.2.x |
+| 2.3.0, master branch | 2.3.x |
+| 2.2.0, 2.2 branch | 2.2.x |
| 2.1.0, 2.1 branch | 2.1.x |
| 2.0.0, 2.0 branch | 2.0.x |
| 1.7.0 -> 1.7.1, 1.7 branch | 1.7.X |
diff --git a/experimental-highlighter-core/pom.xml
b/experimental-highlighter-core/pom.xml
index 4732d08..f262cac 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.wikimedia.search.highlighter</groupId>
<artifactId>experimental</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>experimental-highlighter-core</artifactId>
<packaging>jar</packaging>
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 2ce9093..b0cb7db 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.wikimedia.search.highlighter</groupId>
<artifactId>experimental</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>experimental-highlighter-elasticsearch-plugin</artifactId>
<packaging>jar</packaging>
diff --git a/experimental-highlighter-lucene/pom.xml
b/experimental-highlighter-lucene/pom.xml
index 0f61688..0b9c09a 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.wikimedia.search.highlighter</groupId>
<artifactId>experimental</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>experimental-highlighter-lucene</artifactId>
<packaging>jar</packaging>
diff --git
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/weight/DefaultSimilarityTermWeigher.java
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/weight/DefaultSimilarityTermWeigher.java
index e55990e..18ff893 100644
---
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/weight/DefaultSimilarityTermWeigher.java
+++
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/weight/DefaultSimilarityTermWeigher.java
@@ -4,14 +4,14 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
+import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.util.BytesRef;
import
org.wikimedia.highlighter.experimental.lucene.WrappedExceptionFromLucene;
import org.wikimedia.search.highlighter.experimental.hit.TermWeigher;
/**
- * Weighs terms similarly to {@link DefaultSimilarity}.
+ * Weighs terms similarly to {@link ClassicSimilarity}.
*/
public class DefaultSimilarityTermWeigher implements TermWeigher<BytesRef> {
private final IndexReader reader;
diff --git a/pom.xml b/pom.xml
index ecbd007..74d121f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.wikimedia.search.highlighter</groupId>
<artifactId>experimental</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -49,10 +49,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <elasticsearch.version>2.2.1</elasticsearch.version>
+ <elasticsearch.version>2.3.0</elasticsearch.version>
<!-- For the Elasticsearch plugin to work this should match the version of
Lucene that Elasticsearch
uses. -->
- <lucene.version>5.4.1</lucene.version>
+ <lucene.version>5.5.0</lucene.version>
</properties>
<build>
@@ -122,7 +122,7 @@
<plugin>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>junit4-maven-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.3.2</version>
<executions>
<execution>
<id>tests</id>
@@ -133,13 +133,9 @@
<configuration>
<skipTests>${skip.unit.tests}</skipTests>
<listeners>
- <report-text showThrowable="true" showStackTraces="true"
- showOutput="onerror" showStatusOk="false"
showStatusError="true"
- showStatusFailure="true" showStatusIgnored="true"
showSuiteSummary="true"
- showNumFailures="30" timestamps="false">
+ <report-text showThrowable="true" showStackTraces="true"
showOutput="onerror" showStatusOk="false" showStatusError="true"
showStatusFailure="true" showStatusIgnored="true" showSuiteSummary="true"
showNumFailures="30" timestamps="false">
</report-text>
- <report-ant-xml mavenExtensions="true"
- dir="${project.build.directory}/surefire-reports" />
+ <report-ant-xml mavenExtensions="true"
dir="${project.build.directory}/surefire-reports" />
</listeners>
<heartbeat>20</heartbeat>
<jvmOutputAction>warn</jvmOutputAction>
@@ -305,7 +301,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
--
To view, visit https://gerrit.wikimedia.org/r/283164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6e6ae3941aa4dc01a16d532d70c7bcfab954e0d
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
