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 2020/10/20 05:28:41 UTC

[camel] branch master updated: CAMEL-15706: UpdateReadmeMojo fails when executed outside the camel tree

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 a2763e6  CAMEL-15706: UpdateReadmeMojo fails when executed outside the camel tree
a2763e6 is described below

commit a2763e6c279b89bb61aa9eb29653d8c65d70e1cf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 20 07:27:32 2020 +0200

    CAMEL-15706: UpdateReadmeMojo fails when executed outside the camel tree
---
 .../camel/maven/packaging/UpdateReadmeMojo.java    | 120 ++++++++++++---------
 1 file changed, 70 insertions(+), 50 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 082425a..9483757 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -204,17 +204,21 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
 
                     if (updated || exists) {
                         try {
-                            Path root = findCamelDirectory(project.getBasedir(), "core/camel-core").toPath().getParent()
-                                    .getParent();
-                            String text = PackageHelper.loadText(file);
-                            updateResource(
-                                    root.resolve("catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
-                                    file.getName(), text);
-                            String rep = "$1\n"
-                                         + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
-                                         + ":page-source: " + root.relativize(file.toPath());
-                            text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
-                            updateResource(root.resolve("docs/components/modules/ROOT/pages"), file.getName(), text);
+                            // if we run in camel-core project then add additional meta-data
+                            File rootFile = findCamelDirectory(project.getBasedir(), "core/camel-core");
+                            if (rootFile != null) {
+                                Path root = rootFile.toPath().getParent().getParent();
+                                String text = PackageHelper.loadText(file);
+                                updateResource(
+                                        root.resolve(
+                                                "catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
+                                        file.getName(), text);
+                                String rep = "$1\n"
+                                             + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
+                                             + ":page-source: " + root.relativize(file.toPath());
+                                text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
+                                updateResource(root.resolve("docs/components/modules/ROOT/pages"), file.getName(), text);
+                            }
                         } catch (IOException e) {
                             throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
                         }
@@ -263,17 +267,21 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
 
                     if (updated || exists) {
                         try {
-                            Path root = findCamelDirectory(project.getBasedir(), "core/camel-core").toPath().getParent()
-                                    .getParent();
-                            String text = PackageHelper.loadText(file);
-                            updateResource(
-                                    root.resolve("catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
-                                    file.getName(), text);
-                            String rep = "$1\n"
-                                         + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
-                                         + ":page-source: " + root.relativize(file.toPath());
-                            text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
-                            updateResource(root.resolve("docs/components/modules/others/pages"), file.getName(), text);
+                            // if we run in camel-core project then add additional meta-data
+                            File rootFile = findCamelDirectory(project.getBasedir(), "core/camel-core");
+                            if (rootFile != null) {
+                                Path root = rootFile.toPath().getParent().getParent();
+                                String text = PackageHelper.loadText(file);
+                                updateResource(
+                                        root.resolve(
+                                                "catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
+                                        file.getName(), text);
+                                String rep = "$1\n"
+                                             + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
+                                             + ":page-source: " + root.relativize(file.toPath());
+                                text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
+                                updateResource(root.resolve("docs/components/modules/others/pages"), file.getName(), text);
+                            }
                         } catch (IOException e) {
                             throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
                         }
@@ -334,17 +342,21 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
 
                     if (updated || exists) {
                         try {
-                            Path root = findCamelDirectory(project.getBasedir(), "core/camel-core").toPath().getParent()
-                                    .getParent();
-                            String text = PackageHelper.loadText(file);
-                            updateResource(
-                                    root.resolve("catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
-                                    file.getName(), text);
-                            String rep = "$1\n"
-                                         + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
-                                         + ":page-source: " + root.relativize(file.toPath());
-                            text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
-                            updateResource(root.resolve("docs/components/modules/dataformats/pages"), file.getName(), text);
+                            // if we run in camel-core project then add additional meta-data
+                            File rootFile = findCamelDirectory(project.getBasedir(), "core/camel-core");
+                            if (rootFile != null) {
+                                Path root = rootFile.toPath().getParent().getParent();
+                                String text = PackageHelper.loadText(file);
+                                updateResource(
+                                        root.resolve(
+                                                "catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
+                                        file.getName(), text);
+                                String rep = "$1\n"
+                                             + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
+                                             + ":page-source: " + root.relativize(file.toPath());
+                                text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
+                                updateResource(root.resolve("docs/components/modules/dataformats/pages"), file.getName(), text);
+                            }
                         } catch (IOException e) {
                             throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
                         }
@@ -421,17 +433,21 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
 
                     if (updated || exists) {
                         try {
-                            Path root = findCamelDirectory(project.getBasedir(), "core/camel-core").toPath().getParent()
-                                    .getParent();
-                            String text = PackageHelper.loadText(file);
-                            updateResource(
-                                    root.resolve("catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
-                                    file.getName(), text);
-                            String rep = "$1\n"
-                                         + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
-                                         + ":page-source: " + root.relativize(file.toPath());
-                            text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
-                            updateResource(root.resolve("docs/components/modules/languages/pages"), file.getName(), text);
+                            // if we run in camel-core project then add additional meta-data
+                            File rootFile = findCamelDirectory(project.getBasedir(), "core/camel-core");
+                            if (rootFile != null) {
+                                Path root = rootFile.toPath().getParent().getParent();
+                                String text = PackageHelper.loadText(file);
+                                updateResource(
+                                        root.resolve(
+                                                "catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
+                                        file.getName(), text);
+                                String rep = "$1\n"
+                                             + "//THIS FILE IS COPIED: EDIT THE SOURCE FILE:\n"
+                                             + ":page-source: " + root.relativize(file.toPath());
+                                text = Pattern.compile("^(= .+)$", Pattern.MULTILINE).matcher(text).replaceAll(rep);
+                                updateResource(root.resolve("docs/components/modules/languages/pages"), file.getName(), text);
+                            }
                         } catch (IOException e) {
                             throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
                         }
@@ -516,12 +532,16 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
 
                     if (updated || exists) {
                         try {
-                            Path root = findCamelDirectory(project.getBasedir(), "core/camel-core").toPath().getParent()
-                                    .getParent();
-                            String text = PackageHelper.loadText(file);
-                            updateResource(
-                                    root.resolve("catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
-                                    file.getName(), text);
+                            // if we run in camel-core project then add additional meta-data
+                            File rootFile = findCamelDirectory(project.getBasedir(), "core/camel-core");
+                            if (rootFile != null) {
+                                Path root = rootFile.toPath().getParent().getParent();
+                                String text = PackageHelper.loadText(file);
+                                updateResource(
+                                        root.resolve(
+                                                "catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs"),
+                                        file.getName(), text);
+                            }
                         } catch (IOException e) {
                             throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
                         }