Merge pull request #92 from vvanholl/master

Update to Elasticsearch 2.1.1

Author: jprante

README.md

@@ -27,15 +27,16 @@ When importing archive files again, this information is reapplied.
 
 | Elasticsearch  |   Plugin       | Release date |
 | -------------- | -------------- | ------------ |
-| 2.1.0          | 2.2.0.0        | Dec  7, 2015 |
+| 2.1.1          | 2.1.1.0        | Dec 30, 2015 |
+| 2.1.0          | 2.1.0.0        | Dec  7, 2015 |
 | 2.0.0          | 2.0.0.0        | Nov 14, 2015 |
 | 2.0.0-rc1      | 2.0.0-rc1.0    | Oct 12, 2015 |
 
 For older releases and 1.x versions, see the repective branches.
 
 ## Installation 2.x
 
-    ./bin/plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-knapsack/2.1.0.0/elasticsearch-knapsack-2.1.0.0-plugin.zip
+    ./bin/plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-knapsack/2.1.1.0/elasticsearch-knapsack-2.1.1.0-plugin.zip
 
 Do not forget to restart the node after installation.
 

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>org.xbib.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-knapsack</artifactId>
-    <version>2.1.0.0</version>
+    <version>2.1.1.0</version>
 
     <packaging>jar</packaging>
 
@@ -58,7 +58,7 @@
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.compiler.version>1.7</java.compiler.version>
-        <elasticsearch.version>2.1.0</elasticsearch.version>
+        <elasticsearch.version>2.1.1</elasticsearch.version>
     </properties>
 
     <dependencies>

src/test/java/org/elasticsearch/node/MockNode.java

@@ -3,14 +3,15 @@
 
 import org.elasticsearch.Version;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.Environment;
 import org.elasticsearch.plugins.Plugin;
 
 import java.util.Collection;
 
 public class MockNode extends Node {
 
-    public MockNode(Settings settings, Collection<Class<? extends Plugin>> classpathPlugins) {
-        super(settings, Version.CURRENT, classpathPlugins);
+    public MockNode(Environment tmpEnv, Collection<Class<? extends Plugin>> classpathPlugins) {
+        super(tmpEnv, Version.CURRENT, classpathPlugins);
     }
 
 }

src/test/java/org/xbib/elasticsearch/util/NodeTestUtils.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.env.Environment;
 import org.elasticsearch.node.MockNode;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.plugins.Plugin;
@@ -146,7 +147,8 @@ public static Node createNode() {
         //Node node = NodeBuilder.nodeBuilder().settings(nodeSettings).local(true).build().start();
         Set<Class<? extends Plugin>> plugins = new HashSet<>();
         plugins.add(KnapsackPlugin.class);
-        Node node = new MockNode(nodeSettings, plugins);
+        Environment environment = new Environment(nodeSettings);
+        Node node = new MockNode(environment, plugins);
         node.start();
         return node;
     }
@@ -196,7 +198,8 @@ private Node buildNode(String id) throws IOException {
         // ES 2.1 renders NodeBuilder as useless
         Set<Class<? extends Plugin>> plugins = new HashSet<>();
         plugins.add(KnapsackPlugin.class);
-        Node node = new MockNode(nodeSettings, plugins);
+        Environment environment = new Environment(nodeSettings);
+        Node node = new MockNode(environment, plugins);
         AbstractClient client = (AbstractClient)node.client();
         nodes.put(id, node);
         clients.put(id, client);