Merge pull request #359 from spyrkob/GAL-371_sort_provisioning_props

[GAL-371] Keep properties and parameters in provisioned.xml ordered alphabetically

Author: jfdenise

core/src/main/java/org/jboss/galleon/xml/ConfigXmlWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Red Hat, Inc. and/or its affiliates
+ * Copyright 2016-2025 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,8 @@
 package org.jboss.galleon.xml;
 
 import java.util.Map;
+import java.util.TreeMap;
+
 import org.jboss.galleon.config.ConfigId;
 
 import org.jboss.galleon.config.ConfigModel;
@@ -51,7 +53,7 @@ protected ElementNode toElement(ConfigModel config, String ns) {
 
         if(config.hasProperties()) {
             final ElementNode propsE = addElement(configE, Element.PROPS.getLocalName(), ns);
-            for(Map.Entry<String, String> prop : config.getProperties().entrySet()) {
+            for(Map.Entry<String, String> prop : new TreeMap<>(config.getProperties()).entrySet()) {
                 final ElementNode propE = addElement(propsE, Element.PROP.getLocalName(), ns);
                 addAttribute(propE, Attribute.NAME, prop.getKey());
                 addAttribute(propE, Attribute.VALUE, prop.getValue());

core/src/main/java/org/jboss/galleon/xml/ProvisionedConfigXmlWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Red Hat, Inc. and/or its affiliates
+ * Copyright 2016-2025 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,8 @@
 package org.jboss.galleon.xml;
 
 import java.util.Map;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 import javax.xml.stream.XMLStreamException;
 
@@ -66,7 +68,7 @@ public void nextFeature(ProvisionedFeature feature) throws ProvisioningException
                 addAttribute(featureE, Attribute.ID, feature.getId().toString());
             }
             if(feature.hasParams()) {
-                for(String param : feature.getParamNames()) {
+                for(String param : new TreeSet<>(feature.getParamNames())) {
                     final ElementNode paramE = addElement(featureE, Element.PARAM.getLocalName(), parent.getNamespace());
                     addAttribute(paramE, Attribute.NAME, param);
                     addAttribute(paramE, Attribute.VALUE, feature.getConfigParam(param));
@@ -100,7 +102,7 @@ protected ElementNode toElement(ProvisionedConfig config, String ns) throws XMLS
 
         if(config.hasProperties()) {
             final ElementNode propsE = addElement(configE, Element.PROPS.getLocalName(), ns);
-            for(Map.Entry<String, String> entry : config.getProperties().entrySet()) {
+            for(Map.Entry<String, String> entry : new TreeMap<>(config.getProperties()).entrySet()) {
                 final ElementNode propE = addElement(propsE, Element.PROP.getLocalName(), ns);
                 addAttribute(propE, Attribute.NAME, entry.getKey());
                 addAttribute(propE, Attribute.VALUE, entry.getValue());