Merge pull request #610 from adobe/develop

* #607 - Removed hard dependency on core components package
* #604 - Changed AEM Component Sling Model interfaces from @ProviderType to @ConsumerType for extensibility

Author: davidjgonzalez

CHANGELOG.md

@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v2.0.4]
+
+### Fixed
+
+- 0607 - asset-share-commons.all package's dependency on Core Components breaks AEM CS deployment. Removing this hard dependency.
+
+### Changed
+
+- 0604 - Changed AEM Component Sling Model interfaces from @ProviderType to @ConsumerType for extensibility (see Github issue #604 for details)
 
 ## [v2.0.2]
 

README.md

@@ -1,12 +1,13 @@
 [![Build Status](https://travis-ci.org/Adobe-Marketing-Cloud/asset-share-commons.svg?branch=develop)](https://travis-ci.org/Adobe-Marketing-Cloud/asset-share-commons)
 [![codecov](https://codecov.io/gh/Adobe-Marketing-Cloud/asset-share-commons/branch/develop/graph/badge.svg)](https://codecov.io/gh/Adobe-Marketing-Cloud/asset-share-commons)
+
 # Asset Share Commons
 
 This a content package project generated using the AEM Multimodule Lazybones template.
 
 ### Documentation
 
-[https://adobe-marketing-cloud.github.io/asset-share-commons/](https://adobe-marketing-cloud.github.io/asset-share-commons/)
+[https://opensource.adobe.com/asset-share-commons/](https://opensource.adobe.com/asset-share-commons/)
 
 ## Building
 
@@ -31,9 +32,15 @@ To use this project with the AEM Developer Tools for Eclipse, import the generat
 The CRX host and port can be specified on the command line with:
 mvn -Dcrx.host=otherhost -Dcrx.port=5502 <goals>
 
-## Dependencies
 
-* AEM 6.3 + [Service Pack 1](https://docs.adobe.com/docs/en/aem/6-3/release-notes/sp1.html)
-* The (optional) [ACS AEM Commons 3.11.0](https://github.com/Adobe-Consulting-Services/acs-aem-commons/releases/tag/acs-aem-commons-3.11.0) to enable e-mail share functionality was removed in v1.1.0.
+## Asset Share Commons 2.x Requirements
+
+* AEM as a Cloud Service 
+* AEM 6.5 SP7 or greater
+* AEM WCM Core Components 2.14.0+
+
+## Asset Share Commons 1.x Requirements
+
+* AEM 6.3.1 -> 6.5.x
 
 

all/pom.xml

@@ -54,6 +54,7 @@
                         <cloudManagerTarget>all</cloudManagerTarget>
                     </properties>
                     <finalName>asset-share-commons.all-${project.version}</finalName>
+                    <allowIndexDefinitions>true</allowIndexDefinitions>
                     <embeddeds>
                         <embedded>
                             <groupId>com.adobe.aem.commons</groupId>
@@ -74,15 +75,6 @@
                         </embedded>
                         <!-- Remove ui.contnet.sample from all package, as it should not be installed as part of real uses of Asset Share commons -->
                     </embeddeds>
-                    <allowIndexDefinitions>true</allowIndexDefinitions>
-                    <dependencies>
-                        <!-- Require AEM WCM Core Components to be installed on AEM
-                             Asset Share Commons will not auto-install Core Components for you -->
-                        <dependency>
-                            <groupId>com.adobe.cq</groupId>
-                            <artifactId>core.wcm.components.content</artifactId>
-                        </dependency>
-                    </dependencies>
                 </configuration>
             </plugin>
             <plugin>
@@ -190,11 +182,5 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>com.adobe.cq</groupId>
-            <artifactId>core.wcm.components.content</artifactId>
-            <version>${core.wcm.components.version}</version>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 </project>

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/cart/Cart.java

@@ -20,11 +20,11 @@
 package com.adobe.aem.commons.assetshare.components.actions.cart;
 
 import com.adobe.aem.commons.assetshare.content.AssetModel;
-import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 import java.util.Collection;
 
-@ProviderType
+@ConsumerType
 public interface Cart {
     Collection<AssetModel> getAssets();
 

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/cart/package-info.java

@@ -17,7 +17,7 @@
  *
  */
 
-@Version("1.0.0")
+@Version("1.0.1")
 package com.adobe.aem.commons.assetshare.components.actions.cart;
 
 import org.osgi.annotation.versioning.Version;

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/download/Download.java

@@ -23,7 +23,7 @@
 import com.adobe.cq.wcm.core.components.models.form.OptionItem;
 import com.adobe.cq.wcm.core.components.models.form.Options;
 import com.google.common.collect.ImmutableList;
-import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,7 +33,7 @@
 /**
  * The model interface that represents the Download action component.
  */
-@ProviderType
+@ConsumerType
 public interface Download {
     /**
      * @return a collection of assets that are to be downloaded.

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/download/package-info.java

@@ -17,7 +17,7 @@
  *
  */
 
-@Version("1.2.0")
+@Version("1.2.1")
 package com.adobe.aem.commons.assetshare.components.actions.download;
 
 import org.osgi.annotation.versioning.Version;

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/downloads/Downloads.java

@@ -3,11 +3,11 @@
 import com.adobe.aem.commons.assetshare.content.renditions.download.async.DownloadEntry;
 import com.adobe.cq.dam.download.api.DownloadException;
 import com.adobe.cq.dam.download.api.DownloadProgress;
-import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 import java.util.List;
 
-@ProviderType
+@ConsumerType
 public interface Downloads {
 
 	/**

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/downloads/package-info.java

@@ -17,7 +17,7 @@
  *
  */
 
-@Version("1.0.0")
+@Version("1.0.1")
 package com.adobe.aem.commons.assetshare.components.actions.downloads;
 
 import org.osgi.annotation.versioning.Version;

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/share/EmailShare.java

@@ -20,9 +20,9 @@
 package com.adobe.aem.commons.assetshare.components.actions.share;
 
 import org.apache.sling.api.resource.ValueMap;
-import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.ConsumerType;
 
-@ProviderType
+@ConsumerType
 public interface EmailShare extends Share {
 
     String PN_SIGNATURE = "signature";