You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/07/23 08:22:44 UTC

[camel] branch master updated (0ab5033 -> 7617953)

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 0ab5033  [CAMEL-12673]enable to configure passPhrase of XMLSecurityDataFormat as byte[]
     new 3fb0760  Removed Docker Maven Plugin placeholder since now we use testContainers component to spin containers for testing
     new 7617953  Regen

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                                                          | 1 -
 .../camel/component/mail/springboot/MailComponentConfiguration.java     | 2 +-
 .../camel/component/sip/springboot/SipComponentConfiguration.java       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


[camel] 02/02: Regen

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 761795356cf9c9ce09d7376438a57b71b3ccb06e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 23 10:20:33 2018 +0200

    Regen
---
 .../camel/component/mail/springboot/MailComponentConfiguration.java     | 2 +-
 .../camel/component/sip/springboot/SipComponentConfiguration.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
index cb4f540..0ebd8fb 100644
--- a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java
@@ -37,7 +37,7 @@ public class MailComponentConfiguration
             ComponentConfigurationPropertiesCommon {
 
     /**
-     * Whether to enable auto configuration of the pop3s component. This is
+     * Whether to enable auto configuration of the imap component. This is
      * enabled by default.
      */
     private Boolean enabled;
diff --git a/platforms/spring-boot/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentConfiguration.java
index 512b77d..add23b9 100644
--- a/platforms/spring-boot/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-sip-starter/src/main/java/org/apache/camel/component/sip/springboot/SipComponentConfiguration.java
@@ -33,7 +33,7 @@ public class SipComponentConfiguration
             ComponentConfigurationPropertiesCommon {
 
     /**
-     * Whether to enable auto configuration of the sips component. This is
+     * Whether to enable auto configuration of the sip component. This is
      * enabled by default.
      */
     private Boolean enabled;


[camel] 01/02: Removed Docker Maven Plugin placeholder since now we use testContainers component to spin containers for testing

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3fb076006f9d617729396ba809e35e941ea90d7a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 23 09:48:18 2018 +0200

    Removed Docker Maven Plugin placeholder since now we use testContainers component to spin containers for testing
---
 parent/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f37b305..4bf50e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,7 +184,6 @@
     <dnsjava-bundle-version>2.1.8_1</dnsjava-bundle-version>
     <docker-java-version>3.0.14</docker-java-version>
     <docker-java-bundle-version>3.0.14_1</docker-java-bundle-version>
-    <docker-maven-plugin-version>0.26.0</docker-maven-plugin-version>
     <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
     <dozer-version>6.2.0</dozer-version>
     <drools-version>7.3.0.Final</drools-version>