Repository: beam Updated Branches: refs/heads/master 5fb30ec82 -> 6b91eed7e
[BEAM-3111] Upgrade Elasticsearch to 5.6.3 and clean pom Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f6b40454 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f6b40454 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f6b40454 Branch: refs/heads/master Commit: f6b40454795d20e45e6a4f53cc91d7a5b6224069 Parents: 5fb30ec Author: Etienne Chauchot <[email protected]> Authored: Tue Oct 24 16:41:25 2017 +0200 Committer: Ismaël MejÃa <[email protected]> Committed: Mon Oct 30 16:30:15 2017 +0100 ---------------------------------------------------------------------- sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml | 2 +- .../apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java | 1 + .../io/elasticsearch-tests/elasticsearch-tests-common/pom.xml | 1 - sdks/java/io/elasticsearch-tests/pom.xml | 4 ++-- sdks/java/io/elasticsearch/pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/f6b40454/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml index c7ea474..ba76316 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml @@ -31,7 +31,7 @@ <description>Tests of ElasticsearchIO on Elasticsearch 5.x</description> <properties> - <elasticsearch.version>5.4.0</elasticsearch.version> + <elasticsearch.version>5.6.3</elasticsearch.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/beam/blob/f6b40454/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java index 9a7eb07..92ad608 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java @@ -68,6 +68,7 @@ public class ElasticsearchIOTest extends ESIntegTestCase implements Serializable @Override protected Settings nodeSettings(int nodeOrdinal) { + System.setProperty("es.set.netty.runtime.available.processors", "false"); return Settings.builder().put(super.nodeSettings(nodeOrdinal)) .put("http.enabled", "true") // had problems with some jdk, embedded ES was too slow for bulk insertion, http://git-wip-us.apache.org/repos/asf/beam/blob/f6b40454/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml index 6ac7fc1..b30764a 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml @@ -32,7 +32,6 @@ <properties> <commons-io.version>1.3.2</commons-io.version> <log4j.version>2.6.2</log4j.version> - <elasticsearch.client.rest.version>5.0.0</elasticsearch.client.rest.version> <httpcomponents.core.version>4.4.5</httpcomponents.core.version> <httpcomponents.httpasyncclient.version>4.1.2</httpcomponents.httpasyncclient.version> <httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version> http://git-wip-us.apache.org/repos/asf/beam/blob/f6b40454/sdks/java/io/elasticsearch-tests/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch-tests/pom.xml b/sdks/java/io/elasticsearch-tests/pom.xml index 43300f8..59ef454 100644 --- a/sdks/java/io/elasticsearch-tests/pom.xml +++ b/sdks/java/io/elasticsearch-tests/pom.xml @@ -35,7 +35,7 @@ <commons-io.version>1.3.2</commons-io.version> <jna.version>4.1.0</jna.version> <log4j.version>2.6.2</log4j.version> - <elasticsearch.client.rest.version>5.4.0</elasticsearch.client.rest.version> + <elasticsearch.client.rest.version>5.6.3</elasticsearch.client.rest.version> </properties> <dependencies> @@ -122,7 +122,7 @@ <dependency> <groupId>org.elasticsearch.client</groupId> - <artifactId>rest</artifactId> + <artifactId>elasticsearch-rest-client</artifactId> <version>${elasticsearch.client.rest.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/f6b40454/sdks/java/io/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/elasticsearch/pom.xml b/sdks/java/io/elasticsearch/pom.xml index 83d8c7e..37f3d11 100644 --- a/sdks/java/io/elasticsearch/pom.xml +++ b/sdks/java/io/elasticsearch/pom.xml @@ -31,7 +31,7 @@ <description>IO to read and write on Elasticsearch</description> <properties> - <elasticsearch.client.rest.version>5.4.0</elasticsearch.client.rest.version> + <elasticsearch.client.rest.version>5.6.3</elasticsearch.client.rest.version> <httpcomponents.core.version>4.4.5</httpcomponents.core.version> <httpcomponents.httpasyncclient.version>4.1.2</httpcomponents.httpasyncclient.version> <httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version> @@ -51,7 +51,7 @@ <dependency> <groupId>org.elasticsearch.client</groupId> - <artifactId>rest</artifactId> + <artifactId>elasticsearch-rest-client</artifactId> <version>${elasticsearch.client.rest.version}</version> </dependency>
