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/01/11 13:17:42 UTC
[camel] branch master updated (b26db98 -> a113bbc)
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 b26db98 [CAMEL-13049] Use CamelContext's ClassLoader as TCCL for some Karaf commands
new c30439e Removed Camel-JIRA remaining stuff
new e250d3d Removed camel-jxpath remaining stuff
new a113bbc Removed reference to jxpath in enums of Controlbus and Language Endpoints
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:
bom/camel-bom/pom.xml | 20 ---------
.../component/controlbus/ControlBusEndpoint.java | 2 +-
.../camel/component/language/LanguageEndpoint.java | 2 +-
parent/pom.xml | 29 -------------
.../camel-spring-boot-dependencies/pom.xml | 20 ---------
.../camel/itest/springboot/CamelJiraTest.java | 48 ----------------------
.../camel/itest/springboot/CamelJxpathTest.java | 48 ----------------------
.../spring-boot-fix-dependencies.properties | 1 -
8 files changed, 2 insertions(+), 168 deletions(-)
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJiraTest.java
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJxpathTest.java
[camel] 01/03: Removed Camel-JIRA remaining stuff
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 c30439ea49eaa4ec6a8c059a4b2e644c59b5fc8a
Author: Andrea Cosentino <an...@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
[camel] 02/03: Removed camel-jxpath remaining stuff
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 e250d3d998bf413ffd387b7502e80a767c93e385
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 11 14:11:59 2019 +0100
Removed camel-jxpath remaining stuff
---
bom/camel-bom/pom.xml | 10 -----
parent/pom.xml | 10 -----
.../camel-spring-boot-dependencies/pom.xml | 10 -----
.../camel/itest/springboot/CamelJxpathTest.java | 48 ----------------------
4 files changed, 78 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 35e9058..2b7c7de 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1400,16 +1400,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8810697..fcd70f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1521,11 +1521,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2975,11 +2970,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka-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 b552a03..f7e99af 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
@@ -1625,16 +1625,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jxpath-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-kafka</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJxpathTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJxpathTest.java
deleted file mode 100644
index 8cc3aba..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJxpathTest.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 CamelJxpathTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelJxpathTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- this.runLanguageTest(config);
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-
-}
[camel] 03/03: Removed reference to jxpath in enums of Controlbus
and Language Endpoints
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 a113bbcfddff3317d474a31bec501417da4db99d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 11 14:16:30 2019 +0100
Removed reference to jxpath in enums of Controlbus and Language Endpoints
---
.../java/org/apache/camel/component/controlbus/ControlBusEndpoint.java | 2 +-
.../main/java/org/apache/camel/component/language/LanguageEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index fd78eb7..c183f6b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -40,7 +40,7 @@ public class ControlBusEndpoint extends DefaultEndpoint {
@UriPath(description = "Command can be either route or language", enums = "route,language") @Metadata(required = "true")
private String command;
- @UriPath(enums = "bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,jxpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize")
+ @UriPath(enums = "bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize")
private Language language;
@UriParam
private String routeId;
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index e1410ce..f36d8e8 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -53,7 +53,7 @@ public class LanguageEndpoint extends ResourceEndpoint {
private Language language;
private Expression expression;
private boolean contentResolvedFromResource;
- @UriPath(enums = "bean,constant,exchangeProperty,file,groovy,header,javascript,jsonpath,jxpath,mvel,ognl,"
+ @UriPath(enums = "bean,constant,exchangeProperty,file,groovy,header,javascript,jsonpath,mvel,ognl,"
+ ",ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize")
@Metadata(required = "true")
private String languageName;