This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 14836ae7d369a518de17474f41824b8d7c05e6e2 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Feb 5 11:49:03 2020 +0100 Make sure the component properties are sorted to ensure build stability --- .../java/org/apache/camel/maven/packaging/PackageComponentMojo.java | 4 +++- .../java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 3 ++- .../java/org/apache/camel/maven/packaging/PackageLanguageMojo.java | 4 +++- 3 files changed, 8 insertions(+), 3 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 d6b8256..7f9ff5c 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 @@ -22,6 +22,8 @@ import java.nio.file.Path; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.camel.tooling.util.PackageHelper; import org.apache.maven.plugin.MojoExecutionException; @@ -122,7 +124,7 @@ public class PackageComponentMojo extends AbstractGeneratorMojo { } if (count > 0) { - String names = buffer.toString(); + String names = Stream.of(buffer.toString().split(" ")).sorted().collect(Collectors.joining(" ")); String properties = createProperties(project, "components", names); updateResource(camelMetaDir.toPath(), "component.properties", properties); log.info("Generated " + "components" + " containing " + count + " Camel " + (count > 1 ? "components: " : "component: ") + names); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index 8e2e0d0..e654968 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.camel.tooling.model.DataFormatModel; import org.apache.camel.tooling.model.DataFormatModel.DataFormatOptionModel; @@ -214,7 +215,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { } if (count > 0) { - String names = buffer.toString(); + String names = Stream.of(buffer.toString().split(" ")).sorted().collect(Collectors.joining(" ")); String properties = createProperties(project, "dataFormats", names); updateResource(camelMetaDir.toPath(), "dataformat.properties", properties); log.info("Generated dataformat.properties containing " + count + " Camel " + (count > 1 ? "dataformats: " : "dataformat: ") + names); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java index d807b70..9d7fb78 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java @@ -22,6 +22,8 @@ import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.camel.tooling.model.EipModel; import org.apache.camel.tooling.model.EipModel.EipOptionModel; @@ -179,7 +181,7 @@ public class PackageLanguageMojo extends AbstractGeneratorMojo { } if (count > 0) { - String names = buffer.toString(); + String names = Stream.of(buffer.toString().split(" ")).sorted().collect(Collectors.joining(" ")); String properties = createProperties(project, "languages", names); updateResource(camelMetaDir.toPath(), "language.properties", properties); log.info("Generated language.properties containing " + count + " Camel " + (count > 1 ? "languages: " : "language: ") + names);
