[camel] branch release/2.18.5 deleted (was e82da57)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.18.5 in repository https://gitbox.apache.org/repos/asf/camel.git. was e82da57 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.19.4 deleted (was 80a4e4a)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.19.4 in repository https://gitbox.apache.org/repos/asf/camel.git. was 80a4e4a [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.19.5 deleted (was a12bdc0)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.19.5 in repository https://gitbox.apache.org/repos/asf/camel.git. was a12bdc0 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard a12bdc0 [maven-release-plugin] prepare for next development iteration
[camel] branch release/2.20.4 deleted (was 857dea0)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.20.4 in repository https://gitbox.apache.org/repos/asf/camel.git. was 857dea0 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.20.0 deleted (was dcee90c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.20.0 in repository https://gitbox.apache.org/repos/asf/camel.git. was dcee90c [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.20.3 deleted (was 752fee3)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.20.3 in repository https://gitbox.apache.org/repos/asf/camel.git. was 752fee3 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.20.2 deleted (was 69a939e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.20.2 in repository https://gitbox.apache.org/repos/asf/camel.git. was 69a939e [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 69a939e [maven-release-plugin] prepare for next development iteration
[camel] branch release/2.20.1 deleted (was 11bf16a)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.20.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was 11bf16a [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.4 deleted (was 3ba8e85)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.4 in repository https://gitbox.apache.org/repos/asf/camel.git. was 3ba8e85 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.2 deleted (was 4b23390)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.2 in repository https://gitbox.apache.org/repos/asf/camel.git. was 4b23390 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.3 deleted (was 1accaff)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.3 in repository https://gitbox.apache.org/repos/asf/camel.git. was 1accaff [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.1 deleted (was 9916cfa)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was 9916cfa [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.0 deleted (was a35068c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.0 in repository https://gitbox.apache.org/repos/asf/camel.git. was a35068c [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.23.0 deleted (was bf15f98)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.23.0 in repository https://gitbox.apache.org/repos/asf/camel.git. was bf15f98 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.3 deleted (was eb4156c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.3 in repository https://gitbox.apache.org/repos/asf/camel.git. was eb4156c [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.5 deleted (was 88cc8e9)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.5 in repository https://gitbox.apache.org/repos/asf/camel.git. was 88cc8e9 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.4 deleted (was bef9f46)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.4 in repository https://gitbox.apache.org/repos/asf/camel.git. was bef9f46 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.2 deleted (was 2207064)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.2 in repository https://gitbox.apache.org/repos/asf/camel.git. was 2207064 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.1 deleted (was f6c29af)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was f6c29af [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.21.5 deleted (was 1178fcf)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.21.5 in repository https://gitbox.apache.org/repos/asf/camel.git. was 1178fcf [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.22.0 deleted (was f590854)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.22.0 in repository https://gitbox.apache.org/repos/asf/camel.git. was f590854 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.23.1 deleted (was f95126d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.23.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was f95126d [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/2.24.0 deleted (was a84c8ae)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.24.0 in repository https://gitbox.apache.org/repos/asf/camel.git. was a84c8ae [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/3.0.0-M1 deleted (was ce0d2ca)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.0.0-M1 in repository https://gitbox.apache.org/repos/asf/camel.git. was ce0d2ca [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard ce0d2ca [maven-release-plugin] prepare for next development iteration
[camel] branch release/2.23.2 deleted (was 24e310a)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.23.2 in repository https://gitbox.apache.org/repos/asf/camel.git. was 24e310a [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch release/3.0.0-M3 deleted (was 17e893e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.0.0-M3 in repository https://gitbox.apache.org/repos/asf/camel.git. was 17e893e [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 17e893e [maven-release-plugin] prepare for next development iteration
[camel] branch release/3.0.0-M2 deleted (was 0b432c8)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.0.0-M2 in repository https://gitbox.apache.org/repos/asf/camel.git. was 0b432c8 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 0b432c8 [maven-release-plugin] prepare for next development iteration
[camel] branch master updated: Upgrade JGit to version 5.4.0.201906121030-r
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
The following commit(s) were added to refs/heads/master by this push:
new 46f49c5 Upgrade JGit to version 5.4.0.201906121030-r
46f49c5 is described below
commit 46f49c552b2af0405ae422f2507af91ec6425433
Author: Andrea Cosentino
AuthorDate: Tue Jun 18 09:43:28 2019 +0200
Upgrade JGit to version 5.4.0.201906121030-r
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ed852ac..831b5ba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -378,7 +378,7 @@
${jetty-version}
org.eclipse.jetty
1.4.0
-5.3.2.201906051522-r
+5.4.0.201906121030-r
4.1.1.Final
0.4.2.Final
4.0.15.Final
[camel] branch master updated: [CAMEL-13654] optaplanner-7.23 not usable in WildFly
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
The following commit(s) were added to refs/heads/master by this push:
new 2344232 [CAMEL-13654] optaplanner-7.23 not usable in WildFly
new edd2411 Merge pull request #2980 from tdiesler/CAMEL-13654
2344232 is described below
commit 2344232d8f2ed567108604ad461d845abac82515
Author: Thomas Diesler
AuthorDate: Mon Jun 17 13:11:45 2019 +0200
[CAMEL-13654] optaplanner-7.23 not usable in WildFly
---
parent/pom.xml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7d81ff5..020ea8c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,7 +181,7 @@
3.1.2_1
1.6.1_5
6.4.1
-7.23.0.Final
+7.22.0.Final
3.1.0
3.3.0-v20070426
2.1.5
@@ -356,7 +356,7 @@
${jakarta-jaxb-version}
0.1.6
2.4
-7.23.0.Final
+7.22.0.Final
1.0.0.Final
3.3.2.Final
1.4.10.Final
@@ -437,7 +437,7 @@
2.2.0
2.2.0_1
4.2.6
-7.23.0.Final
+7.22.0.Final
4.1.1
4.1.1
2.3.0_3
@@ -543,7 +543,7 @@
0.31.0
0.1.4
1.5.0
-7.23.0.Final
+7.22.0.Final
2.0.8_6
1.6.0
2.4_5
[camel] branch master updated: CAMEL-13653: Upgraded to consul:1.5.1 image for remaining projects
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9ab7795 CAMEL-13653: Upgraded to consul:1.5.1 image for remaining
projects
9ab7795 is described below
commit 9ab77952cfb530f9f89e822bdda00600869bc7a2
Author: aldettinger
AuthorDate: Tue Jun 18 09:49:39 2019 +0200
CAMEL-13653: Upgraded to consul:1.5.1 image for remaining projects
---
.../test/java/org/apache/camel/component/consul/ConsulTestSupport.java | 2 +-
.../test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java | 2 +-
.../apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index e3ec1d9..19c6fac 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -30,7 +30,7 @@ import org.junit.rules.TestName;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
-public static final String CONTAINER_IMAGE = "consul:1.0.7";
+public static final String CONTAINER_IMAGE = "consul:1.5.1";
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
diff --git
a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
index 1a2fea3..3e0420f 100644
---
a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
+++
b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
@@ -42,7 +42,7 @@ public class ContainerAwareSpringTestSupportIT extends
ContainerAwareSpringTestS
@Override
protected GenericContainer createContainer() {
-return new GenericContainer("consul:1.0.7")
+return new GenericContainer("consul:1.5.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git
a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
index 40cd84b..d776d88 100644
---
a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
+++
b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
@@ -34,7 +34,7 @@ public class ContainerAwareTestSupportIT extends
ContainerAwareTestSupport {
@Override
protected GenericContainer createContainer() {
-return new GenericContainer<>("consul:1.0.7")
+return new GenericContainer<>("consul:1.5.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
[camel] branch master updated (9ab7795 -> 7a3d591)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 9ab7795 CAMEL-13653: Upgraded to consul:1.5.1 image for remaining projects new 2893d2b [fix] Close the FileInputStream on StaxProcessor new cc771b7 CAMEL-13373: camel-stax - FileInputStream not closed. Thanks to https://github.com/asirbu2002 for the PR. new 7a3d591 CAMEL-13373: Fixed CS 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: components/camel-stax/pom.xml | 7 +++- .../apache/camel/component/stax/StAXProcessor.java | 48 +- parent/pom.xml | 2 + .../karaf/features/src/main/resources/features.xml | 2 + 4 files changed, 39 insertions(+), 20 deletions(-)
[camel] 01/03: [fix] Close the FileInputStream on StaxProcessor
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2893d2bc96a7bdb0fb388607d05edb0081900154
Author: SIRBU Alexandru
AuthorDate: Wed Mar 27 18:26:22 2019 +0100
[fix] Close the FileInputStream on StaxProcessor
---
components/camel-stax/pom.xml | 6 ++-
.../apache/camel/component/stax/StAXProcessor.java | 47 +-
2 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 4c8f199..6fd1b60 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -40,8 +40,12 @@
org.apache.camel
camel-support
+
+
+com.fasterxml.woodstox
+woodstox-core
+5.1.0
-
org.apache.camel
diff --git
a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
index 641a873..f401bd6 100644
---
a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
+++
b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
@@ -26,6 +26,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ExchangeHelper;
+import com.ctc.wstx.sr.ValidatingStreamReader;
+
/**
* It uses SAX content handler to handle events.
*
@@ -49,25 +51,34 @@ public class StAXProcessor implements Processor {
@Override
public void process(Exchange exchange) throws Exception {
-InputSource is = exchange.getIn().getMandatoryBody(InputSource.class);
-XMLStreamReader stream =
exchange.getIn().getMandatoryBody(XMLStreamReader.class);
-XMLReader reader = new StaxStreamXMLReader(stream);
-
-ContentHandler handler;
-if (contentHandlerClass != null) {
-handler = contentHandlerClass.newInstance();
-} else {
-handler = contentHandler;
-}
-reader.setContentHandler(handler);
-reader.parse(is);
+XMLStreamReader stream = null;
+try {
+stream = exchange.getIn().getMandatoryBody(XMLStreamReader.class);
+StaxStreamXMLReader reader = new StaxStreamXMLReader(stream);
+ContentHandler handler;
+if (this.contentHandlerClass != null) {
+handler = (ContentHandler)
this.contentHandlerClass.newInstance();
+} else {
+handler = this.contentHandler;
+}
-if (ExchangeHelper.isOutCapable(exchange)) {
-// preserve headers
-exchange.getOut().setHeaders(exchange.getIn().getHeaders());
-exchange.getOut().setBody(handler);
-} else {
-exchange.getIn().setBody(handler);
+reader.setContentHandler(handler);
+// InputSource is ignored anyway
+reader.parse((InputSource) null);
+if (ExchangeHelper.isOutCapable(exchange)) {
+exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+exchange.getOut().setBody(handler);
+} else {
+exchange.getIn().setBody(handler);
+}
+} finally {
+if (stream != null) {
+stream.close();
+if (stream instanceof ValidatingStreamReader) {
+// didn't find any method without using the woodstox
package
+((ValidatingStreamReader) stream).closeCompletely();
+}
+}
}
}
[camel] 02/03: CAMEL-13373: camel-stax - FileInputStream not closed. Thanks to https://github.com/asirbu2002 for the PR.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc771b74cd7349bf71feba1aa320de7c31e9a7e6
Author: Claus Ibsen
AuthorDate: Tue Jun 18 10:09:21 2019 +0200
CAMEL-13373: camel-stax - FileInputStream not closed. Thanks to
https://github.com/asirbu2002 for the PR.
---
components/camel-stax/pom.xml| 3 ++-
parent/pom.xml | 2 ++
platforms/karaf/features/src/main/resources/features.xml | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 6fd1b60..7fdb17b 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -44,8 +44,9 @@
com.fasterxml.woodstox
woodstox-core
-5.1.0
+${woodstox-core-version}
+
org.apache.camel
diff --git a/parent/pom.xml b/parent/pom.xml
index 73c61f9..fdd758a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -663,6 +663,7 @@
2.2.10
1.0.1
3.1.4
+4.2
4.0.8_1
4.0.8
1.2.1_1
@@ -693,6 +694,7 @@
0.9.4_5
2.23.2
4.4.1
+5.2.1
1.0.2_2
1.6.3_1
1.6.3
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index ea98587..a7b1ea2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2422,6 +2422,8 @@
camel-core
+mvn:com.fasterxml.woodstox/woodstox-core/${woodstox-core-version}
+
mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}
mvn:org.apache.camel/camel-stax/${project.version}
[camel] 03/03: CAMEL-13373: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7a3d5913bb1af40f8730d27a7e3a7ac59bbf3e05
Author: Claus Ibsen
AuthorDate: Tue Jun 18 10:13:15 2019 +0200
CAMEL-13373: Fixed CS
---
.../main/java/org/apache/camel/component/stax/StAXProcessor.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
index f401bd6..3034a13 100644
---
a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
+++
b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
@@ -20,14 +20,13 @@ import javax.xml.stream.XMLStreamReader;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
+
+import com.ctc.wstx.sr.ValidatingStreamReader;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ExchangeHelper;
-import com.ctc.wstx.sr.ValidatingStreamReader;
-
/**
* It uses SAX content handler to handle events.
*
@@ -57,7 +56,7 @@ public class StAXProcessor implements Processor {
StaxStreamXMLReader reader = new StaxStreamXMLReader(stream);
ContentHandler handler;
if (this.contentHandlerClass != null) {
-handler = (ContentHandler)
this.contentHandlerClass.newInstance();
+handler = this.contentHandlerClass.newInstance();
} else {
handler = this.contentHandler;
}
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34689 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] 02/02: CAMEL-13654 - Added some comments to the POM, avoiding update the versions
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 d11deb0f3b3bb71685e3d87fd058c96cdfc047cd
Author: Andrea Cosentino
AuthorDate: Tue Jun 18 10:36:06 2019 +0200
CAMEL-13654 - Added some comments to the POM, avoiding update the versions
---
parent/pom.xml | 4
1 file changed, 4 insertions(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index fdd758a..84affeae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,6 +181,7 @@
3.1.2_1
1.6.1_5
6.4.1
+
7.22.0.Final
3.1.0
3.3.0-v20070426
@@ -356,6 +357,7 @@
${jakarta-jaxb-version}
0.1.6
2.4
+
7.22.0.Final
1.0.0.Final
3.3.2.Final
@@ -437,6 +439,7 @@
2.2.0
2.2.0_1
4.2.6
+
7.22.0.Final
4.1.1
4.1.1
@@ -543,6 +546,7 @@
0.31.0
0.1.4
1.5.0
+
7.22.0.Final
2.0.8_6
1.6.0
[camel] 01/02: Fixed Spring Boot ITest for camel-jbpm
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 3a65c14a3e9502aeae6ad1709d6cfe9ea5bd4567
Author: Andrea Cosentino
AuthorDate: Tue Jun 18 10:33:34 2019 +0200
Fixed Spring Boot ITest for camel-jbpm
---
.../test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java
index c4274b1..2b85215 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java
@@ -35,8 +35,8 @@ public class CamelJbpmTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelJbpmTest.class))
-.dependency("org.drools:drools-core:7.23.0.Final")
-.dependency("org.drools:drools-compiler:7.23.0.Final")
+.dependency("org.drools:drools-core:7.22.0.Final")
+.dependency("org.drools:drools-compiler:7.22.0.Final")
.unitTestExpectedNumber(0)
.build();
}
[camel] branch master updated (7a3d591 -> d11deb0)
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 7a3d591 CAMEL-13373: Fixed CS new 3a65c14 Fixed Spring Boot ITest for camel-jbpm new d11deb0 CAMEL-13654 - Added some comments to the POM, avoiding update the versions The 2 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: parent/pom.xml| 4 .../test/java/org/apache/camel/itest/springboot/CamelJbpmTest.java| 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
[camel] 01/02: Remove deprecated certFilename property on the ssh component
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 634b5fc734b4201d303b0d0ec5ddc6dbe1c80f0a
Author: Guillaume Nodet
AuthorDate: Tue Jun 18 10:38:20 2019 +0200
Remove deprecated certFilename property on the ssh component
---
components/camel-ssh/src/main/docs/ssh-component.adoc | 7 ++-
.../org/apache/camel/component/ssh/SshComponent.java | 19 ---
docs/components/modules/ROOT/pages/ssh-component.adoc | 7 ++-
.../ssh/springboot/SshComponentConfiguration.java | 19 ---
4 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc
b/components/camel-ssh/src/main/docs/ssh-component.adoc
index d0fca53..31d639f 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -31,7 +31,7 @@ ssh:[username[:password]@]host[:port][?options]
// component options: START
-The SSH component supports 16 options, which are listed below.
+The SSH component supports 15 options, which are listed below.
@@ -47,7 +47,6 @@ The SSH component supports 16 options, which are listed below.
| *keyPairProvider* (security) | Sets the KeyPairProvider reference to use
when connecting using Certificates to the remote SSH Server. | |
KeyPairProvider
| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as
part of authentication. KeyPairProvider.loadKey(...) will be passed this value.
Defaults to ssh-rsa. | | String
| *timeout* (common) | Sets the timeout in milliseconds to wait in
establishing the remote SSH server connection. Defaults to 3 milliseconds.
| | long
-| *certFilename* (security) | *Deprecated* Sets the resource path of the
certificate to use for Authentication. Deprecation note: As of version 2.11,
replaced by certResource. | | String
| *certResource* (security) | Sets the resource path of the certificate to use
for Authentication. Will use ResourceHelperKeyPairProvider to resolve file
based certificate, and depends on keyType setting. | | String
| *channelType* (advanced) | Sets the channel type to pass to the Channel as
part of command execution. Defaults to exec. | | String
| *shellPrompt* (advanced) | Sets the shellPrompt to be dropped when response
is read after command execution | | String
@@ -137,7 +136,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
-The component supports 31 options, which are listed below.
+The component supports 30 options, which are listed below.
@@ -173,8 +172,6 @@ The component supports 31 options, which are listed below.
| *camel.component.ssh.sleep-for-shell-prompt* | Sets the sleep period in
milliseconds to wait reading response from shell prompt. Defaults to 100
milliseconds. | | Long
| *camel.component.ssh.timeout* | Sets the timeout in milliseconds to wait in
establishing the remote SSH server connection. Defaults to 3 milliseconds.
| | Long
| *camel.component.ssh.username* | Sets the username to use in logging into
the remote SSH server. | | String
-| *camel.component.ssh.cert-filename* | *Deprecated* Sets the resource path of
the certificate to use for Authentication. | | String
-| *camel.component.ssh.configuration.cert-filename* | *Deprecated* @deprecated
As of version 2.11, replaced by certResource. | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
index 08acee6..5cc5972 100644
---
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
+++
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
@@ -176,25 +176,6 @@ public class SshComponent extends DefaultComponent {
getConfiguration().setTimeout(timeout);
}
-/**
- * @deprecated As of version 2.11, replaced by {@link #getCertResource()}
- */
-@Deprecated
-public String getCertFilename() {
-return getConfiguration().getCertFilename();
-}
-
-/**
- * Sets the resource path of the certificate to use for Authentication.
- *
- * @deprecated As of version 2.11, replaced by {@link
#setCertResource(String)}
- */
-@Deprecated
-@Metadata(label = "security", deprecationNote = "As of version 2.11,
replaced by certResource.")
-public void setCertFilename(String certFilename) {
-getConfiguration().setCertFilename(certFilename);
-}
-
public String getCertResource() {
return getConfiguration().getCertResource();
}
diff --git a/docs/components/modules/ROOT/pages/ssh-component.adoc
b/docs/components/modules/ROOT/pages/ssh-component.adoc
index d0fca53..31d63
[camel] branch master updated (a268537 -> c5ad0ff)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from a268537 Polish camel-soroush to not use Endpoint as enum and also polished its label on its options. new 634b5fc Remove deprecated certFilename property on the ssh component new c5ad0ff Change the javadoc on the endpoint builder methods a bit to add the maven coordinates The 2 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: components/camel-ssh/src/main/docs/ssh-component.adoc | 7 ++- .../org/apache/camel/component/ssh/SshComponent.java | 19 --- .../endpoint/dsl/AMQPEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/AS2EndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/ActiveMQEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/AhcEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/ApnsEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/AsteriskEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/AtmosEndpointBuilderFactory.java | 2 +- .../AtmosphereWebsocketEndpointBuilderFactory.java| 3 +-- .../endpoint/dsl/AtomEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/AtomixMapEndpointBuilderFactory.java | 2 +- .../dsl/AtomixMessagingEndpointBuilderFactory.java| 4 ++-- .../dsl/AtomixMultiMapEndpointBuilderFactory.java | 4 ++-- .../dsl/AtomixQueueEndpointBuilderFactory.java| 2 +- .../endpoint/dsl/AtomixSetEndpointBuilderFactory.java | 2 +- .../dsl/AtomixValueEndpointBuilderFactory.java| 2 +- .../endpoint/dsl/AvroEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/BeanEndpointBuilderFactory.java | 4 ++-- .../dsl/BeanValidatorEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/BeanstalkEndpointBuilderFactory.java | 4 ++-- .../dsl/BlobServiceEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/BonitaEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/BoxEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/BraintreeEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/BrowseEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/CMEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/CMISEndpointBuilderFactory.java | 4 ++-- .../dsl/CaffeineCacheEndpointBuilderFactory.java | 3 ++- .../dsl/CaffeineLoadCacheEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CassandraEndpointBuilderFactory.java | 4 ++-- .../dsl/ChatScriptEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/ChunkEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CinderEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/ClassEndpointBuilderFactory.java | 3 ++- .../endpoint/dsl/ClientEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/CoAPEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CometdEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/ConsulEndpointBuilderFactory.java| 3 ++- .../dsl/ControlBusEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CordaEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/CouchDbEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/CouchbaseEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CryptoCmsEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CwEndpointBuilderFactory.java| 3 ++- .../endpoint/dsl/CxfEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/CxfRsEndpointBuilderFactory.java | 2 +- .../dsl/DataFormatEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DataSetEndpointBuilderFactory.java | 4 ++-- .../dsl/DataSetTestEndpointBuilderFactory.java| 2 +- .../endpoint/dsl/DdbEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DdbStreamEndpointBuilderFactory.java | 4 ++-- .../dsl/DigitalOceanEndpointBuilderFactory.java | 4 ++-- .../dsl/DigitalSignatureEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DirectEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/DirectVmEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DisruptorEndpointBuilderFactory.java | 4 ++-- .../dsl/DisruptorVmEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/DnsEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DockerEndpointBuilderFactory.java| 4 ++-- .../endpoint/dsl/DozerEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/DrillEndpointBuilderFactory.java | 3 ++- .../endpoint/dsl/DropboxEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/EC2EndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/ECSEndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/EKSEndpointBuilderFactory.java | 4 +
[camel] branch master updated: Upgrade Infinispan to version 9.4.15.Final
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
The following commit(s) were added to refs/heads/master by this push:
new 5e79beb Upgrade Infinispan to version 9.4.15.Final
5e79beb is described below
commit 5e79bebf5bff7392587e8e328b3f9abf68392590
Author: Andrea Cosentino
AuthorDate: Tue Jun 18 11:11:16 2019 +0200
Upgrade Infinispan to version 9.4.15.Final
---
components/camel-infinispan/pom.xml | 12
parent/pom.xml | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/components/camel-infinispan/pom.xml
b/components/camel-infinispan/pom.xml
index 07d8f7b..d1e33db 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -34,6 +34,7 @@
Camel Infinispan support
+ 4.0.18.Final
@@ -45,6 +46,17 @@
org.infinispan
infinispan-core
${infinispan-version}
+
+
+org.jgroups
+jgroups
+
+
+
+
+org.jgroups
+jgroups
+${jgroups-infinispan-version}
org.infinispan
diff --git a/parent/pom.xml b/parent/pom.xml
index 84affeae..85bb4c4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -302,7 +302,7 @@
2.3.4.726
1.0.7
2.7.0
-9.4.14.Final
+9.4.15.Final
2.1.6.Final
2.15
2.15_1
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34690 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch master updated: Polish endpoint DSL to add javadoc and to use SimpleBuilder to not import model in the DSL.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 15ff17b Polish endpoint DSL to add javadoc and to use SimpleBuilder
to not import model in the DSL.
15ff17b is described below
commit 15ff17b9fe63e3327bce44c1264ce2db938db7eb
Author: Claus Ibsen
AuthorDate: Tue Jun 18 11:23:52 2019 +0200
Polish endpoint DSL to add javadoc and to use SimpleBuilder to not import
model in the DSL.
---
.../camel/builder/EndpointConsumerBuilder.java | 20 ++
.../camel/builder/EndpointProducerBuilder.java | 24 ++
.../builder/endpoint/AbstractEndpointBuilder.java | 15 --
.../builder/endpoint/EndpointRouteBuilder.java | 4 ++--
.../builder/endpoint/FileConsumeCharsetTest.java | 2 +-
5 files changed, 51 insertions(+), 14 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
index 7d5b9ce..83f2ac2 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
@@ -20,12 +20,32 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchEndpointException;
+/**
+ * Type-safe endpoint DSL for building consumer endpoints.
+ *
+ * @see EndpointProducerBuilder
+ */
public interface EndpointConsumerBuilder {
+/**
+ * Builds and resolves this endpoint DSL as an endpoint.
+ *
+ * @param context the camel context
+ * @return a built {@link Endpoint}
+ * @throws NoSuchEndpointException is thrown if the endpoint
+ */
Endpoint resolve(CamelContext context) throws NoSuchEndpointException;
+/**
+ * Builds the url of this endpoint.
+ * This API is only intended for Camel internally.
+ */
String getUri();
+/**
+ * Adds an option to this endpoint.
+ * This API is only intended for Camel internally.
+ */
void setProperty(String name, Object value);
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
index b08034b..08543ae 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
@@ -21,14 +21,38 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
+/**
+ * Type-safe endpoint DSL for building producer endpoints.
+ *
+ * @see EndpointConsumerBuilder
+ */
public interface EndpointProducerBuilder {
+/**
+ * Builds and resolves this endpoint DSL as an endpoint.
+ *
+ * @param context the camel context
+ * @return a built {@link Endpoint}
+ * @throws NoSuchEndpointException is thrown if the endpoint
+ */
Endpoint resolve(CamelContext context) throws NoSuchEndpointException;
+/**
+ * Builds the url of this endpoint.
+ * This API is only intended for Camel internally.
+ */
String getUri();
+/**
+ * Adds an option to this endpoint.
+ * This API is only intended for Camel internally.
+ */
void setProperty(String name, Object value);
+/**
+ * Builds an expression of this endpoint url.
+ * This API is only intended for Camel internally.
+ */
Expression expr();
}
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index b243ac1..1d1725e 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -18,20 +18,17 @@ package org.apache.camel.builder.endpoint;
import java.net.URISyntaxException;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeMap;
-
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.model.language.SimpleExpression;
-import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.ExpressionAdapter;
+import org.apache.camel.builder.SimpleBuilder;
import org.apache.camel.util.URISuppor
[camel] 01/02: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7e8c28409ed99858f93ff1d9927233f649d7af3e
Author: Claus Ibsen
AuthorDate: Tue Jun 18 11:28:42 2019 +0200
Polished
---
.../src/main/java/org/apache/camel/maven/AutowireMojo.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index 8f936b4..621866e 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -136,9 +136,6 @@ public class AutowireMojo extends AbstractExecMojo {
private transient ClassLoader classLoader;
-// TODO: Allow to configure known types in xml config, or refer to
external file
-
-// CHECKSTYLE:OFF
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
CamelCatalog catalog = new DefaultCamelCatalog();
[camel] 02/02: Do not use deprecated maven api
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55896604dcfe26fefe707946af57978b616a353a
Author: Claus Ibsen
AuthorDate: Tue Jun 18 11:36:26 2019 +0200
Do not use deprecated maven api
---
.../java/org/apache/camel/maven/AutowireMojo.java | 50 ++
1 file changed, 4 insertions(+), 46 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index 621866e..d61c00a 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -46,16 +46,10 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Exclusion;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
@@ -64,6 +58,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.mojo.exec.AbstractExecMojo;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
@@ -123,7 +118,7 @@ public class AutowireMojo extends AbstractExecMojo {
private boolean downloadVersion;
@Component
-private ArtifactFactory artifactFactory;
+private RepositorySystem repositorySystem;
@Component
private ArtifactResolver artifactResolver;
@@ -488,49 +483,12 @@ public class AutowireMojo extends AbstractExecMojo {
}
// generic method to retrieve all the transitive dependencies
-private Collection getAllDependencies() throws
MojoExecutionException {
+private Collection getAllDependencies() {
List artifacts = new ArrayList<>();
for (Iterator dependencies = project.getDependencies().iterator();
dependencies.hasNext();) {
Dependency dependency = (Dependency)dependencies.next();
-
-String groupId = dependency.getGroupId();
-String artifactId = dependency.getArtifactId();
-
-VersionRange versionRange;
-try {
-versionRange =
VersionRange.createFromVersionSpec(dependency.getVersion());
-} catch (InvalidVersionSpecificationException e) {
-throw new MojoExecutionException("unable to parse version", e);
-}
-
-String type = dependency.getType();
-if (type == null) {
-type = "jar";
-}
-String classifier = dependency.getClassifier();
-boolean optional = dependency.isOptional();
-String scope = dependency.getScope();
-if (scope == null) {
-scope = Artifact.SCOPE_COMPILE;
-}
-
-Artifact art =
this.artifactFactory.createDependencyArtifact(groupId, artifactId, versionRange,
-type, classifier, scope, null, optional);
-
-if (scope.equalsIgnoreCase(Artifact.SCOPE_SYSTEM)) {
-art.setFile(new File(dependency.getSystemPath()));
-}
-
-List exclusions = new ArrayList<>();
-for (Exclusion exclusion : dependency.getExclusions()) {
-exclusions.add(exclusion.getGroupId() + ":" +
exclusion.getArtifactId());
-}
-
-ArtifactFilter newFilter = new ExcludesArtifactFilter(exclusions);
-
-art.setDependencyFilter(newFilter);
-
+Artifact art =
repositorySystem.createDependencyArtifact(dependency);
artifacts.add(art);
}
[camel] branch master updated (15ff17b -> 5589660)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 15ff17b Polish endpoint DSL to add javadoc and to use SimpleBuilder to not import model in the DSL. new 7e8c284 Polished new 5589660 Do not use deprecated maven api The 2 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: .../java/org/apache/camel/maven/AutowireMojo.java | 53 ++ 1 file changed, 4 insertions(+), 49 deletions(-)
[camel] 01/02: CAMEL-13647: Allow to do autowrire by classpath.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c80b547ec4cfbed18f8116bd1439791253b12fe7
Author: Claus Ibsen
AuthorDate: Tue Jun 18 12:00:43 2019 +0200
CAMEL-13647: Allow to do autowrire by classpath.
---
.../src/main/docs/camel-main-maven-plugin.adoc | 1 +
.../java/org/apache/camel/maven/AutowireMojo.java | 36 +-
examples/camel-example-main-artemis/pom.xml| 1 +
3 files changed, 30 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
index 99ca864..d826227 100644
--- a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
+++ b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
@@ -144,6 +144,7 @@ The maven plugin *autowire* goal supports the following
options which can be con
|===
| Parameter | Default Value | Description
| logClasspath | false | Whether to log the classpath when starting
+| logUnmapped | false | When autowiring has detected multiple implementations
(2 or more) of a given interface, which cannot be mapped, should they be logged
so you can see and add manual mapping if needed.
| downloadVersion | true | Whether to allow downloading Camel catalog version
from the internet.
This is needed if the project * uses a different Camel version than this
plugin is using by default.
| exclude | | To exclude autowiring specific properties with these key names.
You can also configure a single entry and separate the excludes with comma.
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index d61c00a..6950bb6 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -21,6 +21,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Modifier;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -43,6 +44,7 @@ import org.apache.camel.catalog.JSonSchemaHelper;
import org.apache.camel.catalog.maven.MavenVersionManager;
import org.apache.camel.support.PatternHelper;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.artifact.Artifact;
@@ -78,6 +80,13 @@ public class AutowireMojo extends AbstractExecMojo {
protected boolean logClasspath;
/**
+ * When autowiring has detected multiple implementations (2 or more) of a
given interface, which
+ * cannot be mapped, should they be logged so you can see and add manual
mapping if needed.
+ */
+@Parameter(property = "camel.logUnmapped", defaultValue = "false")
+protected boolean logUnmapped;
+
+/**
* The output directory for generated autowire file
*/
@Parameter(readonly = true, defaultValue =
"${project.build.directory}/classes/META-INF/services/org/apache/camel/")
@@ -281,10 +290,12 @@ public class AutowireMojo extends AbstractExecMojo {
Class clazz = classLoader.loadClass(javaType);
if (clazz.isInterface() && isComplexUserType(clazz)) {
Set> classes =
reflections.getSubTypesOf(clazz);
-// filter classes to not be interfaces or not a
top level class
-classes = classes.stream().filter(c ->
!c.isInterface() && c.getEnclosingClass() == null).collect(Collectors.toSet());
-Class best = chooseBestKnownType(clazz, classes,
mappingProperties);
-if (isValidAutowireClass(best)) {
+// filter classes (must not be interfaces, must
not be abstract, must be top level) and also a valid autowire class
+classes = classes.stream().filter(
+c -> !c.isInterface() &&
!Modifier.isAbstract(c.getModifiers()) && c.getEnclosingClass() == null &&
isValidAutowireClass(c))
+.collect(Collectors.toSet());
+Class best = chooseBestKnownType(componentName,
name, clazz, classes, mappingProperties);
+if (best != null) {
String line = "camel.component." +
componentName + "." + name + "=#class:" + best.getName();
getLog().debug(line);
aut
[camel] branch master updated (5589660 -> ea4b733)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 5589660 Do not use deprecated maven api new c80b547 CAMEL-13647: Allow to do autowrire by classpath. new ea4b733 CAMEL-13647: Allow to do autowrire by classpath. The 2 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: .../src/main/docs/camel-main-maven-plugin.adoc | 1 + .../java/org/apache/camel/maven/AutowireMojo.java | 39 +- examples/camel-example-main-artemis/pom.xml| 4 ++- 3 files changed, 35 insertions(+), 9 deletions(-)
[camel] 02/02: CAMEL-13647: Allow to do autowrire by classpath.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ea4b7334d9adaaf7bb7e9320439f938742502424
Author: Claus Ibsen
AuthorDate: Tue Jun 18 12:07:25 2019 +0200
CAMEL-13647: Allow to do autowrire by classpath.
---
.../main/java/org/apache/camel/maven/AutowireMojo.java| 15 +--
examples/camel-example-main-artemis/pom.xml | 5 +++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index 6950bb6..7b66a5c 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -44,7 +44,6 @@ import org.apache.camel.catalog.JSonSchemaHelper;
import org.apache.camel.catalog.maven.MavenVersionManager;
import org.apache.camel.support.PatternHelper;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.artifact.Artifact;
@@ -290,9 +289,13 @@ public class AutowireMojo extends AbstractExecMojo {
Class clazz = classLoader.loadClass(javaType);
if (clazz.isInterface() && isComplexUserType(clazz)) {
Set> classes =
reflections.getSubTypesOf(clazz);
-// filter classes (must not be interfaces, must
not be abstract, must be top level) and also a valid autowire class
+// filter classes (must not be interfaces, must be
public, must not be abstract, must be top level) and also a valid autowire class
classes = classes.stream().filter(
-c -> !c.isInterface() &&
!Modifier.isAbstract(c.getModifiers()) && c.getEnclosingClass() == null &&
isValidAutowireClass(c))
+c -> !c.isInterface()
+&&
Modifier.isPublic(c.getModifiers())
+&&
!Modifier.isAbstract(c.getModifiers())
+&& c.getEnclosingClass() == null
+&& isValidAutowireClass(c))
.collect(Collectors.toSet());
Class best = chooseBestKnownType(componentName,
name, clazz, classes, mappingProperties);
if (best != null) {
@@ -336,7 +339,7 @@ public class AutowireMojo extends AbstractExecMojo {
getLog().info("Cannot autowire option camel.component." +
componentName + "." + optionName
+ " as the interface: " + type.getName() + " has " +
candidates.size() + " implementations in the classpath:");
for (Class c : candidates) {
-getLog().info("Class: " + c.getName());
+getLog().info("\t\t" + c.getName());
}
}
}
@@ -348,7 +351,7 @@ public class AutowireMojo extends AbstractExecMojo {
String prefix = "camel.component." + componentName + ".";
name = StringHelper.dashToCamelCase(name);
-if (ObjectHelper.isNotEmpty(exclude)) {
+if (exclude != null && exclude.length > 0) {
// works on components too
for (String pattern : exclude) {
pattern = pattern.trim();
@@ -362,7 +365,7 @@ public class AutowireMojo extends AbstractExecMojo {
}
}
-if (ObjectHelper.isNotEmpty(include)) {
+if (include != null && include.length > 0) {
for (String pattern : include) {
pattern = pattern.trim();
pattern = StringHelper.dashToCamelCase(pattern);
diff --git a/examples/camel-example-main-artemis/pom.xml
b/examples/camel-example-main-artemis/pom.xml
index d4bf15e..b0132bb 100644
--- a/examples/camel-example-main-artemis/pom.xml
+++ b/examples/camel-example-main-artemis/pom.xml
@@ -105,9 +105,10 @@
${project.version}
false
-true
+
+
-jms
+
[camel] branch master updated: CAMEL-13661: Repaired the camel-example-spring-cloud-serviceregistry example
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d5709a3 CAMEL-13661: Repaired the
camel-example-spring-cloud-serviceregistry example
d5709a3 is described below
commit d5709a3606a2ca615ed6b87bab487b015493fbd6
Author: aldettinger
AuthorDate: Tue Jun 18 11:51:51 2019 +0200
CAMEL-13661: Repaired the camel-example-spring-cloud-serviceregistry example
---
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
examples/camel-example-spring-cloud-serviceregistry/README.adoc | 2 +-
parent/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
index f5f5de2..373da1d 100755
---
a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
+++
b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
@@ -17,7 +17,7 @@
#
-CONSUL_VER="1.0.8"
+CONSUL_VER="1.5.1"
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
# cleanup
diff --git
a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
index 85a0007..665db6c 100755
---
a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
+++
b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
@@ -17,7 +17,7 @@
#
-CONSUL_VER="1.0.8"
+CONSUL_VER="1.5.1"
CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-cloud-serviceregistry/README.adoc
b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
index ac9cb16..886b912 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/README.adoc
+++ b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
@@ -24,7 +24,7 @@ Using multiple shells:
- start consul:
docker run --rm -ti --publish 8500:8500 \
-consul:1.0.7 \
+consul:1.5.1 \
agent \
-dev \
-server \
diff --git a/parent/pom.xml b/parent/pom.xml
index 85bb4c4..41125d6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -632,7 +632,7 @@
4.1.2.RELEASE_1
2.1.5.RELEASE
2.0.2.RELEASE
-
2.0.2.RELEASE
+
2.1.1.RELEASE
2.0.2.RELEASE
2.0.0.RELEASE
2.1.6.RELEASE
[camel] branch camel-2.x updated: CAMEL-13638: Fixed camel-salesforce-maven-plugin expected for the new attributes/type
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new d36d6d8 CAMEL-13638: Fixed camel-salesforce-maven-plugin expected for
the new attributes/type
d36d6d8 is described below
commit d36d6d8bed3bd895b8668d72598ca82f5a91f1c9
Author: aldettinger
AuthorDate: Fri Jun 14 17:44:32 2019 +0200
CAMEL-13638: Fixed camel-salesforce-maven-plugin expected for the new
attributes/type
---
.../test/resources/generated/With_External_Id__c_Lookup.java | 12
1 file changed, 12 insertions(+)
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
index da90919..77bc567 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
@@ -18,6 +18,18 @@ import com.thoughtworks.xstream.annotations.XStreamAlias;
@XStreamAlias("With_External_Id__c_Lookup")
@JsonInclude(Include.NON_NULL)
public class With_External_Id__c_Lookup {
+class Attributes {
+@JsonProperty("type")
+public String getType() {
+return "With_External_Id__c";
+}
+}
+
+@JsonProperty("attributes")
+public Attributes getAttributes() {
+return new Attributes();
+}
+
private String External_Id__c;
@JsonProperty("External_Id__c")
[camel] branch master updated: Upgrade Brave Zipkin to version 5.6.5
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 The following commit(s) were added to refs/heads/master by this push: new af50422 Upgrade Brave Zipkin to version 5.6.5 af50422 is described below commit af5042277d9642a7a256d0d487b4741af729a707 Author: Andrea Cosentino AuthorDate: Tue Jun 18 15:02:31 2019 +0200 Upgrade Brave Zipkin to version 5.6.5 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 41125d6..f6522f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,7 @@ 1.61 2.34.0 2.97.0 -5.6.3 +5.6.5 1.12 0.9.5.4 0.9.5.4_1
[camel] branch camel-2.23.x updated: Fixing failing scala tests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.23.x by this push:
new d30c23e Fixing failing scala tests
d30c23e is described below
commit d30c23e5bc79645a076f641930932242b5eaf9d0
Author: Colm O hEigeartaigh
AuthorDate: Tue Jun 18 14:19:35 2019 +0100
Fixing failing scala tests
---
.../src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
index 9bae48b..c0461b7 100644
---
a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
+++
b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
@@ -57,7 +57,7 @@ class SetHeaderTest extends ScalaTestSupport {
def doTestExpression(from: String, mock: String) {
mock expect {_.headerReceived("genus", "felis")}
test {
- from ! (new Cat("Duchess"), new Cat("Toulouse"))
+ from ! (new Cat("Duchess"))
}
}
[camel] 02/02: Fixed CS for Camel-Soroush
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 d03d9e1fa298f1f96b76f7a55616f9a8486e15a2 Author: Andrea Cosentino AuthorDate: Tue Jun 18 16:04:11 2019 +0200 Fixed CS for Camel-Soroush --- .../component/ExponentialBackOffProducerConnectionRetryTest.java | 2 +- .../soroushbot/component/FixedBackOffProducerConnectionRetryTest.java | 2 +- .../component/LinearBackOffProducerConnectionRetryTest.java | 2 +- .../component/MaxRetryWaitingTimeProducerConnectionRetryTest.java | 2 +- .../camel/component/soroushbot/component/ProducerAutoUploadFile.java | 2 +- .../component/soroushbot/component/ProducerAutoUploadFileIsFalse.java | 2 +- .../component/soroushbot/component/ProducerConnectionRetryTest.java | 2 +- .../camel/component/soroushbot/component/ProducerDownloadFile.java| 2 +- .../soroushbot/component/ProducerDownloadFileWithoutThumbnail.java| 2 +- .../soroushbot/component/ProducerMaxConnectionRetryReachedTest.java | 2 +- .../org/apache/camel/component/soroushbot/component/ProducerTest.java | 2 +- .../camel/component/soroushbot/component/ProducerUploadFile.java | 2 +- .../apache/camel/component/soroushbot/service/SoroushServiceTest.java | 2 +- .../camel/builder/endpoint/dsl/SoroushBotEndpointBuilderFactory.java | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java index 523d472..698b26d 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ExponentialBackOffProducerConnectionRetryTest.java @@ -20,8 +20,8 @@ import org.apache.camel.EndpointInject; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.MinorType; +import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.SoroushMessage; import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport; import org.apache.camel.component.soroushbot.support.SoroushBotWS; diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java index c3534f5..a34b376 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/FixedBackOffProducerConnectionRetryTest.java @@ -20,8 +20,8 @@ import org.apache.camel.EndpointInject; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.MinorType; +import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.SoroushMessage; import org.apache.camel.component.soroushbot.support.SoroushBotTestSupport; import org.apache.camel.component.soroushbot.support.SoroushBotWS; diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java index a877119..c932e4f 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/LinearBackOffProducerConnectionRetryTest.java @@ -20,8 +20,8 @@ import org.apache.camel.EndpointInject; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.MinorType; +import org.apache.camel.component.soroushbot.models.SoroushAction; import org.apache.camel.component.soroushbot.models.SoroushMessage; import org.apache.camel.compone
[camel] 01/02: Fixed CS for Camel Main Maven Plugin
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 691ed1a5ced08f39d91fbf9772b0105ac4c1886d
Author: Andrea Cosentino
AuthorDate: Tue Jun 18 15:50:16 2019 +0200
Fixed CS for Camel Main Maven Plugin
---
.../src/main/java/org/apache/camel/maven/AutowireMojo.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
index 7b66a5c..be9f91c 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/AutowireMojo.java
@@ -291,12 +291,12 @@ public class AutowireMojo extends AbstractExecMojo {
Set> classes =
reflections.getSubTypesOf(clazz);
// filter classes (must not be interfaces, must be
public, must not be abstract, must be top level) and also a valid autowire class
classes = classes.stream().filter(
-c -> !c.isInterface()
-&&
Modifier.isPublic(c.getModifiers())
-&&
!Modifier.isAbstract(c.getModifiers())
-&& c.getEnclosingClass() == null
-&& isValidAutowireClass(c))
-.collect(Collectors.toSet());
+c -> !c.isInterface()
+ && Modifier.isPublic(c.getModifiers())
+ && !Modifier.isAbstract(c.getModifiers())
+ && c.getEnclosingClass() == null
+ && isValidAutowireClass(c))
+ .collect(Collectors.toSet());
Class best = chooseBestKnownType(componentName,
name, clazz, classes, mappingProperties);
if (best != null) {
String line = "camel.component." +
componentName + "." + name + "=#class:" + best.getName();
[camel] branch master updated (af50422 -> d03d9e1)
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 af50422 Upgrade Brave Zipkin to version 5.6.5 new 691ed1a Fixed CS for Camel Main Maven Plugin new d03d9e1 Fixed CS for Camel-Soroush The 2 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: .../src/main/java/org/apache/camel/maven/AutowireMojo.java | 12 ++-- .../ExponentialBackOffProducerConnectionRetryTest.java | 2 +- .../component/FixedBackOffProducerConnectionRetryTest.java | 2 +- .../component/LinearBackOffProducerConnectionRetryTest.java | 2 +- .../MaxRetryWaitingTimeProducerConnectionRetryTest.java | 2 +- .../soroushbot/component/ProducerAutoUploadFile.java | 2 +- .../soroushbot/component/ProducerAutoUploadFileIsFalse.java | 2 +- .../soroushbot/component/ProducerConnectionRetryTest.java| 2 +- .../component/soroushbot/component/ProducerDownloadFile.java | 2 +- .../component/ProducerDownloadFileWithoutThumbnail.java | 2 +- .../component/ProducerMaxConnectionRetryReachedTest.java | 2 +- .../camel/component/soroushbot/component/ProducerTest.java | 2 +- .../component/soroushbot/component/ProducerUploadFile.java | 2 +- .../component/soroushbot/service/SoroushServiceTest.java | 2 +- .../endpoint/dsl/SoroushBotEndpointBuilderFactory.java | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-)
[camel] branch master updated: CAMEL-13647: Allow to do autowrire by classpath. Fixed camel-activemq about lazy creating ConnectionFactory.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e5018cb CAMEL-13647: Allow to do autowrire by classpath. Fixed
camel-activemq about lazy creating ConnectionFactory.
e5018cb is described below
commit e5018cb9442428734c68ec6e90894144be407cc1
Author: Claus Ibsen
AuthorDate: Tue Jun 18 20:14:35 2019 +0200
CAMEL-13647: Allow to do autowrire by classpath. Fixed camel-activemq about
lazy creating ConnectionFactory.
---
.../java/org/apache/camel/component/activemq/ActiveMQComponent.java | 4 ++--
.../org/apache/camel/component/activemq/ActiveMQConfiguration.java| 2 +-
.../camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java| 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
index 64ed701..25f8980 100644
---
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
+++
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
@@ -198,7 +198,7 @@ public class ActiveMQComponent extends JmsComponent {
}
// use OriginalDestinationPropagateStrategy by default if no custom
-// stategy has been set
+// strategy has been set
if (getMessageCreatedStrategy() == null) {
setMessageCreatedStrategy(new
OriginalDestinationPropagateStrategy());
}
@@ -208,7 +208,7 @@ public class ActiveMQComponent extends JmsComponent {
try {
if (source == null) {
if (connection == null) {
-Connection value =
getConfiguration().getConnectionFactory().createConnection();
+Connection value =
getConfiguration().getOrCreateConnectionFactory().createConnection();
if (value instanceof EnhancedConnection) {
connection = (EnhancedConnection)value;
} else {
diff --git
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index 86af7a0..f716278 100644
---
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -134,7 +134,7 @@ public class ActiveMQConfiguration extends JmsConfiguration
{
*/
@Override
protected PlatformTransactionManager createTransactionManager() {
-JmsTransactionManager answer = new
JmsTransactionManager(getConnectionFactory());
+JmsTransactionManager answer = new
JmsTransactionManager(getOrCreateConnectionFactory());
answer.afterPropertiesSet();
return answer;
}
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index f72aa65..2dbd44d 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -4661,8 +4661,8 @@ public interface ActiveMQEndpointBuilderFactory {
}
/**
* The activemq component allows messages to be sent to (or consumed from)
- * Apache ActiveMQ. This component extends the Camel JMS component.
- * Maven coordinates: org.apache.camel:camel-activemq
+ * Apache ActiveMQ. This component extends the Camel JMS component. Creates
+ * a builder to build endpoints for the ActiveMQ component.
*/
default ActiveMQEndpointBuilder activeMQ(String path) {
class ActiveMQEndpointBuilderImpl extends AbstractEndpointBuilder
implements ActiveMQEndpointBuilder, AdvancedActiveMQEndpointBuilder {
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34707 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34708 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] 06/06: Fixed example with wrong throttle XML
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c3da2b0d3bb5fb8d3c2803d8bef4fc6258d7470f Author: Claus Ibsen AuthorDate: Wed Jun 19 05:51:04 2019 +0200 Fixed example with wrong throttle XML --- .../src/main/resources/META-INF/spring/camel-context.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml index 2dc1ee6..e48a56e 100644 --- a/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml +++ b/examples/camel-example-management/src/main/resources/META-INF/spring/camel-context.xml @@ -48,13 +48,13 @@ 10 - - -/stock/symbol/text() - - - + + + /stock/symbol/text() + + +
[camel] branch master updated (e5018cb -> c3da2b0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e5018cb CAMEL-13647: Allow to do autowrire by classpath. Fixed
camel-activemq about lazy creating ConnectionFactory.
new 4279645 CAMEL-13658: Using OutputNode instead of isOutputSupported
method to mark if a node/definition supports outputs or not.
new d1d8f40 CAMEL-13658: Using OutputNode instead of isOutputSupported
method to mark if a node/definition supports outputs or not.
new 108d6f6 Fixed compiler deprecation warning from java 11
new e682604 CAMEL-13658: Using OutputNode instead of isOutputSupported
method to mark if a node/definition supports outputs or not.
new 070447a Regen
new c3da2b0 Fixed example with wrong throttle XML
The 6 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-ssh/src/main/docs/ssh-component.adoc | 1 +
components/readme.adoc | 2 +-
.../apache/camel/model/AggregateDefinition.java| 6 +-
.../org/apache/camel/model/CatchDefinition.java| 6 +-
.../org/apache/camel/model/ChoiceDefinition.java | 7 +-
.../org/apache/camel/model/DelayDefinition.java| 2 +-
.../camel/model/DynamicRouterDefinition.java | 2 +-
.../org/apache/camel/model/EnrichDefinition.java | 2 +-
.../org/apache/camel/model/ExpressionNode.java | 41 ---
.../org/apache/camel/model/FilterDefinition.java | 2 +-
.../org/apache/camel/model/HystrixDefinition.java | 6 +-
.../camel/model/IdempotentConsumerDefinition.java | 2 +-
.../apache/camel/model/LoadBalanceDefinition.java | 6 +-
.../org/apache/camel/model/LoopDefinition.java | 2 +-
.../org/apache/camel/model/NoOutputDefinition.java | 3 -
.../apache/camel/model/OnCompletionDefinition.java | 6 +-
.../apache/camel/model/OnExceptionDefinition.java | 6 +-
.../org/apache/camel/model/OutputDefinition.java | 6 +-
...pressionNode.java => OutputExpressionNode.java} | 36 +++---
.../{ModelCamelContext.java => OutputNode.java}| 8 +-
.../apache/camel/model/PollEnrichDefinition.java | 2 +-
.../apache/camel/model/ProcessorDefinition.java| 6 +-
.../camel/model/RecipientListDefinition.java | 2 +-
.../apache/camel/model/ResequenceDefinition.java | 7 +-
.../org/apache/camel/model/RouteDefinition.java| 6 +-
.../apache/camel/model/RoutingSlipDefinition.java | 2 +-
.../org/apache/camel/model/ScriptDefinition.java | 2 +-
.../org/apache/camel/model/SetBodyDefinition.java | 2 +-
.../apache/camel/model/SetFaultBodyDefinition.java | 2 +-
.../apache/camel/model/SetHeaderDefinition.java| 2 +-
.../apache/camel/model/SetPropertyDefinition.java | 2 +-
.../org/apache/camel/model/SortDefinition.java | 2 +-
.../org/apache/camel/model/SplitDefinition.java| 2 +-
.../org/apache/camel/model/ThrottleDefinition.java | 4 +-
.../apache/camel/model/TransformDefinition.java| 2 +-
.../org/apache/camel/model/ValidateDefinition.java | 2 +-
.../org/apache/camel/model/WhenDefinition.java | 2 +-
.../loadbalancer/WeightedLoadBalancerReifier.java | 2 +-
.../modules/ROOT/pages/soroush-component.adoc | 34 +++---
.../modules/ROOT/pages/ssh-component.adoc | 1 +
.../resources/META-INF/spring/camel-context.xml| 12 +-
.../camel-spring-boot-dependencies/pom.xml | 126 ++---
.../apt/CoreEipAnnotationProcessorHelper.java | 14 +--
43 files changed, 171 insertions(+), 219 deletions(-)
rename
core/camel-core/src/main/java/org/apache/camel/model/{NoOutputExpressionNode.java
=> OutputExpressionNode.java} (60%)
copy
core/camel-core/src/main/java/org/apache/camel/model/{ModelCamelContext.java =>
OutputNode.java} (83%)
[camel] 04/06: CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark if a node/definition supports outputs or not.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e682604b9ad076048595eedbe9e2f5d2b503c7e3
Author: Claus Ibsen
AuthorDate: Tue Jun 18 21:27:50 2019 +0200
CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark
if a node/definition supports outputs or not.
---
.../src/main/java/org/apache/camel/model/ExpressionNode.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
index e5d47f1..8de221c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -127,9 +127,14 @@ public abstract class ExpressionNode extends
ProcessorDefinition
@Override
public ExpressionNode id(String id) {
-// let parent handle assigning the id, as we do not support outputs
-getParent().id(id);
-return this;
+if (!(this instanceof OutputNode)) {
+// let parent handle assigning the id, as we do not support outputs
+getParent().id(id);
+return this;
+} else {
+return super.id(id);
+}
}
+
}
[camel] 01/06: CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark if a node/definition supports outputs or not.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4279645d5be45cfad0b731b566714c59b98849e9
Author: Claus Ibsen
AuthorDate: Tue Jun 18 20:44:41 2019 +0200
CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark
if a node/definition supports outputs or not.
---
.../apache/camel/model/AggregateDefinition.java| 6 +---
.../org/apache/camel/model/CatchDefinition.java| 6 +---
.../org/apache/camel/model/ChoiceDefinition.java | 7 +
.../org/apache/camel/model/DelayDefinition.java| 2 +-
.../camel/model/DynamicRouterDefinition.java | 2 +-
.../org/apache/camel/model/EnrichDefinition.java | 2 +-
.../org/apache/camel/model/ExpressionNode.java | 36 +++---
.../org/apache/camel/model/FilterDefinition.java | 2 +-
.../org/apache/camel/model/HystrixDefinition.java | 6 +---
.../camel/model/IdempotentConsumerDefinition.java | 2 +-
.../apache/camel/model/LoadBalanceDefinition.java | 6 +---
.../org/apache/camel/model/LoopDefinition.java | 2 +-
.../org/apache/camel/model/NoOutputDefinition.java | 3 --
.../apache/camel/model/OnCompletionDefinition.java | 6 +---
.../apache/camel/model/OnExceptionDefinition.java | 6 +---
.../org/apache/camel/model/OutputDefinition.java | 6 +---
...pressionNode.java => OutputExpressionNode.java} | 36 +-
.../{NoOutputDefinition.java => OutputNode.java} | 16 +++---
.../apache/camel/model/PollEnrichDefinition.java | 2 +-
.../apache/camel/model/ProcessorDefinition.java| 6 ++--
.../camel/model/RecipientListDefinition.java | 2 +-
.../apache/camel/model/ResequenceDefinition.java | 7 +
.../org/apache/camel/model/RouteDefinition.java| 6 +---
.../apache/camel/model/RoutingSlipDefinition.java | 2 +-
.../org/apache/camel/model/ScriptDefinition.java | 2 +-
.../org/apache/camel/model/SetBodyDefinition.java | 2 +-
.../apache/camel/model/SetFaultBodyDefinition.java | 2 +-
.../apache/camel/model/SetHeaderDefinition.java| 2 +-
.../apache/camel/model/SetPropertyDefinition.java | 2 +-
.../org/apache/camel/model/SortDefinition.java | 2 +-
.../org/apache/camel/model/SplitDefinition.java| 2 +-
.../org/apache/camel/model/ThrottleDefinition.java | 2 +-
.../apache/camel/model/TransformDefinition.java| 2 +-
.../org/apache/camel/model/ValidateDefinition.java | 2 +-
.../org/apache/camel/model/WhenDefinition.java | 2 +-
35 files changed, 68 insertions(+), 131 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index e8b6727..3eff2d2 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -49,7 +49,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,routing")
@XmlRootElement(name = "aggregate")
@XmlAccessorType(XmlAccessType.FIELD)
-public class AggregateDefinition extends
ProcessorDefinition implements
ExecutorServiceAwareDefinition {
+public class AggregateDefinition extends
ProcessorDefinition implements OutputNode,
ExecutorServiceAwareDefinition {
@XmlElement(name = "correlationExpression", required = true)
private ExpressionSubElementDefinition correlationExpression;
@XmlElement(name = "completionPredicate") @AsPredicate
@@ -943,10 +943,6 @@ public class AggregateDefinition extends
ProcessorDefinition> outputs) {
this.outputs = outputs;
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
index c0d7782..acba75a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -37,7 +37,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "error")
@XmlRootElement(name = "doCatch")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CatchDefinition extends ProcessorDefinition {
+public class CatchDefinition extends ProcessorDefinition
implements OutputNode {
@XmlElement(name = "exception")
private List exceptions = new ArrayList<>();
@XmlElement(name = "onWhen") @AsPredicate
@@ -83,10 +83,6 @@ public class CatchDefinition extends
ProcessorDefinition {
this.outputs = outputs;
}
-public boolean isOutputSupported() {
-return true;
-}
-
public List> getExceptionClasses() {
return exceptionClasses;
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index de4dd2a..e1c4a0b 10064
[camel] 05/06: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 070447aea7a6bfe6085df582be5078dab77ed570 Author: Claus Ibsen AuthorDate: Wed Jun 19 05:26:29 2019 +0200 Regen --- .../camel-ssh/src/main/docs/ssh-component.adoc | 1 + components/readme.adoc | 2 +- .../modules/ROOT/pages/soroush-component.adoc | 34 +++--- .../modules/ROOT/pages/ssh-component.adoc | 1 + .../camel-spring-boot-dependencies/pom.xml | 126 ++--- 5 files changed, 83 insertions(+), 81 deletions(-) diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc index 31d639f..8e9cc2c 100644 --- a/components/camel-ssh/src/main/docs/ssh-component.adoc +++ b/components/camel-ssh/src/main/docs/ssh-component.adoc @@ -172,6 +172,7 @@ The component supports 30 options, which are listed below. | *camel.component.ssh.sleep-for-shell-prompt* | Sets the sleep period in milliseconds to wait reading response from shell prompt. Defaults to 100 milliseconds. | | Long | *camel.component.ssh.timeout* | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 3 milliseconds. | | Long | *camel.component.ssh.username* | Sets the username to use in logging into the remote SSH server. | | String +| *camel.component.ssh.configuration.cert-filename* | *Deprecated* | | String |=== // spring-boot-auto-configure options: END diff --git a/components/readme.adoc b/components/readme.adoc index 1bb9eee..c3ee990 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -764,7 +764,7 @@ Number of Components: 296 in 233 JAR artifacts (0 deprecated) `solr:url` | 2.9 | The solr component allows you to interface with an Apache Lucene Solr server. | link:camel-soroush/src/main/docs/soroush-component.adoc[Soroush] (camel-soroush) + -`soroush:endpoint/authorizationToken` | 3.0 | To integrate with the Soroush chat bot. +`soroush:action/authorizationToken` | 3.0 | To integrate with the Soroush chat bot. | link:camel-spark-rest/src/main/docs/spark-rest-component.adoc[Spark Rest] (camel-spark-rest) + `spark-rest:verb:path` | 2.14 | The spark-rest component is used for hosting REST services which has been defined using Camel rest-dsl. diff --git a/docs/components/modules/ROOT/pages/soroush-component.adoc b/docs/components/modules/ROOT/pages/soroush-component.adoc index 59293a8..c93310b 100644 --- a/docs/components/modules/ROOT/pages/soroush-component.adoc +++ b/docs/components/modules/ROOT/pages/soroush-component.adoc @@ -67,7 +67,7 @@ The Soroush component supports 3 options, which are listed below. The Soroush endpoint is configured using URI syntax: -soroush:endpoint/authorizationToken +soroush:action/authorizationToken with the following path and query parameters: @@ -78,7 +78,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *endpoint* | *Required* The endpoint type. Support getMessage as consumer and sendMessage,uploadFile,downloadFile as producer | | Endpoint +| *action* | *Required* The action to do. | | SoroushAction |=== @@ -88,28 +88,28 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *connectionTimeout* (common) | Connection timeout in ms when connecting to soroush API | 3 | int +| *maxConnectionRetry* (common) | Maximum connection retry when fail to connect to soroush API, if the quota is reached, MaximumConnectionRetryReachedException is thrown for that message. | 4 | int | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean -| *concurrentConsumers* (consumer) | Number of Thread created by consumer in the route. if you use this method for parallelism, it is guaranteed that messages from same user always execute in the same thread and therefore messages from the same user are processed sequentially. Default value notice: using SoroushBotSingleThreadConsumer | 1 | Integer -| *queueCapacityPerThread* (consumer) | Maximum capacity of each queue when concurrentConsumers is greater than 1. if a queue become full, every message that should go to that queue will be dropped. If bridgeErrorHandler is set to true, an exchange with CongestionException is directed to ErrorHandler. You can
[camel] 02/06: CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark if a node/definition supports outputs or not.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d1d8f4034c298914630ad3dba77bdfdc744e5ceb
Author: Claus Ibsen
AuthorDate: Tue Jun 18 21:21:02 2019 +0200
CAMEL-13658: Using OutputNode instead of isOutputSupported method to mark
if a node/definition supports outputs or not.
---
.../java/org/apache/camel/model/ThrottleDefinition.java| 2 +-
.../camel/tools/apt/CoreEipAnnotationProcessorHelper.java | 14 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
index a1436ee..c8a8d43 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
@@ -37,7 +37,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,routing")
@XmlRootElement(name = "throttle")
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(propOrder = {"expression", "correlationExpression", "outputs"})
+@XmlType(propOrder = {"expression", "correlationExpression"})
public class ThrottleDefinition extends ExpressionNode implements
ExecutorServiceAwareDefinition {
@XmlElement(name = "correlationExpression")
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index 554fc96..396dda5 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -51,6 +51,7 @@ import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findJavaDoc;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findTypeElement;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findTypeElementChildren;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.hasSuperClass;
+import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.implementsInterface;
import static org.apache.camel.tools.apt.AnnotationProcessorHelper.processFile;
import static
org.apache.camel.tools.apt.helper.JsonSchemaHelper.sanitizeDescription;
import static org.apache.camel.tools.apt.helper.Strings.canonicalClassName;
@@ -71,9 +72,9 @@ public class CoreEipAnnotationProcessorHelper {
// find all classes)
private static final String[] ONE_OF_INPUTS = new String[]
{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.VerbDefinition"};
// special for outputs (these classes have sub classes, so we use this to
-// find all classes)
+// find all classes - and not in particular if they support outputs or not)
private static final String[] ONE_OF_OUTPUTS = new String[]
{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.NoOutputDefinition",
-
"org.apache.camel.model.OutputDefinition",
"org.apache.camel.model.ExpressionNode",
+
"org.apache.camel.model.OutputDefinition",
"org.apache.camel.model.OutputExpressionNode",
"org.apache.camel.model.NoOutputExpressionNode",
"org.apache.camel.model.SendDefinition",
"org.apache.camel.model.InterceptDefinition",
"org.apache.camel.model.WhenDefinition",
"org.apache.camel.model.ToDynamicDefinition"};
@@ -767,7 +768,7 @@ public class CoreEipAnnotationProcessorHelper {
*/
private void processOutputs(ProcessingEnvironment processingEnv,
RoundEnvironment roundEnv, TypeElement originalClassType, XmlElementRef
elementRef,
VariableElement fieldElement, String
fieldName, Set eipOptions, String prefix) {
-if ("outputs".equals(fieldName) && supportOutputs(originalClassType)) {
+if ("outputs".equals(fieldName) && supportOutputs(processingEnv,
roundEnv, originalClassType)) {
String kind = "element";
String name = elementRef.name();
if (isNullOrEmpty(name) || "##default".equals(name)) {
@@ -818,7 +819,7 @@ public class CoreEipAnnotationProcessorHelper {
Elements elementUtils = processingEnv.getElementUtils();
-if ("verbs".equals(fieldName) && supportOutputs(originalClassType)) {
+if ("verbs".equals(fieldName) && supportOutputs(processingEnv,
roundEnv, originalClassType)) {
String kind = "element";
String name = elementRef.name();
i
[camel] 03/06: Fixed compiler deprecation warning from java 11
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 108d6f624bff5c8924cfbc30c7877eb879e88391 Author: Claus Ibsen AuthorDate: Tue Jun 18 21:22:21 2019 +0200 Fixed compiler deprecation warning from java 11 --- .../apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java index e0cfe54..d57a25c 100644 --- a/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java +++ b/core/camel-core/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java @@ -42,7 +42,7 @@ class WeightedLoadBalancerReifier extends LoadBalancerReifier
