You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/09/05 09:34:34 UTC

[camel] branch master updated (e0ef226 -> 9c7c7ba)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from e0ef226  Fixed ElasticSearchInfoTest after upgrading to 7.3.1
     new 1eb00d8  Revert "Fixed ElasticSearchInfoTest after upgrading to 7.3.1"
     new 377b5c9  Revert "Upgrade Elasticsearch cluster runner to version 7.3.1"
     new 9c7c7ba  Revert "Upgrade Elasticsearch and related bundle to version 7.3.1"

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/component/elasticsearch/ElasticsearchInfoTest.java      | 2 +-
 parent/pom.xml                                                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


[camel] 02/03: Revert "Upgrade Elasticsearch cluster runner to version 7.3.1"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 377b5c9256a59bf27aa27cbe66066c487395a3ed
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 11:33:35 2019 +0200

    Revert "Upgrade Elasticsearch cluster runner to version 7.3.1"
    
    This reverts commit 08bc41c9e9f53936b6066740770e14afeef81590.
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4b6ca7e..84f3af6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,7 +177,7 @@
         <ehcache3-version>3.7.0</ehcache3-version>
         <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
         <elasticsearch-rest-sniffer-version>7.3.1</elasticsearch-rest-sniffer-version>
-        <elasticsearch-rest-cluster-runner-version>7.3.1.0</elasticsearch-rest-cluster-runner-version>
+        <elasticsearch-rest-cluster-runner-version>7.1.1.0</elasticsearch-rest-cluster-runner-version>
         <elasticsearch-rest-version>7.3.1</elasticsearch-rest-version>
         <elasticsearch-rest-bundle-version>7.3.1_1</elasticsearch-rest-bundle-version>
         <elsql-version>1.3</elsql-version>


[camel] 03/03: Revert "Upgrade Elasticsearch and related bundle to version 7.3.1"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9c7c7ba06acae415df1ae08d32348a7396d806aa
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 11:33:48 2019 +0200

    Revert "Upgrade Elasticsearch and related bundle to version 7.3.1"
    
    This reverts commit 57d361925798dad508fc43dd8c9bf9133faccd9d.
---
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 84f3af6..c3786b7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,10 +176,10 @@
         <ehcache-version>2.10.6</ehcache-version>
         <ehcache3-version>3.7.0</ehcache3-version>
         <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
-        <elasticsearch-rest-sniffer-version>7.3.1</elasticsearch-rest-sniffer-version>
+        <elasticsearch-rest-sniffer-version>7.1.1</elasticsearch-rest-sniffer-version>
         <elasticsearch-rest-cluster-runner-version>7.1.1.0</elasticsearch-rest-cluster-runner-version>
-        <elasticsearch-rest-version>7.3.1</elasticsearch-rest-version>
-        <elasticsearch-rest-bundle-version>7.3.1_1</elasticsearch-rest-bundle-version>
+        <elasticsearch-rest-version>7.1.1</elasticsearch-rest-version>
+        <elasticsearch-rest-bundle-version>7.1.1_1</elasticsearch-rest-bundle-version>
         <elsql-version>1.3</elsql-version>
         <eddsa-version>0.3.0</eddsa-version>
         <embedmongo-version>2.1.1</embedmongo-version>


[camel] 01/03: Revert "Fixed ElasticSearchInfoTest after upgrading to 7.3.1"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 1eb00d8243299fc14a045fef02b71c86f3595f0b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 11:33:25 2019 +0200

    Revert "Fixed ElasticSearchInfoTest after upgrading to 7.3.1"
    
    This reverts commit e0ef226b40f560993e7597cd7cd0b12ce66ea877.
---
 .../org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
index 0897d00..a156ced 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.elasticsearch;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.elasticsearch.client.core.MainResponse;
+import org.elasticsearch.action.main.MainResponse;
 import org.junit.Test;
 
 public class ElasticsearchInfoTest extends ElasticsearchBaseTest {