[camel] branch main updated: Add properties to ComponentDslMojo parameters, add a null check on jsonDir (#7878)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 22f2044fa10 Add properties to ComponentDslMojo parameters, add a null 
check on jsonDir (#7878)
22f2044fa10 is described below

commit 22f2044fa1063aed21f0f1e4a6a426bb2c498510
Author: Tom Cunningham <tcunn...@redhat.com>
AuthorDate: Sun Jun 26 10:06:26 2022 -0400

    Add properties to ComponentDslMojo parameters, add a null check on jsonDir 
(#7878)
---
 .../org/apache/camel/maven/packaging/ComponentDslMojo.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 25bcdc2ea3a..84785721e0a 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
@@ -85,19 +85,19 @@ public class ComponentDslMojo extends AbstractGeneratorMojo 
{
     /**
      * The package where to the main DSL component package is
      */
-    @Parameter(defaultValue = "org.apache.camel.builder.component")
+    @Parameter(property="camel.pmp.package-name", defaultValue = 
"org.apache.camel.builder.component")
     protected String componentsDslPackageName;
 
     /**
      * The package where to generate component DSL specific factories
      */
-    @Parameter(defaultValue = "org.apache.camel.builder.component.dsl")
+    @Parameter(property="camel.pmp.factories-package-name", defaultValue = 
"org.apache.camel.builder.component.dsl")
     protected String componentsDslFactoriesPackageName;
 
     /**
      * The catalog directory where the component json files are
      */
-    @Parameter(defaultValue = 
"${project.build.directory}/../../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
+    @Parameter(property="camel.pmp.json-directory", defaultValue = 
"${project.build.directory}/../../../catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components")
     protected File jsonDir;
 
     private transient String licenseHeader;
@@ -119,6 +119,12 @@ public class ComponentDslMojo extends 
AbstractGeneratorMojo {
             getLog().debug("No dsl/camel-componentdsl folder found, skipping 
execution");
             return;
         }
+
+        if (jsonDir == null) {
+            getLog().debug("No json directory folder found, skipping 
execution");
+            return;
+        }
+
         Path root = camelDir.toPath();
         if (sourcesOutputDir == null) {
             sourcesOutputDir = root.resolve("src/generated/java").toFile();