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 c30439ea49eaa4ec6a8c059a4b2e644c59b5fc8a Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Jan 11 13:35:17 2019 +0100 Removed Camel-JIRA remaining stuff --- bom/camel-bom/pom.xml | 10 ----- parent/pom.xml | 19 --------- .../camel-spring-boot-dependencies/pom.xml | 10 ----- .../camel/itest/springboot/CamelJiraTest.java | 48 ---------------------- .../spring-boot-fix-dependencies.properties | 1 - 5 files changed, 88 deletions(-) diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index 6de0f35..35e9058 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -1310,16 +1310,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-jira</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jira-starter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-jms</artifactId> <version>${project.version}</version> </dependency> diff --git a/parent/pom.xml b/parent/pom.xml index f2ae810..8810697 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -388,8 +388,6 @@ <jibx-version>1.2.6</jibx-version> <jing-bundle-version>20030619_5</jing-bundle-version> <jing-version>20030619</jing-version> - <jira-rest-client-version>1.2-m01</jira-rest-client-version> - <jira-rest-client-api-version>2.0.0-m30</jira-rest-client-api-version> <jmh-version>1.21</jmh-version> <jodatime-bundle-version>1.6.2</jodatime-bundle-version> <jodatime2-bundle-version>2.10.1</jodatime2-bundle-version> @@ -1471,11 +1469,6 @@ <artifactId>camel-jibx</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jira</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jing</artifactId> @@ -2937,11 +2930,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-jira-starter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-jms-starter</artifactId> <version>${project.version}</version> </dependency> @@ -4605,13 +4593,6 @@ <version>${zendesk-client-version}</version> </dependency> - <!-- Optional Jira --> - <dependency> - <groupId>com.atlassian.jira</groupId> - <artifactId>jira-rest-java-client</artifactId> - <version>${jira-rest-client-version}</version> - </dependency> - <!-- optional misc --> <dependency> <groupId>com.google.code.scriptengines</groupId> 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 271c373..b552a03 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 @@ -1535,16 +1535,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-jira</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jira-starter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-jms</artifactId> <version>${project.version}</version> </dependency> diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java deleted file mode 100644 index bae1dfe..0000000 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java +++ /dev/null @@ -1,48 +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 CamelJiraTest extends AbstractSpringBootTestSupport { - - @Deployment - public static Archive<?> createSpringBootPackage() throws Exception { - return ArquillianPackager.springBootPackage(createTestConfig()); - } - - public static ITestConfig createTestConfig() { - return new ITestConfigBuilder() - .module(inferModuleName(CamelJiraTest.class)) - .build(); - } - - @Test - public void componentTests() throws Exception { - this.runComponentTest(config); - this.runModuleUnitTestsIfEnabled(config); - } - - -} diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties index 0e8fd7b..2ee924b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties @@ -37,7 +37,6 @@ camel-hl7=org.apache.camel:camel-netty4:${project.version} camel-jetty9=org.apache.camel:apt:${project.version} camel-jbpm=org.apache.geronimo.specs:geronimo-jms_1.1_spec camel-jcr=org.apache.lucene:lucene-core:${lucene3-version} -camel-jira=com.atlassian.jira:jira-rest-java-client camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.1_spec