Skip to content

Commit 458ab60

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 9922b78 + 62b00ea commit 458ab60

File tree

8 files changed

+25
-15
lines changed

8 files changed

+25
-15
lines changed

‎changes.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="5.6.4" date="2024-12-16">
27+
<action type="update" dev="sseifert">
28+
Update to latest OSGi Mock.
29+
</action>
30+
<action type="fix" dev="Benjamin Guan" issue="52">
31+
MockTagManager.getTagsForSubtree: Ensure stable order of result list.
32+
</action>
33+
</release>
34+
2635
<release version="5.6.2" date="2024-09-16">
2736
<action type="update" dev="joerghoh" issue="50">
2837
Add support for Rendition.getBinary() method.

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.6.2</version>
28+
<version>5.6.4</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

‎core/src/main/java/io/wcm/testing/mock/aem/MockTagManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.HashMap;
2929
import java.util.HashSet;
3030
import java.util.Iterator;
31+
import java.util.LinkedHashSet;
3132
import java.util.LinkedList;
3233
import java.util.List;
3334
import java.util.Locale;
@@ -377,7 +378,7 @@ private Collection<Tag> collectResourceTags(Resource resource, boolean recurse)
377378
if (resource == null) {
378379
return Collections.emptyList();
379380
}
380-
Set<Tag> treeTags = new HashSet<>();
381+
Set<Tag> treeTags = new LinkedHashSet<>();
381382
Queue<Resource> searchResources = new LinkedList<>();
382383
searchResources.add(resource);
383384

‎junit4/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.6.2</version>
28+
<version>5.6.4</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>io.wcm</groupId>
5656
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
57-
<version>5.6.2</version>
57+
<version>5.6.4</version>
5858
<scope>compile</scope>
5959
</dependency>
6060

@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>io.wcm</groupId>
8989
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
90-
<version>5.6.2</version>
90+
<version>5.6.4</version>
9191
<classifier>tests</classifier>
9292
<scope>test</scope>
9393
</dependency>

‎junit5/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.6.2</version>
28+
<version>5.6.4</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -54,14 +54,14 @@
5454
<dependency>
5555
<groupId>io.wcm</groupId>
5656
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
57-
<version>5.6.2</version>
57+
<version>5.6.4</version>
5858
<scope>compile</scope>
5959
</dependency>
6060

6161
<dependency>
6262
<groupId>io.wcm</groupId>
6363
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
64-
<version>5.6.2</version>
64+
<version>5.6.4</version>
6565
<classifier>tests</classifier>
6666
<scope>test</scope>
6767
</dependency>

‎parent/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.parent_toplevel</artifactId>
28-
<version>2.3.2</version>
28+
<version>2.3.4</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
34-
<version>5.6.2</version>
34+
<version>5.6.4</version>
3535
<packaging>pom</packaging>
3636

3737
<name>AEM Mocks</name>
@@ -50,7 +50,7 @@
5050
<properties>
5151

5252
<!-- OSGi Mocks -->
53-
<osgi-mock.version>3.5.0</osgi-mock.version>
53+
<osgi-mock.version>3.5.2</osgi-mock.version>
5454

5555
<!-- JCR Mocks -->
5656
<jcr-mock.version>1.6.14</jcr-mock.version>
@@ -71,7 +71,7 @@
7171
<logging-logback.version>1.0.0</logging-logback.version>
7272

7373
<!-- Enable reproducible builds -->
74-
<project.build.outputTimestamp>2024-09-16T09:26:26Z</project.build.outputTimestamp>
74+
<project.build.outputTimestamp>2024-12-16T12:19:39Z</project.build.outputTimestamp>
7575

7676
</properties>
7777

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.6.2</version>
28+
<version>5.6.4</version>
2929
<relativePath>parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.testing.aem-mock.root</artifactId>
3434
<packaging>pom</packaging>
35-
<version>5.6.2</version>
35+
<version>5.6.4</version>
3636

3737
<name>AEM Mocks</name>
3838
<url>${site.url}/${site.url.module.prefix}/</url>

‎relocate/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.6.2</version>
28+
<version>5.6.4</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

0 commit comments

Comments
 (0)