Skip to content

Commit

Permalink
Merge branch 'develop' into feature/deps-update
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Jul 18, 2024
2 parents 30a35c7 + b97e612 commit 7526079
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</action>
</release>

<release version="5.5.4" date="not released">
<release version="5.5.4" date="2024-07-18">
<action type="update" dev="sseifert" issue="45">
MockExternalizer: Apply Sling Mapping for externalized URLs.
</action>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions junit4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -87,7 +87,7 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -54,14 +54,14 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>AEM Mocks</name>
Expand Down Expand Up @@ -71,7 +71,7 @@
<logging-logback.version>1.0.0</logging-logback.version>

<!-- Enable reproducible builds -->
<project.build.outputTimestamp>2024-04-23T13:24:04Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-07-18T08:01:37Z</project.build.outputTimestamp>

</properties>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<parent>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.root</artifactId>
<packaging>pom</packaging>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>

<name>AEM Mocks</name>
<url>${site.url}/${site.url.module.prefix}/</url>
Expand Down
2 changes: 1 addition & 1 deletion relocate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
<version>5.5.3-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 7526079

Please sign in to comment.