Merge branch 'develop'

Author: stefanseifert

.github/workflows/maven-build.yml

@@ -32,6 +32,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: 17
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven-deploy.yml

@@ -2,6 +2,8 @@
 
 name: Deploy
 
+concurrency: ${{ github.workflow }}
+
 on:
   push:
     branches:

.mvn/wrapper/maven-wrapper.jar

@@ -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

.mvn/wrapper/maven-wrapper.properties

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>

bundles/core/pom.xml

@@ -83,4 +83,9 @@ protected ListItem newLinkListItem(@NotNull String newTitle, @NotNull LinkWrappe
         getId(), getParentComponent(), this.resource);
   }
 
+  @Override
+  protected boolean getActionsEnabledDefault() {
+    return false;
+  }
+
 }

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v1/TeaserV1Impl.java

@@ -118,7 +118,7 @@ private void activate() {
     boolean actionsDisabled = currentStyle.get(PN_ACTIONS_DISABLED, false);
 
     // read component properties
-    actionsEnabled = properties.get(PN_ACTIONS_ENABLED, false) && !actionsDisabled;
+    actionsEnabled = properties.get(PN_ACTIONS_ENABLED, getActionsEnabledDefault()) && !actionsDisabled;
     boolean titleFromPage = properties.get(PN_TITLE_FROM_PAGE, false);
     boolean descriptionFromPage = properties.get(PN_DESCRIPTION_FROM_PAGE, false);
 
@@ -138,11 +138,13 @@ private void activate() {
           }
         }
       }
-      // primary link is not enabled when actions are enabled
-      link = new LinkWrapper(linkHandler.invalid());
     }
 
-    // if no actions enabled, resolve primary teaser link
+    // if actions are enabled and present, primary link is not enabled
+    if (actionsEnabled && !this.actions.isEmpty()) {
+      link = new LinkWrapper(linkHandler.invalid());
+    }
+    // otherwise resolve primary teaser link
     else {
       link = new LinkWrapper(HandlerUnwrapper.get(linkHandler, resource).build());
       targetPage = link.getLinkObject().getTargetPage();
@@ -185,6 +187,10 @@ private void activate() {
 
   }
 
+  protected boolean getActionsEnabledDefault() {
+    return true;
+  }
+
   @Override
   public @NotNull Media getMediaObject() {
     return media;

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v2/TeaserV2Impl.java

@@ -24,7 +24,6 @@
 import static com.adobe.cq.wcm.core.components.models.Page.NN_PAGE_FEATURED_IMAGE;
 import static com.adobe.cq.wcm.core.components.models.Teaser.NN_ACTIONS;
 import static com.adobe.cq.wcm.core.components.models.Teaser.PN_ACTIONS_DISABLED;
-import static com.adobe.cq.wcm.core.components.models.Teaser.PN_ACTIONS_ENABLED;
 import static com.adobe.cq.wcm.core.components.models.Teaser.PN_ACTION_TEXT;
 import static com.adobe.cq.wcm.core.components.models.Teaser.PN_DESCRIPTION_FROM_PAGE;
 import static com.adobe.cq.wcm.core.components.models.Teaser.PN_DESCRIPTION_HIDDEN;
@@ -109,7 +108,7 @@ void testEmpty() {
 
     Teaser underTest = AdaptTo.notNull(context.request(), Teaser.class);
 
-    assertFalse(underTest.isActionsEnabled());
+    assertTrue(underTest.isActionsEnabled());
     assertTrue(underTest.getActions().isEmpty());
     assertFalse(underTest.isImageLinkHidden());
     assertNull(underTest.getTitle());
@@ -125,7 +124,6 @@ void testEmpty() {
   }
 
   @Test
-  @SuppressWarnings("null")
   void testWithImageAndPrimaryLink() {
     enableDataLayer(context, true);
 
@@ -140,7 +138,7 @@ void testWithImageAndPrimaryLink() {
 
     Teaser underTest = AdaptTo.notNull(context.request(), Teaser.class);
 
-    assertFalse(underTest.isActionsEnabled());
+    assertTrue(underTest.isActionsEnabled());
     assertTrue(underTest.getActions().isEmpty());
     assertFalse(underTest.isImageLinkHidden());
     assertEquals("Teaser Title", underTest.getTitle());
@@ -261,8 +259,7 @@ void testWithActions() {
     Resource resource = context.create().resource(page, "teaser",
         PROPERTY_RESOURCE_TYPE, RESOURCE_TYPE,
         PN_LINK_TYPE, ExternalLinkType.ID,
-        PN_LINK_EXTERNAL_REF, "http://host",
-        PN_ACTIONS_ENABLED, true);
+        PN_LINK_EXTERNAL_REF, "http://host");
     context.currentResource(resource);
     context.create().resource(resource, NN_ACTIONS + "/action1",
         PN_ACTION_TEXT, "Action 1",
@@ -297,8 +294,7 @@ void testWithActions_DisabledViaPolicy() {
     Resource resource = context.create().resource(page, "teaser",
         PROPERTY_RESOURCE_TYPE, RESOURCE_TYPE,
         PN_LINK_TYPE, ExternalLinkType.ID,
-        PN_LINK_EXTERNAL_REF, "http://host",
-        PN_ACTIONS_ENABLED, true);
+        PN_LINK_EXTERNAL_REF, "http://host");
     context.currentResource(resource);
     context.create().resource(resource, NN_ACTIONS + "/action1",
         PN_ACTION_TEXT, "Action 1",
@@ -322,7 +318,6 @@ void testTitleDescriptionImageFromFirstActionPage() {
         PN_MEDIA_REF_STANDARD, asset.getPath());
     Resource resource = context.create().resource(page, "teaser",
         PROPERTY_RESOURCE_TYPE, RESOURCE_TYPE,
-        PN_ACTIONS_ENABLED, true,
         PN_TITLE_FROM_PAGE, true,
         PN_DESCRIPTION_FROM_PAGE, true,
         PN_IMAGE_FROM_PAGE_IMAGE, true,

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/TeaserV2ImplTest.java

@@ -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.13.2-2.22.6" date="2023-08-21">
+      <action type="fix" dev="sseifert" issue="12">
+        Fix detection of teaser actions in Teaser V2.
+      </action>
+    </release>
+
     <release version="1.13.0-2.22.6" date="2023-05-19">
       <action type="add" dev="sseifert" issue="11">
         Add List (v4).

changes.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.13.0-2.22.6</version>
+      <version>1.13.2-2.22.6</version>
       <scope>compile</scope>
     </dependency>
 

examples/bundles/examples-core/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.13.0-2.22.6</version>
+      <version>1.13.2-2.22.6</version>
       <scope>compile</scope>
     </dependency>
 
@@ -153,7 +153,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.sling.commons</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -188,7 +188,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.10</version>
+        <version>1.9.12</version>
       </dependency>
 
     </dependencies>

examples/content-packages/examples-libs/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples Content</name>

examples/content-packages/examples-sample-content/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.samples</groupId>  
       <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-      <version>1.13.0-2.22.6</version>
+      <version>1.13.2-2.22.6</version>
       <scope>compile</scope>
     </dependency>
 

examples/content-packages/examples/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.13.0-2.22.6</version>
+    <version>1.13.2-2.22.6</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
-  <version>1.13.0-2.22.6</version>
+  <version>1.13.2-2.22.6</version>
   <packaging>pom</packaging>
 
   <modules>