Merge pull request #21 from aem-design/develop

Develop
aem-design · Feb 9, 2020 · a613763 · a613763
2 parents 9e275b3 + 5be83af
commit a613763
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 102 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,74 +84,59 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: $DOCKER_COMMAND echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import && echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust && mvn deploy --settings default.xml -B -P release
 
-      - name: create github release ${{ env.GITHUB_TAG }}
-        uses: meeDamian/github-release@1.0
+      - name: create release ${{ env.GITHUB_TAG }}
         if: github.ref == 'refs/heads/master'
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ env.GITHUB_TAG }}
-          name: ${{ env.GITHUB_TAG }}
+          tag_name: ${{ env.GITHUB_TAG }}
+          release_name: ${{ env.GITHUB_TAG }}
           body: ${{ env.GIT_RELEASE_NOTES }}
-          gzip: false
-          files: >
-            aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-${{ env.GITHUB_TAG }}.zip
-            aemdesign-aem-services/target/aemdesign-aem-services-${{ env.GITHUB_TAG }}.jar
-            aemdesign-aem-author/target/aemdesign-aem-author-${{ env.GITHUB_TAG }}.zip
-            aemdesign-aem-common/target/aemdesign-aem-common-${{ env.GITHUB_TAG }}.zip
+          draft: false
+          prerelease: false
+
+      - name: upload release asset - aemdesign-aem-core-deploy-${{ env.GITHUB_TAG }}.zip
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'core-deploy', env.GITHUB_TAG) }}
+          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'core-deploy', env.GITHUB_TAG) }}
+          asset_content_type: application/zip
+
+      - name: upload release asset - aemdesign-aem-services-${{ env.GITHUB_TAG }}.zip
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.jar', 'services', env.GITHUB_TAG) }}
+          asset_name: ${{ format('aemdesign-aem-{0}-{1}.jar', 'services', env.GITHUB_TAG) }}
+          asset_content_type: application/java-archive
+
+      - name: upload release asset - aemdesign-aem-author-${{ env.GITHUB_TAG }}.zip
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'author', env.GITHUB_TAG) }}
+          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'author', env.GITHUB_TAG) }}
+          asset_content_type: application/zip
 
-#      - name: create release with tag ${{ env.GITHUB_TAG }}
-#        id: create_release
-#        if: github.ref == 'refs/heads/master'
-#        uses: actions/create-release@v1.0.0
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          tag_name: ${{ env.GITHUB_TAG }}
-#          release_name: ${{ env.GITHUB_TAG }}
-#          body: ${{ env.GIT_RELEASE_NOTES }}
-#          draft: false
-#          prerelease: false
-#
-#      - name: upload release asset - aemdesign-aem-core-deploy-${{ env.GITHUB_TAG }}.zip
-#        if: github.ref == 'refs/heads/master'
-#        uses: actions/upload-release-asset@v1.0.1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'core-deploy', env.GITHUB_TAG) }}
-#          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'core-deploy', env.GITHUB_TAG) }}
-#          asset_content_type: application/zip
-#
-#      - name: upload release asset - aemdesign-aem-services-${{ env.GITHUB_TAG }}.zip
-#        if: github.ref == 'refs/heads/master'
-#        uses: actions/upload-release-asset@v1.0.1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.jar', 'services', env.GITHUB_TAG) }}
-#          asset_name: ${{ format('aemdesign-aem-{0}-{1}.jar', 'services', env.GITHUB_TAG) }}
-#          asset_content_type: application/zip
-#
-#      - name: upload release asset - aemdesign-aem-author-${{ env.GITHUB_TAG }}.zip
-#        if: github.ref == 'refs/heads/master'
-#        uses: actions/upload-release-asset@v1.0.1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'author', env.GITHUB_TAG) }}
-#          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'author', env.GITHUB_TAG) }}
-#          asset_content_type: application/zip
-#
-#      - name: upload release asset - aemdesign-aem-common-${{ env.GITHUB_TAG }}.zip
-#        if: github.ref == 'refs/heads/master'
-#        uses: actions/upload-release-asset@v1.0.1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'common', env.GITHUB_TAG) }}
-#          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'common', env.GITHUB_TAG) }}
-#          asset_content_type: application/zip
+      - name: upload release asset - aemdesign-aem-common-${{ env.GITHUB_TAG }}.zip
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ format('./aemdesign-aem-{0}/target/aemdesign-aem-{0}-{1}.zip', 'common', env.GITHUB_TAG) }}
+          asset_name: ${{ format('aemdesign-aem-{0}-{1}.zip', 'common', env.GITHUB_TAG) }}
+          asset_content_type: application/zip
diff --git a/README.md b/README.md
@@ -167,8 +167,8 @@ For more information about the Package Manager please have a look at [How to Wor
 Following packages are dependencies and should be installed on your AEM instance before installing AEM.Design:
 
 - [ACS Twitter 1.0.0](https://github.com/Adobe-Consulting-Services/com.adobe.acs.bundles.twitter4j/releases/download/com.adobe.acs.bundles.twitter4j-1.0.0/com.adobe.acs.bundles.twitter4j-content-1.0.0.zip)
-- [ACS Commons 4.0.0](https://github.com/Adobe-Consulting-Services/acs-aem-commons/releases/download/acs-aem-commons-4.0.0/acs-aem-commons-content-4.0.0.zip)
-- [Core Components 2.3.2](https://github.com/adobe/aem-core-wcm-components/releases/download/core.wcm.components.reactor-2.3.2/core.wcm.components.all-2.3.2.zip)
+- [ACS Commons 4.4.0](https://github.com/Adobe-Consulting-Services/acs-aem-commons/releases/download/acs-aem-commons-4.4.0/acs-aem-commons-content-4.4.0.zip)
+- [Core Components 2.8.0](https://github.com/adobe/aem-core-wcm-components/releases/download/core.wcm.components.reactor-2.8.0/core.wcm.components.all-2.8.0.zip)
 - [Core Components Extension 1.0.12](https://github.com/adobe/aem-core-wcm-components/releases/download/core.wcm.components.reactor-2.3.2/core.wcm.components.extension-1.0.12.zip)
 - [Netcentric Access Control Tool 2.3.2](http://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-package/2.3.2/accesscontroltool-package-2.3.2.zip)
 - [Adobe Vanity URL 1.0.2](https://www.adobeaemcloud.com/content/companies/public/adobe/packages/cq600/component/vanityurls-components/jcr%3acontent/package/file.res/vanityurls-components-1.0.2.zip)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.609</version>
+        <version>2.0.643</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.609</version>
+    <version>2.0.643</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>

diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.609</version>
+        <version>2.0.643</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,11 +17,11 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.609</version>
+    <version>2.0.643</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
-	<url>${parent.url}</url>
+    <url>${parent.url}</url>
 
     <developers>
         <developer>
@@ -248,12 +248,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Adobe Core Dependencies -->
-        <dependency>
-            <groupId>com.adobe.cq</groupId>
-            <artifactId>core.wcm.components.all</artifactId>
-            <type>zip</type>
-        </dependency>
 
     </dependencies>
 
@@ -362,14 +356,6 @@
                         </embedded>
                     </embeddeds>
 
-                    <subPackages>
-                        <subPackage>
-                            <groupId>com.adobe.cq</groupId>
-                            <artifactId>core.wcm.components.all</artifactId>
-                            <filter>true</filter>
-                        </subPackage>
-                    </subPackages>
-                    <dependencies></dependencies>
                 </configuration>
             </plugin>
 

diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.609</version>
+        <version>2.0.643</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.609</version>
+    <version>2.0.643</version>
 	<url>${parent.url}</url>
 
     <developers>

diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.609</version>
+        <version>2.0.643</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.609</version>
+    <version>2.0.643</version>
     <packaging>jar</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
@@ -209,7 +209,13 @@ org.jsoup.nodes,\
 org.jsoup.parser,\
 org.jsoup.safety,\
 org.jsoup.select,\
-org.apache.commons.jexl3.*
+org.apache.commons.jexl3.*,\
+org.apache.sling.installer.api.info,\
+org.apache.sling.installer.api.tasks,\
+com.adobe.acs.commons.fam,\
+com.adobe.acs.commons.util,\
+com.adobe.acs.commons.workflow,\
+com.adobe.acs.commons.util.visitors
 -includeresource:\
 lib/jsoup-${jsoup.version}.jar=jsoup-${jsoup.version}.jar;lib:=true,\
 lib/gson-${gson.version}.jar=gson-${gson.version}.jar;lib:=true

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.609</version>
+    <version>2.0.643</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>
@@ -402,14 +402,6 @@
                 <scope>provided</scope>
             </dependency>
 
-
-            <!-- Adobe Core Dependencies -->
-            <dependency>
-                <groupId>com.adobe.cq</groupId>
-                <artifactId>core.wcm.components.all</artifactId>
-                <type>zip</type>
-                <version>${core.wcm.components.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>