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 <[email protected]> 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); - } - - -}
