Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Dec 12, 2023
2 parents 7ccb2a7 + 2c444b8 commit 5b67d8e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="2.2.6" date="2023-12-12">
<action type="update" dev="sseifert">
Update Site categories.
</action>
</release>

<release version="2.2.4" date="2023-11-20">
<action type="update" dev="sseifert">
Update to aem-global-parent 2.1.12.
Expand Down
4 changes: 2 additions & 2 deletions 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.parent_toplevel</artifactId>
<version>2.2.4</version>
<version>2.2.6</version>
<packaging>pom</packaging>

<name>Toplevel Parent</name>
Expand Down Expand Up @@ -89,7 +89,7 @@
<site.deploy.url>scm:git:https://github.com/wcm-io/wcm-io.github.io.git</site.deploy.url>

<!-- Versions -->
<mockito.version>5.7.0</mockito.version>
<mockito.version>5.8.0</mockito.version>

<!-- set default empty argLine when not executing jacoco -->
<argLine />
Expand Down
1 change: 0 additions & 1 deletion src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
<item name="Context-Aware Configuration" href="https://wcm.io/caconfig/"/>
<item name="Handler" href="https://wcm.io/handler/"/>
<item name="Sling Extensions" href="https://wcm.io/sling/"/>
<item name="Site API" href="https://wcm.io/site-api/"/>
<item name="Testing" href="https://wcm.io/testing/"/>
<item name="Samples" href="https://wcm.io/samples/"/>
<item name="Tooling" href="https://wcm.io/tooling/"/>
Expand Down

0 comments on commit 5b67d8e

Please sign in to comment.