Merge branch 'develop'

Author: stefanseifert

.github/dependabot.yml

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>wcm-io/renovate-config:maven",
+    "github>wcm-io/renovate-config:automerge-all-minor"
+  ],
+  "ignoreDeps": [
+    "io.wcm.maven:io.wcm.maven.aem-dependencies"
+  ]
+}

.github/renovate.json

@@ -4,14 +4,9 @@ name: Build
 
 on:
   push:
-    branches-ignore:
-      - master
-      - experimental/**
+    branches:
+      - develop
   pull_request:
-    types: [opened, synchronize, reopened]
-    branches-ignore:
-      - master
-      - experimental/**
   workflow_dispatch:
 
 jobs:
@@ -20,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
 
@@ -32,6 +27,6 @@ jobs:
           java-version: ${{ matrix.java }}
           maven-executable: ./mvnw
           sonar-run-on-os: ubuntu-latest
-          sonar-run-on-java-version: 11
+          sonar-run-on-java-version: 21
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven-build.yml

@@ -2,6 +2,8 @@
 
 name: Deploy
 
+concurrency: ${{ github.workflow }}
+
 on:
   push:
     branches:
@@ -15,15 +17,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11

.github/workflows/maven-deploy.yml

@@ -12,8 +12,8 @@ jobs:
     permissions:
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ncipollo/release-action@v1
       with:
-        body: 'Changes: https://wcm.io/samples/changes-report.html'
+        body: 'Changes: https://wcm.io/samples/changes.html'
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-from-tag.yml

@@ -5,14 +5,15 @@
 # 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
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/maven-wrapper.jar

@@ -26,5 +26,5 @@ See [Maven Settings](https://github.com/wcm-io/io.wcm.samples/blob/develop/.mave
 
 ### System requirements
 
-- AEM 6.5.7+ or AEMaaCS SDK
+- AEM 6.5.17+ or AEMaaCS SDK
 - Java 11

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,31 @@
+#!/bin/bash
+# #%L
+#  wcm.io
+#  %%
+#  Copyright (C) 2021 wcm.io
+#  %%
+#  Licensed 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.
+#  #L%
+
+
+SLING_URL="http://localhost:45026"
+
+if [[ $0 == *":\\"* ]]; then
+  DISPLAY_PAUSE_MESSAGE=true
+fi
+
+if [ "$?" -ne "0" ]; then
+  exit
+fi
+
+./build-deploy.sh --sling.url=${SLING_URL} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"

README.md

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.samples</groupId>
     <artifactId>io.wcm.samples.parent</artifactId>
-    <version>1.4.2</version>
+    <version>1.5.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.samples.clientlibs</artifactId>
-  <version>1.4.2</version>
+  <version>1.5.0</version>
   <packaging>jar</packaging>
 
   <name>Sample Application Clientlibs</name>

build-deploy_aem66.sh

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.samples</groupId>
     <artifactId>io.wcm.samples.parent</artifactId>
-    <version>1.4.2</version>
+    <version>1.5.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.samples.core</artifactId>
-  <version>1.4.2</version>
+  <version>1.5.0</version>
   <packaging>jar</packaging>
 
   <name>Sample Application</name>
@@ -182,6 +182,7 @@
               SLING-INF/app-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/core,\
               SLING-INF/app-i18n;overwrite:=true;ignoreImportProviders:=json;path:=/apps/wcm-io-samples/core/i18n,\
               SLING-INF/app-config;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/config
+
             Sling-Namespaces: wcmio=http://wcm.io/ns
 
             Import-Package: \

bundles/clientlibs/pom.xml

@@ -98,41 +98,35 @@ public NavigationPageItem getFooterNavigation() {
 
   private NavigationPageItem getFooterNavigationSpecific(final Page footerNavRoot) {
     NavigationPageItem rootItem = createStructureItem(footerNavRoot);
-    rootItem.setChildren(createChildItems(footerNavRoot, new ItemCreator() {
-      @Override
-      public NavigationPageItem create(final Page pPage) {
-        NavigationPageItem columnItem = createStructureItem(pPage);
-        columnItem.setChildren(createChildItems(pPage, new ValidLinkableItemCreator()));
-        if (columnItem.getChildren().isEmpty()) {
-          return null;
-        }
-        else {
-          return columnItem;
-        }
+    rootItem.setChildren(createChildItems(footerNavRoot, page -> {
+      NavigationPageItem columnItem = createStructureItem(page);
+      columnItem.setChildren(createChildItems(page, new ValidLinkableItemCreator()));
+      if (columnItem.getChildren().isEmpty()) {
+        return null;
+      }
+      else {
+        return columnItem;
       }
     }));
     return rootItem;
   }
 
   private NavigationPageItem getFooterNavigationDerivedFromMainNav(final Page siteRootPage) {
     NavigationPageItem rootItem = createStructureItem(siteRootPage);
-    rootItem.setChildren(createChildItems(siteRootPage, new ItemCreator() {
-      @Override
-      public NavigationPageItem create(final Page pPage) {
-        NavigationPageItem columnItem = createStructureItem(pPage);
-        List<NavigationPageItem> linkItems = new ArrayList<>();
-        NavigationPageItem mainnavLinkItem = createLinkableItem(pPage);
-        if (mainnavLinkItem.getLink().isValid()) {
-          linkItems.add(mainnavLinkItem);
-        }
-        linkItems.addAll(createChildItems(pPage, new ValidLinkableItemCreator()));
-        columnItem.setChildren(linkItems);
-        if (columnItem.getChildren().isEmpty()) {
-          return null;
-        }
-        else {
-          return columnItem;
-        }
+    rootItem.setChildren(createChildItems(siteRootPage, page -> {
+      NavigationPageItem columnItem = createStructureItem(page);
+      List<NavigationPageItem> linkItems = new ArrayList<>();
+      NavigationPageItem mainnavLinkItem = createLinkableItem(page);
+      if (mainnavLinkItem.getLink().isValid()) {
+        linkItems.add(mainnavLinkItem);
+      }
+      linkItems.addAll(createChildItems(page, new ValidLinkableItemCreator()));
+      columnItem.setChildren(linkItems);
+      if (columnItem.getChildren().isEmpty()) {
+        return null;
+      }
+      else {
+        return columnItem;
       }
     }));
     return rootItem;
@@ -170,23 +164,20 @@ private List<NavigationPageItem> createChildItems(final Page parentPage, final I
 
   private List<NavigationPageItem> createChildItemsRecursively(final Page parentPage, final ItemCreator itemCreator,
       final int level, final int maxLevels) {
-    return createChildItems(parentPage, new ItemCreator() {
-      @Override
-      public NavigationPageItem create(final Page pPage) {
-        NavigationPageItem item = itemCreator.create(pPage);
-        if (item != null && level < maxLevels) {
-          item.setChildren(createChildItemsRecursively(pPage, itemCreator, level + 1, maxLevels));
-        }
-        return item;
+    return createChildItems(parentPage, page -> {
+      NavigationPageItem item = itemCreator.create(page);
+      if (item != null && level < maxLevels) {
+        item.setChildren(createChildItemsRecursively(page, itemCreator, level + 1, maxLevels));
       }
+      return item;
     });
   }
 
   private interface ItemCreator {
     NavigationPageItem create(Page pPage);
   }
 
-  private class ValidLinkableItemCreator implements ItemCreator {
+  private final class ValidLinkableItemCreator implements ItemCreator {
     @Override
     public NavigationPageItem create(Page page) {
       NavigationPageItem item = createLinkableItem(page);

bundles/core/pom.xml

@@ -90,7 +90,8 @@ public boolean accepts(@NotNull String linkRef) {
     ValueMap props = link.getLinkRequest().getResourceProperties();
 
     // get wikipedia reference from link properties
-    String wikiPageName = props.get(PN_LINK_WIKIPEDIA_REF, link.getLinkRequest().getReference());
+    String wikiPageName = StringUtils.defaultString(props.get(PN_LINK_WIKIPEDIA_REF, String.class),
+        link.getLinkRequest().getReference());
     String language = props.get(PN_LINK_WIKIPEDIA_LANGUAGE, DEFAULT_LANGUAGE);
 
     // build link URL which is only an anchor tag in the preview.

bundles/core/src/main/java/io/wcm/samples/core/business/navigation/impl/NavigationManagerImpl.java

@@ -31,6 +31,7 @@
 import io.wcm.handler.link.spi.LinkHandlerConfig;
 import io.wcm.handler.link.spi.LinkType;
 import io.wcm.handler.link.type.ExternalLinkType;
+import io.wcm.handler.link.type.InternalCrossContextLinkType;
 import io.wcm.handler.link.type.InternalLinkType;
 import io.wcm.handler.link.type.MediaLinkType;
 import io.wcm.samples.core.config.AppTemplate;
@@ -45,6 +46,7 @@ public class LinkHandlerConfigImpl extends LinkHandlerConfig {
 
   private static final List<Class<? extends LinkType>> LINK_TYPES = List.of(
       InternalLinkType.class,
+      InternalCrossContextLinkType.class,
       ExternalLinkType.class,
       MediaLinkType.class,
       WikipediaLinkType.class);

bundles/core/src/main/java/io/wcm/samples/core/config/WikipediaLinkType.java

@@ -36,7 +36,7 @@
 public class ResponsiveImageMediaMarkupBuilder extends SimpleImageMediaMarkupBuilder {
 
   @Override
-  protected HtmlElement<?> getImageElement(Media media) {
+  protected HtmlElement getImageElement(Media media) {
     HtmlElement image = super.getImageElement(media);
 
     if (image != null) {

bundles/core/src/main/java/io/wcm/samples/core/config/impl/LinkHandlerConfigImpl.java

@@ -10,7 +10,18 @@
       "items": {
         "linkRef": {
           "sling:resourceType": "wcm-io/handler/link/components/granite/form/linkRefContainer",
-          "showLinkTitle": false
+          "showLinkTitle": false,
+          "allLinkTypeFields": {
+            "linkFragment": {
+              "sling:resourceType": "granite/ui/components/coral/foundation/form/textfield",
+              "name": "./linkFragment",
+              "fieldLabel": "Fragment",
+              "granite:class": "linkRefContainer-option-linktype-showhide-target",
+              "granite:data": {
+                "showhidetargetvalues": "internal,internalCrossContext"
+              }
+            }
+          }
         }
       }
     }

bundles/core/src/main/java/io/wcm/samples/core/handler/ResponsiveImageMediaMarkupBuilder.java

@@ -10,7 +10,18 @@
       "items": {
         "linkRef": {
           "sling:resourceType": "wcm-io/handler/link/components/granite/form/linkRefContainer",
-          "showLinkTitle": true
+          "showLinkTitle": true,
+          "allLinkTypeFields": {
+            "linkFragment": {
+              "sling:resourceType": "granite/ui/components/coral/foundation/form/textfield",
+              "name": "./linkFragment",
+              "fieldLabel": "Fragment",
+              "granite:class": "linkRefContainer-option-linktype-showhide-target",
+              "granite:data": {
+                "showhidetargetvalues": "internal,internalCrossContext"
+              }
+            }
+          }
         }
       }
     }

bundles/core/src/main/webapp/app-root/components/global/include/linkRefNoTitleTab.json

@@ -9,7 +9,8 @@
         "mediaRef": {
           "sling:resourceType": "wcm-io/handler/media/components/granite/form/fileupload",
           "fieldLabel": "Asset reference",
-          "allowUpload": true
+          "allowUpload": true,
+          "validation": ["wcmio.handler.media.mediaFormat"]
         }
       }
     }

bundles/core/src/main/webapp/app-root/components/global/include/linkRefTab.json

@@ -75,7 +75,7 @@ void testGetMainNavigation() throws Exception {
   }
 
   @Test
-  void testGetMainNavigation_1Levels() throws Exception {
+  void testGetMainNavigation_1Levels() {
     NavigationPageItem rootItem = underTest.getMainNavigation(1);
     List<NavigationPageItem> mainnavItems = rootItem.getChildren();
     assertEquals(5, mainnavItems.size());
@@ -84,7 +84,7 @@ void testGetMainNavigation_1Levels() throws Exception {
   }
 
   @Test
-  void testGetMainNavigation_0Levels() throws Exception {
+  void testGetMainNavigation_0Levels() {
     NavigationPageItem rootItem = underTest.getMainNavigation(0);
     List<NavigationPageItem> mainnavItems = rootItem.getChildren();
     assertEquals(0, mainnavItems.size());
@@ -94,7 +94,7 @@ void testGetMainNavigation_0Levels() throws Exception {
    * Test footer navigation with separate definition at tools/footernav/*
    */
   @Test
-  void testGetFooterNavigation_ToolsFooterNav() throws Exception {
+  void testGetFooterNavigation_ToolsFooterNav() {
     NavigationPageItem rootItem = underTest.getFooterNavigation();
     List<NavigationPageItem> footerNavItems = rootItem.getChildren();
     assertEquals(3, footerNavItems.size());