Skip to content

Commit

Permalink
Update to Handler 2.x dependencies (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert authored Dec 20, 2023
1 parent 99458c6 commit e8f1b56
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 24 deletions.
4 changes: 2 additions & 2 deletions bundles/clientlibs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.clientlibs</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Sample Application Clientlibs</name>
Expand Down
4 changes: 2 additions & 2 deletions bundles/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.core</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Sample Application</name>
Expand Down
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="1.5.0" date="not released">
<action type="update" dev="sseifert">
Switch to Handler 2.x.
</action>
</release>

<release version="1.4.2" date="2023-04-20">
<action type="update" dev="sseifert">
Switch to Java 11 as minimum version.
Expand Down
8 changes: 4 additions & 4 deletions config-definition/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<parent>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.config-definition</artifactId>
<description>AEM Application CONGA roles and templates</description>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>config-definition</packaging>

<dependencies>
Expand All @@ -48,14 +48,14 @@
<dependency>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.complete</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.sample-content</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<type>zip</type>
<scope>compile</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions content-packages/complete/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.complete</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>content-package</packaging>

<name>Samples Application</name>
Expand All @@ -47,13 +47,13 @@
<dependency>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.core</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.clientlibs</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions content-packages/sample-content/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<parent>
<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.sample-content</artifactId>
<description>AEM Application sample content</description>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>content-package</packaging>

<properties>
Expand Down
18 changes: 9 additions & 9 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.aem-global-parent</artifactId>
<version>2.1.14</version>
<version>2.1.15-SNAPSHOT</version>
<relativePath />
</parent>

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples.parent</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Samples</name>
Expand All @@ -48,7 +48,7 @@
<mockito.version>5.8.0</mockito.version>

<!-- Enable reproducible builds -->
<project.build.outputTimestamp>2023-04-20T09:30:58Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2023-12-19T12:58:47Z</project.build.outputTimestamp>

</properties>

Expand Down Expand Up @@ -137,27 +137,27 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.commons</artifactId>
<version>1.5.0</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.url</artifactId>
<version>1.10.2</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.link</artifactId>
<version>1.10.4</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.media</artifactId>
<version>1.16.0</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.richtext</artifactId>
<version>1.6.6</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
Expand Down Expand Up @@ -219,7 +219,7 @@
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.testing.wcm-io-mock.handler</artifactId>
<version>1.5.0</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>

<!-- Import AEM dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<groupId>io.wcm.samples</groupId>
<artifactId>io.wcm.samples</artifactId>
<version>1.4.3-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Samples Root</name>
Expand Down

0 comments on commit e8f1b56

Please sign in to comment.