Repository: camel Updated Branches: refs/heads/master 4e1759aeb -> 9c01dc084
CAMEL-10524: sorting the configuration in the plugin Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9067de08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9067de08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9067de08 Branch: refs/heads/master Commit: 9067de08ebed999f28df34f39566ac6c469bb7f5 Parents: 4e1759a Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Fri Nov 25 16:59:26 2016 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Fri Nov 25 16:59:26 2016 +0100 ---------------------------------------------------------------------- .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9067de08/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- 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 08551c5..a997ce2c 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 @@ -64,6 +64,7 @@ import org.jboss.forge.roaster.model.source.JavaClassSource; import org.jboss.forge.roaster.model.source.MethodSource; import org.jboss.forge.roaster.model.source.PropertySource; import org.jboss.forge.roaster.model.util.Strings; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -777,6 +778,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { javaClass.addAnnotation(Configuration.class); javaClass.addAnnotation(ConditionalOnBean.class).setStringValue("type", "org.apache.camel.springboot.CamelAutoConfiguration"); + javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name", "org.apache.camel.springboot.CamelAutoConfiguration"); String configurationName = name.replace("ComponentAutoConfiguration", "ComponentConfiguration"); if (hasOptions) { @@ -835,6 +837,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { javaClass.addAnnotation(Configuration.class); javaClass.addAnnotation(ConditionalOnBean.class).setStringValue("type", "org.apache.camel.springboot.CamelAutoConfiguration"); + javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name", "org.apache.camel.springboot.CamelAutoConfiguration"); String configurationName = name.replace("DataFormatAutoConfiguration", "DataFormatConfiguration"); if (hasOptions) { @@ -895,6 +898,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { javaClass.addAnnotation(Configuration.class); javaClass.addAnnotation(ConditionalOnBean.class).setStringValue("type", "org.apache.camel.springboot.CamelAutoConfiguration"); + javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name", "org.apache.camel.springboot.CamelAutoConfiguration"); String configurationName = name.replace("LanguageAutoConfiguration", "LanguageConfiguration"); if (hasOptions) {
