dev up to ES 2.4.0 + Lucene 5.5.2

CHANGES.txt

@@ -1,3 +1,9 @@
+======================= Release 2.4.0 =======================
+
+Improvements
+
+* [GH-87] Upgrade to Elasticsearch 2.4.0 and Lucene 5.5.2
+
 ======================= Release 2.3.5 =======================
 
 Improvements

README.md

@@ -14,6 +14,7 @@ The following table shows the compatibility between releases of Elasticsearch an
 
 Elasticsearch|SIREn Join
 ---|---
+2.4.0|2.4.0
 2.3.5|2.3.5
 2.3.4|2.3.4
 2.3.3|2.3.3-1
@@ -28,14 +29,14 @@ Elasticsearch|SIREn Join
 
 You can use the following command to download the plugin from the online repository:
 
-    $ bin/plugin install solutions.siren/siren-join/2.3.5
+    $ bin/plugin install solutions.siren/siren-join/2.4.0
 
 ### Offline Download
 
 - Get the ZIPball from [maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22solutions.siren%22%20AND%20a%3A%22siren-join%22)
 - Install with the downloaded file
 
-    $ bin/plugin install file:/path/to/folder/with/siren-join-2.3.5.zip
+    $ bin/plugin install file:/path/to/folder/with/siren-join-2.4.0.zip
 
 ### Manual
 
@@ -49,7 +50,7 @@ $ mvn package
 
 This creates a single Zip file that can be installed using the Elasticsearch plugin command:
 
-    $ bin/plugin install file:/PATH-TO-SIRENJOIN-PROJECT/target/releases/siren-join-2.3.5.zip
+    $ bin/plugin install file:/PATH-TO-SIRENJOIN-PROJECT/target/releases/siren-join-2.4.0.zip
 
 ### Interacting with the Plugin
 

pom.xml

@@ -5,7 +5,7 @@
   <groupId>solutions.siren</groupId>
   <artifactId>siren-join</artifactId>
   <name>siren-join</name>
-  <version>2.3.5</version>
+  <version>2.4.0</version>
   <description>SIREn plugin that adds join capabilities to Elasticsearch</description>
   <url>http://github.com/sirensolutions/siren-join</url>
 
@@ -35,8 +35,8 @@
   </scm>
 
   <properties>
-    <lucene.version>5.5.0</lucene.version>
-    <elasticsearch.version>2.3.5</elasticsearch.version>
+    <lucene.version>5.5.2</lucene.version>
+    <elasticsearch.version>2.4.0</elasticsearch.version>
     <maven.compiler.target>1.7</maven.compiler.target>
 
     <siren.tools.directory>${project.basedir}/dev-tools</siren.tools.directory>

src/main/asciidoc/getting-started.asciidoc

@@ -9,15 +9,15 @@ the two collections within the Elasticsearch environment.
 === Prerequisites
 
 This guide requires that you have downloaded and
-installed the https://www.elastic.co/downloads/elasticsearch[Elasticsearch 2.3.5] distribution
+installed the https://www.elastic.co/downloads/elasticsearch[Elasticsearch 2.4.0] distribution
 on your computer. If you do not have an Elasticsearch distribution, you can run the following
 commands:
 
 [source,bash]
 -----------------------------------------------------------
-$ wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.5.zip
-$ unzip elasticsearch-2.3.5.zip
-$ cd elasticsearch-2.3.5
+$ wget https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.0.zip
+$ unzip elasticsearch-2.4.0.zip
+$ cd elasticsearch-2.4.0
 -----------------------------------------------------------
 
 [[siren-join-install]]
@@ -28,13 +28,13 @@ installation directory, you can run the following command:
 
 [source,bash]
 -----------------------------------------------------------
-$ bin/plugin install solutions.siren/siren-join/2.3.5
+$ bin/plugin install solutions.siren/siren-join/2.4.0
 
--> Installing solutions.siren/siren-join/2.3.5...
-Trying http://download.elasticsearch.org/solutions.siren/siren-join/siren-join-2.3.5.zip...
-Trying http://search.maven.org/remotecontent?filepath=solutions/siren/siren-join/2.3.5/siren-join-2.3.5.zip...
+-> Installing solutions.siren/siren-join/2.4.0...
+Trying http://download.elasticsearch.org/solutions.siren/siren-join/siren-join-2.4.0.zip...
+Trying http://search.maven.org/remotecontent?filepath=solutions/siren/siren-join/2.4.0/siren-join-2.4.0.zip...
 Downloading ..........................................................................................DONE
-Installed solutions.siren/siren-join/2.3.5 into /tmp/elasticsearch-2.3.5/plugins/siren-join
+Installed solutions.siren/siren-join/2.4.0 into /tmp/elasticsearch-2.4.0/plugins/siren-join
 -----------------------------------------------------------
 
 In case you want to remove the plugin, you can run the following command:

src/main/java/solutions/siren/join/action/admin/version/IndexVersionShardService.java

@@ -64,12 +64,12 @@ public void close() {
   private class VersioningIndexingOperationListener extends IndexingOperationListener {
 
     @Override
-    public void postIndex(Engine.Index index) {
+    public void postIndexUnderLock(Engine.Index index) {
       version.incrementAndGet();
     }
 
     @Override
-    public void postDelete(Engine.Delete delete) {
+    public void postDeleteUnderLock(Engine.Delete delete) {
       version.incrementAndGet();
     }