Release version, AEM 6.5 stability and general updates

- Switched from automatic versioning to semantic versioning - Implemented a custom `AttrBuilder` class which uses the non-deprecated XSS api - Fixed a few bugs in the Vue model and restructed it
aem-design · Oct 28, 2020 · 9e71981 · 9e71981
1 parent 524c4f7
commit 9e71981
Show file tree

Hide file tree

Showing 16 changed files with 407 additions and 504 deletions.
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.680</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.680</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
@@ -28,6 +28,10 @@
             <email>[email protected]</email>
             <name>Max Barrass</name>
         </developer>
+        <developer>
+            <email>[email protected]</email>
+            <name>Chris Shaw</name>
+        </developer>
     </developers>
 
     <scm>

diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
     <!-- P A R E N T    P R O J E C T    D E S C R I P T I O N                  -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.680</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.680</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
@@ -220,7 +220,6 @@
             <scope>provided</scope>
         </dependency>
 
-
         <!-- health check around the OSGi installer, http://sling.apache.org/documentation/bundles/osgi-installer.html#health-check -->
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -247,16 +246,14 @@
             <version>${adobe.acs.version}</version>
             <scope>provided</scope>
         </dependency>
-
-
     </dependencies>
 
     <!-- ====================================================================== -->
     <!-- B U I L D    D E F I N I T I O N                                       -->
     <!-- ====================================================================== -->
     <build>
         <resources>
-        <!-- define the resources that will go into the package -->
+            <!-- define the resources that will go into the package -->
             <resource>
                 <directory>src/main/content/jcr_root</directory>
                 <filtering>false</filtering>
@@ -277,12 +274,12 @@
         </resources>
 
         <plugins>
-        <!--
-            we want to keep some of the META-INF files and not configure
-            everything in the plugin (mainly the filters).
+            <!--
+                we want to keep some of the META-INF files and not configure
+                everything in the plugin (mainly the filters).
 
-            copy the resource explicitly instead of attaching it to the default resources
-            -->
+                copy the resource explicitly instead of attaching it to the default resources
+                -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -309,6 +306,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <!-- ====================================================================== -->
             <!-- V A U L T    P A C K A G E    P L U G I N                              -->
             <!-- ====================================================================== -->
@@ -337,7 +335,6 @@
                             <artifactId>io.wcm.caconfig.editor</artifactId>
                             <artifactId>io.wcm.caconfig.extensions</artifactId>
                         </embedded>
-
                         <embedded>
                             <groupId>${project.parent.groupId}</groupId>
                             <artifactId>aemdesign-aem-services</artifactId>
@@ -355,10 +352,8 @@
                             <artifactId>acs-aem-commons-bundle</artifactId>
                         </embedded>
                     </embeddeds>
-
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
@@ -384,7 +379,9 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp</targetURL>
+                                    <targetURL>
+                                        ${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp
+                                    </targetURL>
                                     <userId>${crx.username}</userId>
                                     <password>${crx.password}</password>
                                 </configuration>

diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
     <!-- P A R E N T    P R O J E C T    D E S C R I P T I O N                  -->
     <!-- ====================================================================== -->
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.680</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,14 +20,18 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.680</version>
+    <version>2.1.0-SNAPSHOT</version>
     <url>http://aem.design</url>
 
     <developers>
         <developer>
             <email>[email protected]</email>
             <name>Max Barrass</name>
         </developer>
+        <developer>
+            <email>[email protected]</email>
+            <name>Chris Shaw</name>
+        </developer>
     </developers>
 
     <scm>
@@ -186,7 +190,6 @@
                     </subPackages>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
@@ -209,7 +212,9 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp</targetURL>
+                                    <targetURL>
+                                        ${package.uploadProtocol}://${crx.host}:${crx.port}/crx/packmgr/service.jsp
+                                    </targetURL>
                                     <userId>${crx.username}</userId>
                                     <password>${crx.password}</password>
                                 </configuration>

diff --git a/aemdesign-aem-services/deploy b/aemdesign-aem-services/deploy
@@ -6,16 +6,9 @@ SCRIPT_PARAMS="$@"
 
 source "../scripts/functions.sh"
 
-#try to delete existing jar
-delete_current_jar
-
 echo "- Deploy"
 mvn -Dvault.useProxy=false -DskipTests clean deploy -P autoInstallBundle -Dmaven.deploy.skip=true -DskipNexusStagingDeployMojo=true "$@"
 echo "- Deployed"
 
-#restart aem container
-restart_aem_docker
-
-
 set_term_title "Deploy Done"
 
diff --git a/aemdesign-aem-services/deploy-local b/aemdesign-aem-services/deploy-local
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-./deploy -Dcrx.host=localhost
+./deploy -Dcrx.host=localhost "$@"