[camel] branch master updated (eb855a1 -> ca5cf19)

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (eb855a1 -> ca5cf19)

acosentino
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 eb855a1  [CAMEL-12980] Interact with Karaf's BundleStateService about Blueprint Camel Context problems
     new 8cee7e8  Remove Camel-Elasticsearch remaining stuff
     new 12e1e73  Removed Property placeholders related to Elasticsearch
     new c3cb7c9  Remove Camel-Elasticsearch5 Remaining Stuff
     new f07adbc  Remove property Placeholder for Elasticsearch5
     new ca5cf19  Removed Elasticsearch Cluster Runner property placeholders for Elasticsearch and Elasticsearch5

The 5 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:
 bom/camel-bom/pom.xml                              | 20 ---------
 parent/pom.xml                                     | 28 ------------
 .../camel-spring-boot-dependencies/pom.xml         | 20 ---------
 .../itest/springboot/CamelElasticsearch5Test.java  | 51 ----------------------
 .../itest/springboot/CamelElasticsearchTest.java   | 49 ---------------------
 5 files changed, 168 deletions(-)
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearch5Test.java
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/05: Remove Camel-Elasticsearch remaining stuff

acosentino
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 8cee7e810ae4bb4dd994f22784fff4c2a577b5fa
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 10:30:48 2019 +0100

    Remove Camel-Elasticsearch remaining stuff
---
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 10 -----
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../itest/springboot/CamelElasticsearchTest.java   | 49 ----------------------
 4 files changed, 79 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 62192a4..b9c62e5 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -655,11 +655,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -670,11 +665,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch5</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index afe13a4..cdc49eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1154,11 +1154,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch5</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -2658,11 +2653,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch5-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 28169ba..086d3eb 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -880,11 +880,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -895,11 +890,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch5</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
deleted file mode 100644
index dc17332..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.springboot;
-
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Arquillian.class)
-public class CamelElasticsearchTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelElasticsearchTest.class))
-                .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseTest$)")
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        this.runComponentTest(config);
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}

Reply | Threaded
Open this post in threaded view
|

[camel] 02/05: Removed Property placeholders related to Elasticsearch

acosentino
In reply to this post by acosentino
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 12e1e733bb127a76931cd144b787b519e6ce2d5b
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 10:31:09 2019 +0100

    Removed Property placeholders related to Elasticsearch
---
 parent/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index cdc49eb..532efac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -193,9 +193,6 @@
     <ehcache-version>2.10.6</ehcache-version>
     <ehcache3-version>3.6.2</ehcache3-version>
     <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
-    <elasticsearch-bundle-version>2.4.4_1</elasticsearch-bundle-version>
-    <elasticsearch-guava-version>18.0</elasticsearch-guava-version>
-    <elasticsearch-version>2.4.4</elasticsearch-version>
     <elasticsearch5-version>5.6.3</elasticsearch5-version>
     <elasticsearch5-bundle-version>5.6.3_1</elasticsearch5-bundle-version>
     <elasticsearch-sniffer-version>5.6.3</elasticsearch-sniffer-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 03/05: Remove Camel-Elasticsearch5 Remaining Stuff

acosentino
In reply to this post by acosentino
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 c3cb7c965de5a18fdef63287e5eec40fd286c622
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 10:33:14 2019 +0100

    Remove Camel-Elasticsearch5 Remaining Stuff
---
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 10 -----
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../itest/springboot/CamelElasticsearch5Test.java  | 51 ----------------------
 4 files changed, 81 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index b9c62e5..afe9320 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -665,16 +665,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elsql</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 532efac..42081bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1151,11 +1151,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -2650,11 +2645,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch-rest-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 086d3eb..e7e423d 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -890,16 +890,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-elasticsearch5-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-elsql</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearch5Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearch5Test.java
deleted file mode 100644
index 9986bd9..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearch5Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.springboot;
-
-import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Arquillian.class)
-@Ignore("Requires Lucene 6.x and Spring-Boot 1.x is using 5.x")
-public class CamelElasticsearch5Test extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelElasticsearch5Test.class))
-                .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseTest$)")
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        this.runComponentTest(config);
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}

Reply | Threaded
Open this post in threaded view
|

[camel] 04/05: Remove property Placeholder for Elasticsearch5

acosentino
In reply to this post by acosentino
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 f07adbcfc4d005bc6dc0c682c405659ec470c271
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 10:35:50 2019 +0100

    Remove property Placeholder for Elasticsearch5
---
 parent/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 42081bf..95fd0ba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -193,9 +193,6 @@
     <ehcache-version>2.10.6</ehcache-version>
     <ehcache3-version>3.6.2</ehcache3-version>
     <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
-    <elasticsearch5-version>5.6.3</elasticsearch5-version>
-    <elasticsearch5-bundle-version>5.6.3_1</elasticsearch5-bundle-version>
-    <elasticsearch-sniffer-version>5.6.3</elasticsearch-sniffer-version>
     <elasticsearch-cluster-runner-version>2.4.0.0</elasticsearch-cluster-runner-version>
     <elasticsearch5-cluster-runner-version>5.6.3.0</elasticsearch5-cluster-runner-version>
     <elasticsearch-rest-sniffer-version>6.5.3</elasticsearch-rest-sniffer-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 05/05: Removed Elasticsearch Cluster Runner property placeholders for Elasticsearch and Elasticsearch5

acosentino
In reply to this post by acosentino
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 ca5cf195456145c6c8f1c2c7cb5dda3067ce8bca
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 10:36:09 2019 +0100

    Removed Elasticsearch Cluster Runner property placeholders for Elasticsearch and Elasticsearch5
---
 parent/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 95fd0ba..a0c1f4e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -193,8 +193,6 @@
     <ehcache-version>2.10.6</ehcache-version>
     <ehcache3-version>3.6.2</ehcache3-version>
     <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
-    <elasticsearch-cluster-runner-version>2.4.0.0</elasticsearch-cluster-runner-version>
-    <elasticsearch5-cluster-runner-version>5.6.3.0</elasticsearch5-cluster-runner-version>
     <elasticsearch-rest-sniffer-version>6.5.3</elasticsearch-rest-sniffer-version>
     <elasticsearch-rest-cluster-runner-version>6.5.3.0</elasticsearch-rest-cluster-runner-version>
     <elasticsearch-rest-version>6.5.3</elasticsearch-rest-version>