[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.0

2016-09-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Upgrade to elastic 2.4.0
..


Upgrade to elastic 2.4.0

Change-Id: I2da4c8716b880022a9f4b175a86414c9340a6ad6
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M 
experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 6 insertions(+), 7 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index 0ffa2da..4cd6a8f 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index b749c99..1064f62 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
 
b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
index 6c65796..d8ae36e 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.mock.orig.Mockito;
 import org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 4d2bbae..23c2ba5 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index a177322..492ca20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.3.5-SNAPSHOT
+  2.4.0-SNAPSHOT
   pom
 
   
@@ -50,10 +50,10 @@
 
   
 UTF-8
-2.3.4
+2.4.0
 
-5.5.0
+5.5.2
 1.7
 1.7
   

-- 
To view, visit https://gerrit.wikimedia.org/r/309339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2da4c8716b880022a9f4b175a86414c9340a6ad6
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.0

2016-09-08 Thread DCausse (Code Review) 
DCausse has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/309339

Change subject: Upgrade to elastic 2.4.0
..

Upgrade to elastic 2.4.0

Change-Id: I2da4c8716b880022a9f4b175a86414c9340a6ad6
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M 
experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/39/309339/1

diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index 0ffa2da..4cd6a8f 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index b749c99..1064f62 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
 
b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
index 6c65796..d8ae36e 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/test/java/org/wikimedia/highlighter/experimental/elasticsearch/AbstractExperimentalHighlighterIntegrationTestBase.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.mock.orig.Mockito;
 import org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 4d2bbae..23c2ba5 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.3.5-SNAPSHOT
+2.4.0-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index a177322..492ca20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.3.5-SNAPSHOT
+  2.4.0-SNAPSHOT
   pom
 
   
@@ -50,10 +50,10 @@
 
   
 UTF-8
-2.3.4
+2.4.0
 
-5.5.0
+5.5.2
 1.7
 1.7
   

-- 
To view, visit https://gerrit.wikimedia.org/r/309339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2da4c8716b880022a9f4b175a86414c9340a6ad6
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits