From f7cc4587bfd9e8d35bfce4a122146afd2fe6d601 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 02:24:17 +1100 Subject: [PATCH 1/7] update exported packages --- aemdesign-aem-services/pom.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml index a1a441634..246cd2a32 100755 --- a/aemdesign-aem-services/pom.xml +++ b/aemdesign-aem-services/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.609 + 2.0.641 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-services - 2.0.609 + 2.0.641 jar AEM Design - Core - AEM Services Project for all AEM and OSGI Services @@ -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 From 44171e85359941d67fcf76144d50eba1f42ec382 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 02:24:33 +1100 Subject: [PATCH 2/7] update pom version --- aemdesign-aem-author/pom.xml | 4 ++-- aemdesign-aem-common/pom.xml | 4 ++-- aemdesign-aem-core-deploy/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml index ad665fe04..90b1fe322 100755 --- a/aemdesign-aem-author/pom.xml +++ b/aemdesign-aem-author/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.609 + 2.0.641 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-author - 2.0.609 + 2.0.641 content-package AEM Design - Core - AEM Author UI Updates Updates to OOTB AEM diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml index f149500ee..20a586ea1 100755 --- a/aemdesign-aem-common/pom.xml +++ b/aemdesign-aem-common/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.609 + 2.0.641 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-common - 2.0.609 + 2.0.641 content-package AEM Design - Core - AEM Common AEM Design package with all common components diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml index cb03351ac..cbf9cede6 100644 --- a/aemdesign-aem-core-deploy/pom.xml +++ b/aemdesign-aem-core-deploy/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.609 + 2.0.641 ../pom.xml @@ -20,7 +20,7 @@ content-package AEM Design - Core - Deployment Package AEM package for deploying all packages as one - 2.0.609 + 2.0.641 ${parent.url} diff --git a/pom.xml b/pom.xml index 7fba074d7..ec64db84b 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ design.aem aemdesign-aem-core - 2.0.609 + 2.0.641 pom AEM Design - Core Project From 471912be88c0606c54e546f6eec54b0f28fd7970 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 21:47:55 +1100 Subject: [PATCH 3/7] bump versions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8a2919f6..da147eabf 100644 --- 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) From 943e480f987631435fcbd6acf5bb54f8faf57359 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 21:50:01 +1100 Subject: [PATCH 4/7] remove embedding adobe core into package --- pom.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index ec64db84b..7c38b2fae 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ design.aem aemdesign-aem-core - 2.0.641 + 2.0.643 pom AEM Design - Core Project @@ -402,14 +402,6 @@ provided - - - - com.adobe.cq - core.wcm.components.all - zip - ${core.wcm.components.version} - From cbc810463934f8d1f1f0d6dcde9b085ff19b3e41 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 21:50:24 +1100 Subject: [PATCH 5/7] remove embedding adobe core into package --- aemdesign-aem-common/pom.xml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml index 20a586ea1..d7ae8789e 100755 --- a/aemdesign-aem-common/pom.xml +++ b/aemdesign-aem-common/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.641 + 2.0.643 ../pom.xml @@ -17,11 +17,11 @@ aemdesign-aem-common - 2.0.641 + 2.0.643 content-package AEM Design - Core - AEM Common AEM Design package with all common components - ${parent.url} + ${parent.url} @@ -248,12 +248,6 @@ provided - - - com.adobe.cq - core.wcm.components.all - zip - @@ -362,14 +356,6 @@ - - - com.adobe.cq - core.wcm.components.all - true - - - From 61d37de3efcca405555f1d6fd2ac263012446361 Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 21:50:48 +1100 Subject: [PATCH 6/7] bump versons --- aemdesign-aem-author/pom.xml | 4 ++-- aemdesign-aem-core-deploy/pom.xml | 4 ++-- aemdesign-aem-services/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml index 90b1fe322..1e5d3584f 100755 --- a/aemdesign-aem-author/pom.xml +++ b/aemdesign-aem-author/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.641 + 2.0.643 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-author - 2.0.641 + 2.0.643 content-package AEM Design - Core - AEM Author UI Updates Updates to OOTB AEM diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml index cbf9cede6..24c0edbe3 100644 --- a/aemdesign-aem-core-deploy/pom.xml +++ b/aemdesign-aem-core-deploy/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.641 + 2.0.643 ../pom.xml @@ -20,7 +20,7 @@ content-package AEM Design - Core - Deployment Package AEM package for deploying all packages as one - 2.0.641 + 2.0.643 ${parent.url} diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml index 246cd2a32..98a28297b 100755 --- a/aemdesign-aem-services/pom.xml +++ b/aemdesign-aem-services/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.0.641 + 2.0.643 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-services - 2.0.641 + 2.0.643 jar AEM Design - Core - AEM Services Project for all AEM and OSGI Services From 5be83afaf5d510886940c5c2c246d0bd35bd669a Mon Sep 17 00:00:00 2001 From: wildone Date: Sun, 9 Feb 2020 22:22:56 +1100 Subject: [PATCH 7/7] update to use create_release and upload-release-asset steps --- .github/workflows/main.yml | 119 ++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 67 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d04377b6f..55e352d66 100644 --- 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