You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/09/16 05:17:33 UTC
[camel] branch master updated (8c18317 -> 6f1d701)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 8c18317 Document Change (#4235)
new 3531ae5 Camel-package-maven-plugin: Check if endpoint dsl folder really exist and return eventually
new 6f1d701 Camel-package-maven-plugin: Check if component dsl folder really exist and return eventually
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/maven/packaging/ComponentDslMojo.java | 7 ++++++-
.../java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
[camel] 01/02: Camel-package-maven-plugin: Check if endpoint dsl
folder really exist and return eventually
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3531ae50e2b82fce807bec0d3a4f6b568f3ea2a5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Sep 16 07:13:08 2020 +0200
Camel-package-maven-plugin: Check if endpoint dsl folder really exist and return eventually
---
.../java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index dcc46e3..40f6855 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -166,7 +166,12 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- Path root = findCamelDirectory(baseDir, "core/camel-endpointdsl").toPath();
+ File camelDir = findCamelDirectory(baseDir, "core/camel-endpointdsl");
+ if (camelDir == null) {
+ getLog().info("No core/camel-endpointdsl folder found, skipping execution");
+ return;
+ }
+ Path root = camelDir.toPath();
if (sourcesOutputDir == null) {
sourcesOutputDir = root.resolve("src/generated/java").toFile();
}
[camel] 02/02: Camel-package-maven-plugin: Check if component dsl
folder really exist and return eventually
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f1d7018db63a9de98acf99998014874cab37116
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Sep 16 07:14:34 2020 +0200
Camel-package-maven-plugin: Check if component dsl folder really exist and return eventually
---
.../java/org/apache/camel/maven/packaging/ComponentDslMojo.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 5767a62..270840d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -118,7 +118,12 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
throw new RuntimeException(e.getMessage(), e);
}
- Path root = findCamelDirectory(baseDir, "core/camel-componentdsl").toPath();
+ File camelDir = findCamelDirectory(baseDir, "core/camel-componentdsl");
+ if (camelDir == null) {
+ getLog().info("No core/camel-componentdsl folder found, skipping execution");
+ return;
+ }
+ Path root = camelDir.toPath();
if (sourcesOutputDir == null) {
sourcesOutputDir = root.resolve("src/generated/java").toFile();
}