camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-8406: skip camel-jetty8 as its a duplicate of camel-jetty9 in catalog.
Date Thu, 26 Feb 2015 10:29:59 GMT
CAMEL-8406: skip camel-jetty8 as its a duplicate of camel-jetty9 in catalog.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fbd40f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fbd40f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fbd40f2

Branch: refs/heads/master
Commit: 8fbd40f25e298bcf173f5b73025a101d23643f69
Parents: 13cb7b6
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Feb 26 11:30:58 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Feb 26 11:30:58 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/maven/packaging/PackageHelper.java     | 4 ++++
 .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java     | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8fbd40f2/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 1ae21c6..c9da4bf 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,6 +110,10 @@ 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)) {
+                return false;
+            }
             return pathname.isDirectory() || pathname.getName().endsWith(".json");
         }
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/8fbd40f2/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 37f4041..7b8846e 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,7 +287,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
             File[] components = componentsDir.listFiles();
             if (components != null) {
                 for (File dir : components) {
-                    if (dir.isDirectory() && !"target".equals(dir.getName())) {
+                    // skip camel-jetty8 as its a duplicate of camel-jetty9
+                    if (dir.isDirectory() && !"camel-jetty8".equals(dir.getName())
&& !"target".equals(dir.getName())) {
                         File target = new File(dir, "target/classes");
 
                         int before = componentFiles.size();


Mime
View raw message