You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by oa...@apache.org on 2020/01/17 17:00:42 UTC
[camel] branch master updated: Fix PackageComponentMojo when
generates json files
This is an automated email from the ASF dual-hosted git repository.
oalsafi 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 c699e7d Fix PackageComponentMojo when generates json files
new 241c7b7 Merge pull request #3492 from omarsmak/fix-package-helper
c699e7d is described below
commit c699e7d88734517710b344217940c4449a64b082
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Fri Jan 17 17:46:53 2020 +0100
Fix PackageComponentMojo when generates json files
---
.../java/org/apache/camel/maven/packaging/PackageComponentMojo.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 747e8a2..07fdbb3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -131,9 +131,10 @@ public class PackageComponentMojo extends AbstractGeneratorMojo {
}
private static void enrichComponentJsonFiles(Log log, MavenProject project, File buildDir, Set<String> components) throws MojoExecutionException {
- final Map<String, File> files = PackageHelper.findJsonFiles(buildDir, p -> p.isDirectory() || p.getName().endsWith(".json"));
+ Set<File> files = new HashSet<>();
+ PackageHelper.findJsonFiles(buildDir, files, p -> p.isDirectory() || p.getName().endsWith(".json"));
- for (File file : files.values()) {
+ for (File file : files) {
// clip the .json suffix
String name = file.getName().substring(0, file.getName().length() - 5);
if (components.contains(name)) {