jenkins-bot has submitted this change and it was merged.
Change subject: Setup 2.2 branch for 2.2.2 release
......................................................................
Setup 2.2 branch for 2.2.2 release
Change-Id: Id7df1124867060d4a7bd760e9d0cfb5d408d0cb2
---
M .gitreview
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
6 files changed, 9 insertions(+), 13 deletions(-)
Approvals:
DCausse: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitreview b/.gitreview
index 884c139..6d8a2df 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=search/highlighter.git
-defaultbranch=master
+defaultbranch=2.2
defaultrebase=0
diff --git a/README.md b/README.md
index f1eb4f1..cce0d30 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
| Experimental Highlighter Plugin | ElasticSearch |
|---------------------------------|-----------------|
-| 2.2.0, master branch | 2.2.x |
+| 2.2.2, 2.2 branch | 2.2.2 |
| 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..f92afa7 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.2.2-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..33b2af6 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.2.2-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..e5ad596 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.2.2-SNAPSHOT</version>
</parent>
<artifactId>experimental-highlighter-lucene</artifactId>
<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index ecbd007..65d5786 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.2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -49,7 +49,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <elasticsearch.version>2.2.1</elasticsearch.version>
+ <elasticsearch.version>2.2.2</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>
@@ -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>
--
To view, visit https://gerrit.wikimedia.org/r/291848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7df1124867060d4a7bd760e9d0cfb5d408d0cb2
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: 2.2
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
