[camel] branch master updated (388d846 -> 87a7818)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (388d846 -> 87a7818)

davsclaus-2
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 388d846  Regen
     new 51d0198  CAMEL-12716: Some spring-boot-starters generated have wrong component name in their javadoc documentation
     new 87a7818  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:
 .../camel/component/mail/springboot/MailComponentConfiguration.java    | 2 +-
 .../apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: CAMEL-12716: Some spring-boot-starters generated have wrong component name in their javadoc documentation

davsclaus-2
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 51d0198787a9513c8c38cbc444cf167e1df01ea4
Author: Claus Ibsen <[hidden email]>
AuthorDate: Thu Aug 9 09:10:35 2018 +0200

    CAMEL-12716: Some spring-boot-starters generated have wrong component name in their javadoc documentation
---
 .../apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 3bb1f13..f49ea23 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -708,7 +708,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
 
         // add bogus field for enabled so spring boot tooling can get the javadoc as description in its metadata
         PropertySource<JavaClassSource> bogus = javaClass.addProperty("java.lang.Boolean", "enabled");
-        bogus.getField().getJavaDoc().setText("Whether to enable auto configuration of the " + model.getScheme() + " component. This is enabled by default.");
+        String scheme = overrideComponentName != null ? overrideComponentName : model.getScheme();
+        bogus.getField().getJavaDoc().setText("Whether to enable auto configuration of the " + scheme + " component. This is enabled by default.");
         bogus.removeAccessor();
         bogus.removeMutator();
 

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: Regen

davsclaus-2
In reply to this post by davsclaus-2
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 87a7818813ce70a59a0d6f96bcb1e8966906adc5
Author: Claus Ibsen <[hidden email]>
AuthorDate: Thu Aug 9 10:07:54 2018 +0200

    Regen
---
 .../camel/component/mail/springboot/MailComponentConfiguration.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0ebd8fb..03a4d08 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 imap component. This is
+     * Whether to enable auto configuration of the mail component. This is
      * enabled by default.
      */
     private Boolean enabled;