Merge branch 'develop'

wcm-io · Sep 8, 2023 · 0fd6c3e · 0fd6c3e
2 parents fa25a94 + 0ee3add
commit 0fd6c3e
Show file tree

Hide file tree

Showing 99 changed files with 620 additions and 157 deletions.
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -2,6 +2,8 @@
 
 name: Deploy
 
+concurrency: ${{ github.workflow }}
+
 on:
   push:
     branches:

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -5,14 +5,14 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,21 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="3.8.4" date="2023-09-08">
+      <action type="add" dev="sseifert"><![CDATA[
+        Add new option "optionWcmioSiteApiGenericEdit" which allows to setup an AEM headless project based on wcm.io Site API and using <a href="https://wcm.io/site-api/generic-edit/">wcm.io Site API Generic Edit</a>.
+      ]]></action>
+      <action type="update" dev="sseifert">
+        Update to AEM 6.5 SP18.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+      <action type="fix" dev="sseifert">
+        Teaser Component: Set imageDelegate property if wcm.io Handler is not used.
+      </action>
+    </release>
+
     <release version="3.8.2" date="2023-07-03">
       <action type="update" dev="sseifert"><![CDATA[
         Dispatcher Configuration for AEMaaCS: Configure <code>httpd.headers.htmlExpirationTimeSec</code> conditionally per environment (DEV: 5 sec, STAGE/PROD: 300 sec by default).