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 1467f3e1b75 Minor mojo improvements (#8280) 1467f3e1b75 is described below commit 1467f3e1b7564dae7aef89429fb10c6e3c6df0b3 Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Tue Sep 6 06:04:18 2022 +0200 Minor mojo improvements (#8280) * Generalize the pattern in PrepareComponentMojo * Add skip option to prepare-catalog mojo --- .../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 6 ++++++ .../java/org/apache/camel/maven/packaging/PrepareComponentMojo.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 dc3aa0db3e1..38e6f36de0f 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 @@ -183,6 +183,12 @@ public class PrepareCatalogMojo extends AbstractMojo { @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-main/target/classes/META-INF") protected File mainDir; + /** + * Skip the execution of this mojo + */ + @Parameter(defaultValue = "false", property = "camel.prepare-catalog.skip") + protected boolean skip; + /** * Maven ProjectHelper. */ diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java index 81cf34b9b4e..d80672b1b3a 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java @@ -212,12 +212,13 @@ public class PrepareComponentMojo extends AbstractGeneratorMojo { final String between = pomText.substring(before.length(), pomText.length() - after.length()); Pattern pattern = Pattern.compile( - "<dependency>\\s*<groupId>(?<groupId>.*)</groupId>\\s*<artifactId>(?<artifactId>.*)</artifactId>\\s*<version>\\$\\{project\\.version}</version>\\s*</dependency>"); + "<dependency>\\s*<groupId>(?<groupId>.*)</groupId>\\s*<artifactId>(?<artifactId>.*)</artifactId>\\s*<version>(?<version>.*)</version>\\s*</dependency>"); Matcher matcher = pattern.matcher(between); TreeSet<String> dependencies = new TreeSet<>(); while (matcher.find()) { dependencies.add(matcher.group()); } + dependencies.add("<dependency>\n" + "\t\t\t\t<groupId>" + project.getGroupId() + "</groupId>\n" + "\t\t\t\t<artifactId>" + project.getArtifactId() + "</artifactId>\n"