Repository: camel Updated Branches: refs/heads/master 80d1937cb -> ec01a6a7c
Improved detection of starters Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec01a6a7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec01a6a7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec01a6a7 Branch: refs/heads/master Commit: ec01a6a7c930469236d7b4a966c1bb8acb150e3a Parents: 80d1937 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Sep 22 09:22:10 2016 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Thu Sep 22 09:22:10 2016 +0200 ---------------------------------------------------------------------- .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 4 ++-- .../org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ec01a6a7/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 c8272d1..07b3d35 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 @@ -143,9 +143,9 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { // Spring-boot configuration has been moved on starters File starterDir = SpringBootHelper.starterDir(baseDir, project.getArtifactId()); - if (!starterDir.exists()) { + if (!starterDir.exists() || !(new File(starterDir, "pom.xml").exists())) { // If the starter does not exist, no configuration can be created - getLog().info("Component auto-configuration will not be created: the starter dir does not exist"); + getLog().info("Component auto-configuration will not be created: the starter does not exist"); return; } http://git-wip-us.apache.org/repos/asf/camel/blob/ec01a6a7/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java index 91d0291..ddea47f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java @@ -377,7 +377,9 @@ public class SpringBootStarterMojo extends AbstractMojo { modules.removeChild(modules.getFirstChild()); } - for (File starterDir : Arrays.asList(allStartersDir().listFiles((f, n) -> (new File(f, n)).isDirectory() && n.endsWith(SpringBootHelper.STARTER_SUFFIX))).stream().sorted() + for (File starterDir : Arrays + .asList(allStartersDir().listFiles((f, n) -> + (new File(f, n)).isDirectory() && n.endsWith(SpringBootHelper.STARTER_SUFFIX) && (new File(new File(f, n), "pom.xml").exists()))).stream().sorted() .collect(Collectors.toList())) { Node module = pom.createElement("module"); module.setTextContent(starterDir.getName());
