[camel] branch master updated: CAMEL-15237: generate archetype-catalog in sorted order

[davsclaus]

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

davsclaus 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 aaa7ed7  CAMEL-15237: generate archetype-catalog in sorted order
aaa7ed7 is described below

commit aaa7ed7a720d4f113608c38eed7d0ffbe61946d6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 24 13:06:55 2020 +0200

    CAMEL-15237: generate archetype-catalog in sorted order
---
 .../apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
index 9cfcbb3..8a13322 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
@@ -22,6 +22,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.camel.tooling.util.PackageHelper;
@@ -152,6 +154,9 @@ public class PackageArchetypeCatalogMojo extends 
AbstractMojo {
             }
         }
 
+        // sort the models by artifact id so its generated in same order
+        Collections.sort(models, (o1, o2) -> 
o1.getArtifactId().compareToIgnoreCase(o2.getArtifactId()));
+
         log.info("Found " + models.size() + " archetypes");
 
         if (!models.isEmpty()) {