Merge branch 'develop'

wcm-io · Dec 15, 2022 · a0485db · a0485db
2 parents 5c3223d + 5814e5d
commit a0485db
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.15.0</version>
+    <version>1.15.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor</artifactId>
-  <version>1.15.0</version>
+  <version>1.15.2</version>
   <packaging>jar</packaging>
 
   <name>Context-Aware Configuration Editor</name>
@@ -42,7 +42,7 @@
     <site.url.module.prefix>caconfig/editor/bundle</site.url.module.prefix>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2022-12-05T12:47:52Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-12-15T11:40:34Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-      <version>5.0.0</version>
+      <version>5.1.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigurationCategoryProviderService.java b/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigurationCategoryProviderService.java
@@ -21,9 +21,11 @@
 
 import static io.wcm.caconfig.editor.EditorProperties.PROPERTY_CATEGORY;
 
-import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
@@ -54,7 +56,8 @@ public class ConfigurationCategoryProviderService {
 
   @Reference(cardinality = ReferenceCardinality.MULTIPLE, fieldOption = FieldOption.UPDATE,
       policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
-  private Collection<ServiceReference<ConfigurationCategoryProvider>> filters;
+  private SortedSet<ServiceReference<ConfigurationCategoryProvider>> filters = new ConcurrentSkipListSet<>(
+      Collections.reverseOrder());
 
   @Reference
   private ContextAwareServiceResolver serviceResolver;

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.15.2" date="2022-12-15">
+      <action type="fix" dev="sseifert">
+        ConfigurationCategoryProviderService: Use sorted set to ensure consistent service ranking ordering when services are updated at runtime.
+      </action>
+    </release>
+
     <release version="1.15.0" date="2022-12-05">
       <action type="add" dev="sseifert">
         Allow to define categories of context-aware configurations and filter by category.

diff --git a/package/pom.xml b/package/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.15.0</version>
+    <version>1.15.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.package</artifactId>
-  <version>1.15.0</version>
+  <version>1.15.2</version>
   <packaging>content-package</packaging>
   <url>${site.url}/caconfig/editor/</url>
 
@@ -40,7 +40,7 @@
     <contentPackage.group>wcm-io</contentPackage.group>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2022-12-05T12:47:52Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-12-15T11:40:34Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -49,7 +49,7 @@
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.caconfig.editor</artifactId>
       <scope>compile</scope>
-      <version>1.15.0</version>
+      <version>1.15.2</version>
     </dependency>
 
   </dependencies>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,15 +31,15 @@
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-  <version>1.15.0</version>
+  <version>1.15.2</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor</name>
   <description>Context-Aware Configuration Editor Template for AEM.</description>
 
   <properties>
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2022-12-05T12:47:52Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-12-15T11:40:34Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.caconfig.editor.parent</artifactId>
-    <version>1.15.0</version>
+    <version>1.15.2</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.caconfig.editor.root</artifactId>
-  <version>1.15.0</version>
+  <version>1.15.2</version>
   <packaging>pom</packaging>
 
   <name>Context-Aware Configuration Editor</name>