Skip to content

Update to Elasticsearch 2.1.1 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2015
Merged

Update to Elasticsearch 2.1.1 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/org/elasticsearch/node/MockNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
7 changes: 5 additions & 2 deletions src/test/java/org/xbib/elasticsearch/util/NodeTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down