You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/09/30 07:42:52 UTC
[camel] branch master updated (20786f1 -> deccd10)
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 20786f1 Upgrade Paho to version 1.2.2
new ebe394b CAMEL-13820: ResolveEndpointFailedException should mask sensitive information in uri
new e15b5ae Upgrade felix gogo in camel-test-karaf
new db2bd91 Upgrade maven-bundle-plugin
new deccd10 Add @BindToRegistry to docs
The 4 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-test-karaf/pom.xml | 2 +-
.../java/org/apache/camel/ResolveEndpointFailedException.java | 8 +++++---
docs/user-manual/modules/ROOT/pages/bean-integration.adoc | 6 ++++--
parent/pom.xml | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
[camel] 03/04: Upgrade maven-bundle-plugin
Posted by da...@apache.org.
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 db2bd91f4d4f4cc82e482e3abeb9a24045e9533b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 30 09:07:08 2019 +0200
Upgrade maven-bundle-plugin
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 14d7646..5cb1390 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -433,7 +433,7 @@
<maven-archetype-plugin-version>3.0.1</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
- <maven-bundle-plugin-version>4.2.0</maven-bundle-plugin-version>
+ <maven-bundle-plugin-version>4.2.1</maven-bundle-plugin-version>
<maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
<maven-checkstyle-version>7.6.1</maven-checkstyle-version>
<maven-owasp-plugin-version>5.2.2</maven-owasp-plugin-version>
[camel] 04/04: Add @BindToRegistry to docs
Posted by da...@apache.org.
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 deccd103e3502d4358a97c5f75a8349ddfc49c0d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 30 09:40:32 2019 +0200
Add @BindToRegistry to docs
---
docs/user-manual/modules/ROOT/pages/bean-integration.adoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/bean-integration.adoc b/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
index dcd3662..ab32537 100644
--- a/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
+++ b/docs/user-manual/modules/ROOT/pages/bean-integration.adoc
@@ -22,11 +22,11 @@ The following annotations is supported and inject by Camel's
|`@EndpointInject` |To inject an endpoint, see more details at xref:pojo-producing.adoc[POJO
Producing].
-|`@BeanInject` |*Camel 2.13:* To inject a bean obtained from the
+|`@BeanInject` |To inject a bean obtained from the
Registry. See xref:bean-injection.adoc[Bean
Injection].
-|`@PropertyInject` |*Camel 2.12:* To inject a value using
+|`@PropertyInject` |To inject a value using
property placeholder.
|`@Produce` |To inject a producer to send message to an endpoint. See
@@ -34,6 +34,8 @@ POJO Producing.
|`@Consume` |To inject a consumer on a method. See xref:pojo-consuming.adoc[POJO
Consuming].
+
+|`@BindToRegistry` |Used for binding a bean to the registry. If no name is specified then the bean will have its name auto computed based on the class name, field name, or method name where the annotation is configured.
|=======================================================================
See more details at:
[camel] 01/04: CAMEL-13820: ResolveEndpointFailedException should
mask sensitive information in uri
Posted by da...@apache.org.
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 ebe394bd43101f379c6621a6116fca9315344b49
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 30 09:01:08 2019 +0200
CAMEL-13820: ResolveEndpointFailedException should mask sensitive information in uri
---
.../java/org/apache/camel/ResolveEndpointFailedException.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java b/core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
index ed0915b..051a79b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel;
+import static org.apache.camel.util.URISupport.sanitizeUri;
+
/**
* A runtime exception thrown if an {@link Endpoint} cannot be resolved via URI
*/
@@ -24,17 +26,17 @@ public class ResolveEndpointFailedException extends RuntimeCamelException {
private final String uri;
public ResolveEndpointFailedException(String uri, Throwable cause) {
- super("Failed to resolve endpoint: " + uri + " due to: " + cause.getMessage(), cause);
+ super("Failed to resolve endpoint: " + sanitizeUri(uri) + " due to: " + cause.getMessage(), cause);
this.uri = uri;
}
public ResolveEndpointFailedException(String uri, String message) {
- super("Failed to resolve endpoint: " + uri + " due to: " + message);
+ super("Failed to resolve endpoint: " + sanitizeUri(uri) + " due to: " + message);
this.uri = uri;
}
public ResolveEndpointFailedException(String uri) {
- super("Failed to resolve endpoint: " + uri);
+ super("Failed to resolve endpoint: " + sanitizeUri(uri));
this.uri = uri;
}
[camel] 02/04: Upgrade felix gogo in camel-test-karaf
Posted by da...@apache.org.
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 e15b5ae2002c887e25f6f22cc36e9abf1d7dac66
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 30 09:05:17 2019 +0200
Upgrade felix gogo in camel-test-karaf
---
components/camel-test-karaf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index d9b1592..81075ff 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.6</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>