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 2017/06/03 07:40:01 UTC
[1/2] camel git commit: Typo
Repository: camel
Updated Branches:
refs/heads/master ba392812e -> e1c3bf52a
Typo
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c136903
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c136903
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c136903
Branch: refs/heads/master
Commit: 2c136903032e089a72ca0935b3c20501a255dbef
Parents: ba39281
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 3 09:25:27 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 3 09:25:27 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/OnExceptionDefinition.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2c136903/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 8e74f89..507799e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -707,7 +707,7 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
}
/**
- * Turn on exponential backk off
+ * Turn on exponential back off
*
* @return the builder
*/
@@ -786,8 +786,8 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
* <p/>
* <b>Notice:</b> this only applies when all redeliveries attempt have failed and the {@link org.apache.camel.Exchange} is doomed for failure.
* <br/>
- * Instead of using the current inprogress {@link org.apache.camel.Exchange} IN body we use the original IN body instead. This allows
- * you to store the original input in the dead letter queue instead of the inprogress snapshot of the IN body.
+ * Instead of using the current in-progress {@link org.apache.camel.Exchange} IN body we use the original IN body instead. This allows
+ * you to store the original input in the dead letter queue instead of the in-progress snapshot of the IN body.
* For instance if you route transform the IN body during routing and then failed. With the original exchange
* store in the dead letter queue it might be easier to manually re submit the {@link org.apache.camel.Exchange} again as the IN body
* is the same as when Camel received it. So you should be able to send the {@link org.apache.camel.Exchange} to the same input.
[2/2] camel git commit: Regen
Posted by da...@apache.org.
Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1c3bf52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1c3bf52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1c3bf52
Branch: refs/heads/master
Commit: e1c3bf52ad286276da7bbce0bdcb3c4e1ffdb927
Parents: 2c13690
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 3 09:34:30 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 3 09:34:30 2017 +0200
----------------------------------------------------------------------
.../twilio/springboot/TwilioComponentConfiguration.java | 3 ++-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e1c3bf52/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java
index 4752328..8e4f77e 100644
--- a/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java
@@ -24,7 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
- * Represents a Twilio endpoint.
+ * The Twilio component allows you to interact with the Twilio REST APIs using
+ * Twilio Java SDK.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/e1c3bf52/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 9687243..0987758 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2611,6 +2611,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-tika</artifactId>
<version>${project.version}</version>
</dependency>