8000 using ES 1.3.0, made integration test compatible · nibin/elasticsearch-http-basic@79df080 · GitHub
[go: up one dir, main page]

Skip to content

Commit 79df080

Browse files
author
Ernesto
committed
using ES 1.3.0, made integration test compatible
- updated pom to 1.3.0 - Explicit adding the plugin class name in the integration test is required
1 parent c2286d2 commit 79df080

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
<groupId>com.asquera.elasticsearch</groupId>
66
<artifactId>elasticsearch-http-basic</artifactId>
7-
<version>1.2.0</version>
7+
<version>1.3.0</version>
88
<packaging>jar</packaging>
99

1010
<name>Basic Authentication Plugin</name>
1111
<url>http://maven.apache.org</url>
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<elasticsearch.version>1.2.0</elasticsearch.version>
16-
<lucene.version>4.8.1</lucene.version>
15+
<elasticsearch.version>1.3.0</elasticsearch.version>
16+
<lucene.version>4.9.0</lucene.version>
1717
</properties>
1818

1919
<dependencies>

src/test/java/com/asquera/elasticsearch/plugins/http/auth/integration/DefaultConfigurationIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.elasticsearch.test.rest.client.http.HttpResponse;
3131
import org.junit.Test;
3232

33+
import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;
34+
3335
import static org.hamcrest.Matchers.equalTo;
3436

3537
/**
@@ -41,6 +43,7 @@ public class DefaultConfigurationIntegrationTest extends ElasticsearchIntegratio
4143
@Override
4244
protected Settings nodeSettings(int nodeOrdinal) {
4345
return ImmutableSettings.settingsBuilder()
46+
.put("plugin.types", HttpBasicServerPlugin.class.getName())
4447
.build();
4548
}
4649

src/test/java/com/asquera/elasticsearch/plugins/http/auth/integration/EmptyWhitelistIntegrationTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import org.elasticsearch.test.rest.client.http.HttpResponse;
3434
import org.junit.Test;
3535

36+
import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;
37+
3638
import java.net.URI;
3739
import java.net.URISyntaxExceptio 8000 n;
3840

@@ -48,7 +50,8 @@ public class EmptyWhitelistIntegrationTest extends ElasticsearchIntegrationTest
4850
@Override
4951
protected Settings nodeSettings(int nodeOrdinal) {
5052
return ImmutableSettings.settingsBuilder().putArray("http.basic.ipwhitelist", "unkown")
51-
.build();
53+
.put("plugin.types", HttpBasicServerPlugin.class.getName())
54+
.build();
5255
}
5356

5457
@Test

src/test/java/com/asquera/elasticsearch/plugins/http/auth/integration/IpAuthenticationIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import org.elasticsearch.test.rest.client.http.HttpResponse;
3535
import org.junit.Test;
3636

37+
import com.asquera.elasticsearch.plugins.http.HttpBasicServerPlugin;
38+
3739
import java.net.URI;
3840
import java.net.URISyntaxException;
3941

@@ -57,6 +59,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
5759
.putArray("http.basic.ipwhitelist", whitelistedIp)
5860
.putArray("http.basic.trusted_proxy_chains", trustedIp + "," + localhost)
5961
.put("http.basic.xforward", "X-Forwarded-For")
62+
.put("plugin.types", HttpBasicServerPlugin.class.getName())
6063
.build();
6164
}
6265

0 commit comments

Comments
 (0)
0