You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/02/22 05:11:45 UTC
[camel] branch master updated: Move camel-jetty9 into camel-jetty
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
The following commit(s) were added to refs/heads/master by this push:
new 9d0d7c1 Move camel-jetty9 into camel-jetty
9d0d7c1 is described below
commit 9d0d7c1b3b017d405ec7a0374bc3ecab857c61eb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 22 05:58:54 2019 +0100
Move camel-jetty9 into camel-jetty
---
.../src/main/java/org/apache/camel/maven/packaging/PackageHelper.java | 1 -
.../main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
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 e6b05ce..dfe0631 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
@@ -166,7 +166,6 @@ public final class PackageHelper {
boolean special = "camel-core-osgi".equals(name)
|| "camel-core-xml".equals(name)
|| "camel-http-common".equals(name)
- || "camel-jetty".equals(name)
|| "camel-jetty-common".equals(name);
boolean special2 = "camel-as2".equals(name)
|| "camel-box".equals(name)
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 7f1da48..a6a1fda 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
@@ -59,7 +59,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
private static final String[] EXCLUDE_DOC_FILES = {
"camel-core-osgi", "camel-core-xml",
- "camel-http-common", "camel-jetty", "camel-jetty-common"
+ "camel-http-common", "camel-jetty-common"
};
private static final Pattern LABEL_PATTERN = Pattern.compile("\\\"label\\\":\\s\\\"([\\w,]+)\\\"");