Repository: camel Updated Branches: refs/heads/camel-2.15.x 74f9ea0be -> c89f27904 refs/heads/master 32b4fd25d -> 1aa206102
CAMEL-7999: Fixed catalog to use default jetty component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1aa20610 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1aa20610 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1aa20610 Branch: refs/heads/master Commit: 1aa2061023bfff846e4f3eb3a52d291462a3bf1b Parents: 32b4fd2 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 21 07:23:20 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 21 07:23:20 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/maven/packaging/PackageHelper.java | 4 ++-- .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1aa20610/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java index c9da4bf..e3794d7 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java @@ -110,8 +110,8 @@ public final class PackageHelper { @Override public boolean accept(File pathname) { - // skip camel-jetty8 as its a duplicate of camel-jetty9 - if ("camel-jetty8".equals(pathname)) { + // skip camel-jetty9 as its a duplicate of camel-jetty + if ("camel-jetty9".equals(pathname)) { return false; } return pathname.isDirectory() || pathname.getName().endsWith(".json"); http://git-wip-us.apache.org/repos/asf/camel/blob/1aa20610/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 7b8846e..0a5625b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -287,8 +287,8 @@ public class PrepareCatalogMojo extends AbstractMojo { File[] components = componentsDir.listFiles(); if (components != null) { for (File dir : components) { - // skip camel-jetty8 as its a duplicate of camel-jetty9 - if (dir.isDirectory() && !"camel-jetty8".equals(dir.getName()) && !"target".equals(dir.getName())) { + // skip camel-jetty9 as its a duplicate of camel-jetty8 + if (dir.isDirectory() && !"camel-jetty9".equals(dir.getName()) && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); int before = componentFiles.size();
