8000 Merge pull request #56 from emig/55_test_compilation_error · blogsit/elasticsearch-http-basic@b140671 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit b140671

Browse files
author
Ernesto
committed
Merge pull request Asquera#56 from emig/55_test_compilation_error
test: remove httpClient() override
2 parents 36430f7 + d36d3e1 commit b140671

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

‎.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
sudo: false
22
language: java
3-
script: ./script/ci/run_build.sh
3+
install:
4+
- mvn install -Delasticsearch.version=$ES_VERSION -DskipTests=true
5+
script:
6+
- mvn -Delasticsearch.version=$ES_VERSION -Dtests.security.manager=false test
47
env:
5-
- ES_VERSION=1.5.0
68
- ES_VERSION=1.5.1
79
- ES_VERSION=1.5.2
810
- ES_VERSION=1.6.0
911
cache:
1012
directories:
11-
- $HOME/.m2
13+
- $HOME/.m2

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Use `date "+%Y-%m-%d"` to get the correct date formatting
99
### - Added
1010
- allow HEAD root url authentication #39
1111
- log http method on any request. #42
12+
### - Fix
13+
- test: adapt to method signature change after 1.5.1 #55
14+
- test: run custom install and test commands in ci
1215

1316
## [1.5.0][2015-07-04]
1417< 8000 /td>

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ There is no way to configure this on a per index basis.
1818

1919
| Http Basic Plugin | elasticsearch |
2020
|-----------------------------|-----------------------|
21-
| v1.5.0(master) | 1.5.x, 1.6.x |
21+
| v1.5.1(master) | 1.5.1, 1.5.2, 1.6.x |
22+
| v1.5.0 | 1.5.0 |
2223
| v1.4.0 | 1.4.0 |
2324
| v1.3.0 | 1.3.0 |
2425
| v1.2.0 | 1.2.0 |

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
exmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.asquera.elasticsearch</groupId>

‎script/ci/run_build.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ public class HttpBasicServerPluginIntegrationTest extends
2525
protected final String localhost = "127.0.0.1";
2626

2727

28-
public static HttpRequestBuilder httpClient() {
29-
HttpServerTransport httpServerTransport = internalCluster().getDataNodeInstance(HttpServerTransport.class);
30-
InetSocketAddress address = ((InetSocketTransportAddress) httpServerTransport.boundAddress().publishAddress()).address();
31-
return new HttpRequestBuilder(HttpClients.createDefault()).host(address.getHostName()).port(address.getPort());
32-
}
3328
/**
3429
*
3530
* @return a Builder with the plugin included and bind_host and publish_host

0 commit comments

Comments
 (0)
0