Merge pull request #11 from aem-design/develop

Develop

Author: wildone

.github/workflows/main.yml

@@ -69,12 +69,12 @@ jobs:
       - name: docker - mvn clean (cache .m2 in ./build/.m2/repository in repo dir)
         run: $DOCKER_COMMAND mvn clean -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
       - name: docker - mvn package
-        run: $DOCKER_COMMAND mvn package -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -Dmaven.repo.local=./build/.m2/repository
+        run: $DOCKER_COMMAND mvn package -DskipTests=true -Dgpg.skip -B -Dmaven.repo.local=./build/.m2/repository
 
       - name: docker - sonar qube on master
         if: github.ref == 'refs/heads/master'
         run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
-      - name: docker - sonar qube on master
+      - name: docker - sonar qube on branches
         if: github.ref != 'refs/heads/master'
         run: mvn sonar:sonar -q "-Dsonar.branch.name=${GITHUB_REF}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}"
 
@@ -89,14 +89,11 @@ jobs:
         if: github.ref == 'refs/heads/master'
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${CURRENT_VERSION}
-          name: ${CURRENT_VERSION}
-          body: $GIT_RELEASE_NOTES
+          tag: ${{ env.CURRENT_VERSION }}
+          name: ${{ env.CURRENT_VERSION }}
+          body: ${{ env.GIT_RELEASE_NOTES }}
           files: >
-            aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
-            aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
-            aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
-            aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
+            **/target/*.zip
 
       - name: trigger build of bundle docker container
         if: github.ref == 'refs/heads/master'

aemdesign-aem-author/pom.xml

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

aemdesign-aem-common/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.581</version>
+        <version>2.0.596</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.581</version>
+    <version>2.0.596</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>

aemdesign-aem-core-deploy/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.581</version>
+        <version>2.0.596</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.581</version>
+    <version>2.0.596</version>
 	<url>${parent.url}</url>
 
     <developers>

aemdesign-aem-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.581</version>
+        <version>2.0.596</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.581</version>
+    <version>2.0.596</version>
     <packaging>jar</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.581</version>
+    <version>2.0.596</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>