[camel] branch master updated: Fixed duplicate xtokenize language doc WARN in prepare catalog

[davsclaus]

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 986fdb4  Fixed duplicate xtokenize language doc WARN in prepare catalog
986fdb4 is described below

commit 986fdb4f2e7e80323c099263130b194e6e3342ef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Oct 21 19:32:46 2019 +0200

    Fixed duplicate xtokenize language doc WARN in prepare catalog
---
 .../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 e0b72fd..26ca2f7 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
@@ -1073,15 +1073,12 @@ public class PrepareCatalogMojo extends AbstractMojo {
         if (coreDir != null && coreDir.isDirectory()) {
             File target = new File(coreDir, "src/main/docs");
             findAsciiDocFilesRecursive(target, adocFiles, new 
CamelAsciiDocFileFilter());
-            // also look in camel-jaxp
-            target = new File(coreDir, "../camel-jaxp/src/main/docs");
-            findAsciiDocFilesRecursive(target, adocFiles, new 
CamelAsciiDocFileFilter());
         }
         if (baseDir != null && baseDir.isDirectory()) {
             File target = new File(baseDir, "src/main/docs");
             findAsciiDocFilesRecursive(target, adocFiles, new 
CamelAsciiDocFileFilter());
             // also look in camel-jaxp
-            target = new File(baseDir, "../camel-jaxp/src/main/docs");
+            target = new File(coreDir, "../camel-jaxp/src/main/docs");
             findAsciiDocFilesRecursive(target, adocFiles, new 
CamelAsciiDocFileFilter());
         }