From a055760f5f696a0d48ffbaa2decd5211bb8b7096 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad.windszus@netcentric.biz>
Date: Wed, 6 Apr 2022 09:34:19 +0200
Subject: [PATCH] Use FileVault Package Maven Plugin 1.3.0 (#2804)

---
 CHANGELOG.md                                  |   5 +
 content/pom.xml                               |  97 ++++++---------
 .../META-INF/vault/definition/.content.xml    |  24 ----
 .../main/content/META-INF/vault/filter.xml    |   3 +
 ...obe.acs.commons.wcm.impl.QrCodeServlet.xml |   0
 ...itoryInitializer-replication-status.config |   0
 ....RepositoryInitializer-distribution.config |   0
 ...poinit.RepositoryInitializer-aem-cs.config |   0
 ...positoryInitializer-ensure-oakindex.config |   0
 ...nit.RepositoryInitializer-root-acls.config |   0
 ...ositoryInitializer-varworkflow-acls.config |   0
 ...eUserMapperImpl.amended-acs-commons.config |   0
 .../definition => resources}/thumbnail.png    | Bin
 pom.xml                                       | 111 ++++++++++++++----
 ui.apps/pom.xml                               |  67 +----------
 .../META-INF/vault/definition/.content.xml    |  24 ----
 .../main/content/META-INF/vault/filter.xml    |  40 +++++--
 .../generic-list-console/.content.xml         |   1 -
 .../utilities/qr-code/clientlibs/js/app.js    |   2 +-
 .../apps/acs-commons/install/.vltignore       |   1 -
 .../definition => resources}/thumbnail.png    | Bin
 ui.content/pom.xml                            |  68 ++---------
 .../META-INF/vault/definition/.content.xml    |  24 ----
 .../main/content/META-INF/vault/filter.xml    |  92 +++++++--------
 .../conf/global/settings/.content.xml         |   3 +
 .../etc/acs-commons/qr-code/.content.xml      |   5 -
 .../definition => resources}/thumbnail.png    | Bin
 27 files changed, 230 insertions(+), 337 deletions(-)
 delete mode 100644 content/src/main/content/META-INF/vault/definition/.content.xml
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-replication-status.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-distribution.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-ensure-oakindex.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-root-acls.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-varworkflow-acls.config (100%)
 rename {ui.apps => content}/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config (100%)
 rename content/src/main/{content/META-INF/vault/definition => resources}/thumbnail.png (100%)
 delete mode 100644 ui.apps/src/main/content/META-INF/vault/definition/.content.xml
 delete mode 100644 ui.apps/src/main/content/jcr_root/apps/acs-commons/install/.vltignore
 rename ui.apps/src/main/{content/META-INF/vault/definition => resources}/thumbnail.png (100%)
 delete mode 100644 ui.content/src/main/content/META-INF/vault/definition/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
 rename ui.content/src/main/{content/META-INF/vault/definition => resources}/thumbnail.png (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b87c28f764..700d56abf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 [unreleased changes details]: https://github.com/Adobe-Consulting-Services/acs-aem-commons/compare/acs-aem-commons-5.0.14...HEAD
 - #2806 - AEM Environment Indicator rendered two times when opening a Experience Fragment variation
 
+### Changed
+
+- #2043 - Switch to filevault-package-maven-plugin
+- #2781 - Remove Adobe repositories from pom.xml
+
 ## 5.2.0 - 2022-03-03
 
 ### Fixed
diff --git a/content/pom.xml b/content/pom.xml
index f813301a45..1e58dafe46 100644
--- a/content/pom.xml
+++ b/content/pom.xml
@@ -16,68 +16,29 @@
 
     <artifactId>acs-aem-commons-content</artifactId>
     <name>ACS AEM Commons Package</name>
+    <description>ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps, acs-aem-commons-ui.content, the OSGi bundle and configuration.</description>
     <packaging>content-package</packaging>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/content/jcr_root</directory>
-                <excludes>
-                    <exclude>**/.vlt</exclude>
-                    <exclude>**/.vltignore</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault/definition</directory>
-                <targetPath>../vault-work/META-INF/vault/definition</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault</directory>
-                <includes>
-                    <include>nodetypes.cnd</include>
-                    <include>privileges.xml</include>
-                </includes>
-                <targetPath>../vault-work/META-INF/vault</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources/META-INF</directory>
-                <targetPath>../vault-work/META-INF</targetPath>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <directory>${maven.multiModuleProjectDirectory}/src/test/resources</directory>
-            </testResource>
-        </testResources>
-
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <includeEmptyDirs>true</includeEmptyDirs>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.day.jcr.vault</groupId>
-                <artifactId>content-package-maven-plugin</artifactId>
-                <extensions>true</extensions>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>filevault-package-maven-plugin</artifactId>
                 <configuration>
-                    <group>adobe/consulting</group>
-                    <properties>
-                        <description>ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps and acs-aem-commons-ui.content.</description>
-                    </properties>
-                    <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
-                    <targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
+                    <packageType>container</packageType>
+                    <embeddeds>
+                        <embedded>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>acs-aem-commons-bundle</artifactId>
+                            <target>/apps/acs-commons/install</target>
+                            <filter>true</filter>
+                            <isAllVersionsFilter>true</isAllVersionsFilter>
+                        </embedded>
+                    </embeddeds>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>default-package</id>
+                        <id>default-generate-metadata</id>
                         <configuration>
                             <subPackages>
                                 <subPackage>
@@ -85,40 +46,52 @@
                                     <artifactId>acs-aem-commons-ui.apps</artifactId>
                                     <scope>runtime</scope> <!-- this is hacky, but seems to be the easiest way to include the min artifacts since there's no way to specify a blank classifier -->
                                     <filter>true</filter>
+                                    <isAllVersionsFilter>true</isAllVersionsFilter>
                                 </subPackage>
                                 <subPackage>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>acs-aem-commons-ui.content</artifactId>
                                     <scope>runtime</scope>
                                     <filter>true</filter>
+                                    <isAllVersionsFilter>true</isAllVersionsFilter>
                                 </subPackage>
                             </subPackages>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>build-min-package</id>
-                        <phase>package</phase>
+                        <id>generate-metadata-min-package-</id>
                         <goals>
-                            <goal>package</goal>
+                            <goal>generate-metadata</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.build.finalName}-min</finalName>
+                            <classifier>min</classifier>
                             <subPackages>
                                 <subPackage>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>acs-aem-commons-ui.apps</artifactId>
                                     <classifier>min</classifier>
                                     <filter>true</filter>
+                                    <isAllVersionsFilter>true</isAllVersionsFilter>
                                 </subPackage>
                                 <subPackage>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>acs-aem-commons-ui.content</artifactId>
                                     <classifier>min</classifier>
                                     <filter>true</filter>
+                                    <isAllVersionsFilter>true</isAllVersionsFilter>
                                 </subPackage>
                             </subPackages>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>build-min-package</id>
+                        <goals>
+                            <goal>package</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>min</classifier>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -179,7 +152,8 @@
                 </executions>
             </plugin>
 
-            <plugin>
+<!-- disable oakpal due to false positives: https://github.com/adamcin/oakpal/issues/92 
+          <plugin>
                 <groupId>net.adamcin.oakpal</groupId>
                 <artifactId>oakpal-maven-plugin</artifactId>
                 <configuration>
@@ -251,7 +225,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
 
             <!-- avoid failing on JS vulnerabilities - TODO to fix -->
             <plugin>
@@ -266,6 +240,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>acs-aem-commons-bundle</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>acs-aem-commons-ui.apps</artifactId>
diff --git a/content/src/main/content/META-INF/vault/definition/.content.xml b/content/src/main/content/META-INF/vault/definition/.content.xml
deleted file mode 100644
index a90ddd7bd5..0000000000
--- a/content/src/main/content/META-INF/vault/definition/.content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:description="ACS AEM Commons Package"
-    jcr:primaryType="vlt:PackageDefinition"
-    sling:resourceType="cq/packaging/components/pack/definition"
-    buildCount="1"
-    cqVersion="5.3"
-    group="day_internal/consulting"
-    name="acs-aem-commons-content"
-    path="/etc/packages/day_internal/consulting/acs-aem-commons-content-0.0.1-SNAPSHOT"
-    version="0.0.1-SNAPSHOT">
-    <filter jcr:primaryType="nt:unstructured">
-        <filter1
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/acs-commons"
-            rules="[]"/>
-        <filter2
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/sling/servlet/errorhandler"
-            rules="[]"/>
-    </filter>
-</jcr:root>
diff --git a/content/src/main/content/META-INF/vault/filter.xml b/content/src/main/content/META-INF/vault/filter.xml
index f9330f8183..ac2c0736ba 100644
--- a/content/src/main/content/META-INF/vault/filter.xml
+++ b/content/src/main/content/META-INF/vault/filter.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
+    <filter root="/apps/acs-commons/config"/>
+    <filter root="/apps/acs-commons/config.author"/>
+    <filter root="/apps/acs-commons/config.publish"/>
 </workspaceFilter>
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml b/content/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml
rename to content/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-replication-status.config b/content/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-replication-status.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-replication-status.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-replication-status.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-distribution.config b/content/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-distribution.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-distribution.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-distribution.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-ensure-oakindex.config b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-ensure-oakindex.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-ensure-oakindex.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-ensure-oakindex.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-root-acls.config b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-root-acls.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-root-acls.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-root-acls.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-varworkflow-acls.config b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-varworkflow-acls.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-varworkflow-acls.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-varworkflow-acls.config
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config b/content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config
rename to content/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons.config
diff --git a/content/src/main/content/META-INF/vault/definition/thumbnail.png b/content/src/main/resources/thumbnail.png
similarity index 100%
rename from content/src/main/content/META-INF/vault/definition/thumbnail.png
rename to content/src/main/resources/thumbnail.png
diff --git a/pom.xml b/pom.xml
index 667569ae45..8f3760e9c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,10 +224,97 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
                     <artifactId>sling-maven-plugin</artifactId>
                     <version>2.4.2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>filevault-package-maven-plugin</artifactId>
+                    <version>1.3.0</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <group>adobe/consulting</group>
+                        <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
+                        <thumbnailImage>src/main/resources/thumbnail.png</thumbnailImage>
+                        <validatorsSettings>
+                            <jackrabbit-filter>
+                                <options>
+                                    <validRoots>/,/libs,/libs/core/wcm,/apps,/etc,/etc/clientlibs,/etc/cloudservices,/etc/dam/video,/etc/designs,/etc/notification,/etc/workflow/instances,/etc/workflow/packages,/var,/tmp,/content,/content/dam,/home,/home/users,/home/users/system,/home/groups,/conf,/conf/global</validRoots>
+                                </options>
+                            </jackrabbit-filter>
+                            <jackrabbit-nodetypes>
+                                <options>
+                                    <!-- use the nodetypes and namespaces from the aem-nodetypes.jar provided in the plugin dependencies -->
+                                    <cnds>tccl:aem.cnd</cnds>
+                                </options>
+                            </jackrabbit-nodetypes>
+                            <jackrabbit-packagetype>
+                                <options>
+                                    <allowComplexFilterRulesInApplicationPackages>true</allowComplexFilterRulesInApplicationPackages>
+                                </options>
+                            </jackrabbit-packagetype>
+                            <netcentric-aem-classification>
+                                <!-- only raise to WARN once we start tackling these issues -->
+                                <defaultSeverity>INFO</defaultSeverity>
+                                <options>
+                                    <maps>tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-deprecations/coral2deprecations.map,tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-deprecations/graniteuideprecations.map,tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-repo-annotations.map</maps>
+                                </options>
+                            </netcentric-aem-classification>
+                            <netcentric-aem-cloud>
+                                <options>
+                                    <allowReadOnlyMutablePaths>true</allowReadOnlyMutablePaths><!-- default value is true, as it is allowed to have /var nodes inside author-only container -->
+                                </options>
+                            </netcentric-aem-cloud>
+                        </validatorsSettings>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>generate-cnd</id>
+                            <goals>
+                                <goal>generate-cnd</goal>
+                            </goals>
+                            <configuration>
+                                <additionalInputCndUrls>tccl:aem.cnd</additionalInputCndUrls>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <!-- validates against content classifications from AEM (https://github.com/Netcentric/aem-classification/tree/master/aem-classification-validator)  -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator</groupId>
+                            <artifactId>aem-classification-validator</artifactId>
+                            <version>1.0.1</version>
+                        </dependency>
+                        <!-- the dependency containing the actual classification map -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator.maps</groupId>
+                            <artifactId>aem-classification-map-repo-annotations</artifactId>
+                            <version>6.5.3.0</version>
+                        </dependency>
+                        <!-- map containing additional deprecations from release notes -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator.maps</groupId>
+                            <artifactId>aem-classification-map-deprecations</artifactId>
+                            <version>6.5.0.0</version>
+                        </dependency>
+                        <!-- contains all node types and namespaces of AEM 6.5.7, necessary for validator 'jackrabbit-nodetypes' -->
+                        <dependency>
+                            <groupId>biz.netcentric.aem</groupId>
+                            <artifactId>aem-nodetypes</artifactId>
+                            <version>6.5.7.0</version>
+                        </dependency>
+                        <!-- https://github.com/Netcentric/aem-cloud-validator -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator</groupId>
+                            <artifactId>aem-cloud-validator</artifactId>
+                            <version>1.2.2</version>
+                         </dependency>
+                     </dependencies>
+                </plugin>
                 <plugin>
                     <groupId>com.day.jcr.vault</groupId>
                     <artifactId>content-package-maven-plugin</artifactId>
-                    <version>0.0.24</version>
+                    <version>1.0.4</version>
+                    <configuration>
+                        <targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -724,28 +811,6 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
         </profile>
     </profiles>
 
-    <!--
-        Inclusion of repositories in POMs is controversial, to say the least.
-        It would be best if you proxied the Adobe repository using a Maven
-        Repository Manager. Once you do that, remove these sections.
-    -->
-    <repositories>
-        <repository>
-            <id>adobe-public-releases</id>
-            <name>Adobe Public Repository</name>
-            <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>adobe-public-releases</id>
-            <name>Adobe Public Repository</name>
-            <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-            <layout>default</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
     <distributionManagement>
         <!-- the nexus-staging-maven-plugin only needs a snapshot repository -->
         <snapshotRepository>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 53753bab54..b4f8a64083 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -16,72 +16,19 @@
 
     <artifactId>acs-aem-commons-ui.apps</artifactId>
     <name>ACS AEM Commons UI.Apps Package</name>
+    <description>ACS AEM Commons content package containing code (/apps).</description>
     <packaging>content-package</packaging>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/content/jcr_root</directory>
-                <excludes>
-                    <exclude>**/.vlt</exclude>
-                    <exclude>**/.vltignore</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault/definition</directory>
-                <targetPath>../vault-work/META-INF/vault/definition</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault</directory>
-                <includes>
-                    <include>nodetypes.cnd</include>
-                    <include>privileges.xml</include>
-                </includes>
-                <targetPath>../vault-work/META-INF/vault</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources/META-INF</directory>
-                <targetPath>../vault-work/META-INF</targetPath>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <directory>${maven.multiModuleProjectDirectory}/src/test/resources</directory>
-            </testResource>
-        </testResources>
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <includeEmptyDirs>true</includeEmptyDirs>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.day.jcr.vault</groupId>
-                <artifactId>content-package-maven-plugin</artifactId>
-                <extensions>true</extensions>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>filevault-package-maven-plugin</artifactId>
                 <configuration>
-                    <group>adobe/consulting</group>
-                    <properties>
-                        <description>ACS AEM Commons content package containing code (/apps).</description>
-                        <!-- overwrite rep:ACE nodes defining policies for acs-aem-commons-owned service principals -->
-                        <acHandling>merge</acHandling>
-                    </properties>
-                    <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
-                    <embeddeds>
-                        <embedded>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>acs-aem-commons-bundle</artifactId>
-                            <target>/apps/acs-commons/install</target>
-                        </embedded>
-                    </embeddeds>
+                    <!-- overwrite rep:ACE nodes defining policies for acs-aem-commons-owned service principals -->
+                    <accessControlHandling>merge</accessControlHandling>
+                    <packageType>application</packageType>
                     <dependencies>
                         <dependency>
                             <group>day/cq60/product</group>
@@ -89,7 +36,6 @@
                             <version>[6.3.64,)</version>
                         </dependency>
                     </dependencies>
-                    <targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
                 </configuration>
             </plugin>
 
@@ -260,7 +206,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>
diff --git a/ui.apps/src/main/content/META-INF/vault/definition/.content.xml b/ui.apps/src/main/content/META-INF/vault/definition/.content.xml
deleted file mode 100644
index a90ddd7bd5..0000000000
--- a/ui.apps/src/main/content/META-INF/vault/definition/.content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:description="ACS AEM Commons Package"
-    jcr:primaryType="vlt:PackageDefinition"
-    sling:resourceType="cq/packaging/components/pack/definition"
-    buildCount="1"
-    cqVersion="5.3"
-    group="day_internal/consulting"
-    name="acs-aem-commons-content"
-    path="/etc/packages/day_internal/consulting/acs-aem-commons-content-0.0.1-SNAPSHOT"
-    version="0.0.1-SNAPSHOT">
-    <filter jcr:primaryType="nt:unstructured">
-        <filter1
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/acs-commons"
-            rules="[]"/>
-        <filter2
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/sling/servlet/errorhandler"
-            rules="[]"/>
-    </filter>
-</jcr:root>
diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index d15ca4ee60..4297db18a5 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -7,15 +7,41 @@
         <exclude pattern="/apps/acs-commons/components/utilities/page/clientlibs/css/generated"/>
         <exclude pattern="/apps/acs-commons/components/utilities/oak-index-manager/clientlibs/css/generated"/>
         <exclude pattern="/apps/acs-commons/components/utilities/bulk-workflow-manager/clientlibs/css/generated"/>
-        <include pattern="/apps/acs-commons/components/utilities/page-compare(.*)?"/>
         <exclude pattern="/apps/acs-commons/components/utilities/page-compare/clientlibs/css/generated"/>
-        <include pattern="/apps/acs-commons/components/utilities/version-compare(.*)?"/>
         <exclude pattern="/apps/acs-commons/components/utilities/version-compare/clientlibs/css/generated"/>
+        <exclude pattern="/apps/acs-commons/config(\..*)?(/.*)?" />
+        <exclude pattern="/apps/acs-commons/install(/.*)?" />
+    </filter>
+    <!-- for overlays just make sure the structure is there with the right node types -->
+    <filter root="/apps/cq">
+        <include pattern="/apps/cq"/>
+        <include pattern="/apps/cq/core"/>
+        <include pattern="/apps/cq/core/content"/>
+        <include pattern="/apps/cq/core/content/nav"/>
+        <include pattern="/apps/cq/core/content/nav/tools"/>
+        <include pattern="/apps/cq/core/content/nav/tools/acs-commons(/.*)?"/>
+        <include pattern="/apps/cq/core/content/nav/tools/cloudservices"/>
+        <include pattern="/apps/cq/core/content/nav/tools/cloudservices/marketo(/.*)?"/>
+    </filter>
+    <filter root="/apps/dam">
+        <include pattern="/apps/dam"/>
+        <include pattern="/apps/dam/gui"/>
+        <include pattern="/apps/dam/gui/content"/>
+        <include pattern="/apps/dam/gui/content/assets"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/col1"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/dialogpublishurl(/.*)?"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/col1/items"/>
+        <include pattern="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/col1/items/copypublishurl(/.*)?"/>
     </filter>
-    <filter root="/apps/cq/core/content/nav/tools/acs-commons"/>
-    <filter root="/apps/settings/dam/indesign/scripts"/>
-    <filter root="/apps/cq/core/content/nav/tools/cloudservices/marketo"/>
-    <filter root="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/col1/dialogpublishurl"/>
-    <filter root="/apps/dam/gui/content/assets/metadataeditor/jcr:content/content/items/col1/items/copypublishurl"/>
     <filter root="/apps/rep:policy"/>
+    <filter root="/apps/settings">
+        <include pattern="/apps/settings"/>
+        <include pattern="/apps/settings/dam"/>
+        <include pattern="/apps/settings/dam/indesign"/>
+        <include pattern="/apps/settings/dam/indesign/scripts(/.*)?"/>
+    </filter>
 </workspaceFilter>
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml
index a90f2b5da6..9dd06c0481 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/generic-list-console/.content.xml
@@ -305,7 +305,6 @@
                 sling:resourceType="granite/ui/components/coral/foundation/panel/railpanel"/>
         </rails>
     </jcr:content>
-    <createlistwizard/>
     <pagecolumnpreview
         jcr:primaryType="nt:unstructured"
         sling:resourceType="cq/gui/components/coral/admin/page/columnpreview"
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/qr-code/clientlibs/js/app.js b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/qr-code/clientlibs/js/app.js
index ea05ec3e34..206406c2b9 100644
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/qr-code/clientlibs/js/app.js
+++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/qr-code/clientlibs/js/app.js
@@ -50,7 +50,7 @@ angular.module('acs-commons-qr-code-app', ['acsCoral', 'ACS.Commons.notification
         $http({
             method: 'POST',
             url: $scope.app.uri + '/config',
-            data: 'enabled=' + $scope.form.enabled || 'false',
+            data: 'sling:resourceType=acs-commons/components/utilities/qr-code/config&enabled=' + $scope.form.enabled || 'false',
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded'
             }
diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/install/.vltignore b/ui.apps/src/main/content/jcr_root/apps/acs-commons/install/.vltignore
deleted file mode 100644
index f23b9489f9..0000000000
--- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/install/.vltignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
\ No newline at end of file
diff --git a/ui.apps/src/main/content/META-INF/vault/definition/thumbnail.png b/ui.apps/src/main/resources/thumbnail.png
similarity index 100%
rename from ui.apps/src/main/content/META-INF/vault/definition/thumbnail.png
rename to ui.apps/src/main/resources/thumbnail.png
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
index 40bec28bc3..0c202d4724 100644
--- a/ui.content/pom.xml
+++ b/ui.content/pom.xml
@@ -16,72 +16,24 @@
 
     <artifactId>acs-aem-commons-ui.content</artifactId>
     <name>ACS AEM Commons UI.Content Package</name>
+    <description>ACS AEM Commons content package containing content and context-aware configuration.</description>
     <packaging>content-package</packaging>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/content/jcr_root</directory>
-                <excludes>
-                    <exclude>**/.vlt</exclude>
-                    <exclude>**/.vltignore</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault/definition</directory>
-                <targetPath>../vault-work/META-INF/vault/definition</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/content/META-INF/vault</directory>
-                <includes>
-                    <include>nodetypes.cnd</include>
-                    <include>privileges.xml</include>
-                </includes>
-                <targetPath>../vault-work/META-INF/vault</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources/META-INF</directory>
-                <targetPath>../vault-work/META-INF</targetPath>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <directory>${maven.multiModuleProjectDirectory}/src/test/resources</directory>
-            </testResource>
-        </testResources>
 
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <includeEmptyDirs>true</includeEmptyDirs>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.day.jcr.vault</groupId>
-                <artifactId>content-package-maven-plugin</artifactId>
-                <extensions>true</extensions>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>filevault-package-maven-plugin</artifactId>
                 <configuration>
-                    <group>adobe/consulting</group>
-                    <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
-                    <properties>
-                        <description>ACS AEM Commons content package containing content and configuration.</description>
-                        <acHandling>merge</acHandling>
-                    </properties>
+                    <accessControlHandling>merge</accessControlHandling>
                     <dependencies>
                         <dependency>
-                            <group>adobe/consulting</group>
-                            <name>acs-aem-commons-ui.apps</name>
-                            <version>${project.version}</version>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>acs-aem-commons-ui.apps</artifactId>
                         </dependency>
                     </dependencies>
-                    <targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
+                    <packageType>content</packageType>
                 </configuration>
             </plugin>
             <plugin>
@@ -271,6 +223,12 @@
         </plugins>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>acs-aem-commons-ui.apps</artifactId>
+            <version>${project.version}</version>
+            <type>content-package</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>acs-aem-commons-oakpal-checks</artifactId>
diff --git a/ui.content/src/main/content/META-INF/vault/definition/.content.xml b/ui.content/src/main/content/META-INF/vault/definition/.content.xml
deleted file mode 100644
index a90ddd7bd5..0000000000
--- a/ui.content/src/main/content/META-INF/vault/definition/.content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
-    jcr:description="ACS AEM Commons Package"
-    jcr:primaryType="vlt:PackageDefinition"
-    sling:resourceType="cq/packaging/components/pack/definition"
-    buildCount="1"
-    cqVersion="5.3"
-    group="day_internal/consulting"
-    name="acs-aem-commons-content"
-    path="/etc/packages/day_internal/consulting/acs-aem-commons-content-0.0.1-SNAPSHOT"
-    version="0.0.1-SNAPSHOT">
-    <filter jcr:primaryType="nt:unstructured">
-        <filter1
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/acs-commons"
-            rules="[]"/>
-        <filter2
-            jcr:primaryType="nt:unstructured"
-            mode="replace"
-            root="/apps/sling/servlet/errorhandler"
-            rules="[]"/>
-    </filter>
-</jcr:root>
diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
index c7a4729dcb..3f6aba1481 100644
--- a/ui.content/src/main/content/META-INF/vault/filter.xml
+++ b/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -1,90 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    <filter root="/conf/rep:policy"/>
     <filter root="/content/dam/rep:policy"/>
-    <filter root="/content/rep:policy"/>
     <filter root="/conf/global/settings">
         <include pattern="/conf/global/settings/redirects"/>
     </filter>
     <filter root="/etc/acs-commons">
-        <include pattern="/etc/acs-commons/jcr:content"/>
-        <include pattern="/etc/acs-commons/automatic-package-replication"/>
-        <include pattern="/etc/acs-commons/automatic-package-replication/jcr:content"/>
-        <include pattern="/etc/acs-commons/bulk-workflow-manager"/>
-        <include pattern="/etc/acs-commons/bulk-workflow-manager/jcr:content"/>
+        <include pattern="/etc/acs-commons/automatic-package-replication(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/bulk-workflow-manager(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/bulk-workflow-manager/rep:policy(/.*)?"/>
         <include pattern="/etc/acs-commons/twitter-rate-limit-checker(.*)?"/>
-        <include pattern="/etc/acs-commons/dispatcher-flush"/>
-        <include pattern="/etc/acs-commons/dispatcher-flush/jcr:content"/>
-        <include pattern="/etc/acs-commons/lists"/>
-        <include pattern="/etc/acs-commons/lists/jcr:content"/>
-        <include pattern="/etc/acs-commons/lists/dynamic-deck-query-list" mode="merge"/>
-        <include pattern="/etc/acs-commons/lists/dynamic-deck-query-list/jcr:content" mode="merge"/>
-        <include pattern="/etc/acs-commons/lists/sharethis-services"/>
-        <include pattern="/etc/acs-commons/lists/sharethis-services/jcr:content"/>
+        <include pattern="/etc/acs-commons/dispatcher-flush(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/lists(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/lists/dynamic-deck-query-list(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/lists/sharethis-services(/jcr:content)?"/>
         <include pattern="/etc/acs-commons/lists/sharethis-services/jcr:content/list"/>
         <include pattern="/etc/acs-commons/lists/sharethis-services/jcr:content/list/default_\d+"/>
-        <include pattern="/etc/acs-commons/lists/font-awesome-icons"/>
-        <include pattern="/etc/acs-commons/lists/font-awesome-icons/jcr:content"/>
+        <include pattern="/etc/acs-commons/lists/font-awesome-icons(/jcr:content)?"/>
         <include pattern="/etc/acs-commons/lists/font-awesome-icons/jcr:content/list"/>
         <include pattern="/etc/acs-commons/lists/font-awesome-icons/jcr:content/list/item_\d+"/>
-        <include pattern="/etc/acs-commons/lists/report-parameter-components"/>
-        <include pattern="/etc/acs-commons/lists/report-parameter-components/jcr:content"/>
+        <include pattern="/etc/acs-commons/lists/report-parameter-components(/jcr:content)?"/>
         <include pattern="/etc/acs-commons/lists/report-parameter-components/jcr:content/list"/>
         <include pattern="/etc/acs-commons/lists/report-parameter-components/jcr:content/list/default_\d+"/>
-        <include pattern="/etc/acs-commons/notifications"/>
-        <include pattern="/etc/acs-commons/notifications/jcr:content"/>
-        <include pattern="/etc/acs-commons/packagers"/>
-        <include pattern="/etc/acs-commons/packagers/jcr:content"/>
-        <include pattern="/etc/acs-commons/redirect-maps"/>
-        <include pattern="/etc/acs-commons/redirect-maps/jcr:content"/>
-        <include pattern="/etc/acs-commons/exporters"/>
-        <include pattern="/etc/acs-commons/exporters/jcr:content"/>
+        <include pattern="/etc/acs-commons/notifications(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/notifications/rep:policy(/.*)?"/>
+        <include pattern="/etc/acs-commons/packagers(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/redirect-maps(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/redirect-maps/rep:policy(/.*)?"/>
+        <include pattern="/etc/acs-commons/exporters(/jcr:content)?"/>
         <include pattern="/etc/acs-commons/exporters/tag-to-csv-exporter"/>
+        <include pattern="/etc/acs-commons/exporters/tag-to-csv-exporter/jcr:content(/.*)?"/>
         <include pattern="/etc/acs-commons/qr-code"/>
         <include pattern="/etc/acs-commons/qr-code/jcr:content"/>
-        <include
-            pattern="/etc/acs-commons/qr-code/jcr:content/clientlib-author"
-            mode="merge"/>
-        <exclude
-            pattern="/etc/acs-commons/qr-code/jcr:content/config"
-            mode="merge"/>
-        <include pattern="/etc/acs-commons/instant-package"/>
-        <include pattern="/etc/acs-commons/instant-package/jcr:content"/>
-        <include pattern="/etc/acs-commons/instant-package/jcr:content/instant-package-image.png"/>
+        <include pattern="/etc/acs-commons/qr-code/jcr:content/clientlib-authoring(/.*)?"/>
+        <include pattern="/etc/acs-commons/qr-code/jcr:content/qr-code-image.png(/.*)?"/>
+        <exclude pattern="/etc/acs-commons/qr-code/jcr:content/config" />
+        <include pattern="/etc/acs-commons/instant-package(/jcr:content)?"/>
+        <include pattern="/etc/acs-commons/instant-package/jcr:content/clientlib-authoring(/.*)?"/>
+        <include pattern="/etc/acs-commons/instant-package/jcr:content/instant-package-image.png(/.*)?"/>
         <include pattern="/etc/acs-commons/instant-package/jcr:content/config"/>
-
+    </filter>
+    <filter root="/etc/acs-commons" type="cleanup">
         <!-- Remove legacy /etc pages from prior version installs -->
         <include pattern="/etc/acs-commons/audit-log-search"/>
         <include pattern="/etc/acs-commons/jcr-compare"/>
         <include pattern="/etc/acs-commons/manage-controlled-processes"/>
         <include pattern="/etc/acs-commons/oak-index-manager"/>
         <include pattern="/etc/acs-commons/page-compare"/>
-        <include pattern="/etc/acs-commons/reports"/>
+        <include pattern="/etc/acs-commons/reports(.*)?" />
         <include pattern="/etc/acs-commons/version-compare"/>
         <include pattern="/etc/acs-commons/version-replicator"/>
         <include pattern="/etc/acs-commons/workflow-remover"/>
     </filter>
-    <filter root="/etc/clientlibs/acs-commons"/>
     <filter root="/etc/cloudservices/dtm">
         <include pattern="/etc/cloudservices/dtm/jcr:content"/>
-        <include pattern="/etc/cloudservices/dtm/rep:policy"/>
+        <include pattern="/etc/cloudservices/dtm/rep:policy(/.*)?"/>
     </filter>
     <filter root="/etc/cloudservices/sharethis">
         <include pattern="/etc/cloudservices/sharethis/jcr:content"/>
-        <include pattern="/etc/cloudservices/sharethis/rep:policy"/>
+        <include pattern="/etc/cloudservices/sharethis/rep:policy(/.*)?"/>
     </filter>
     <filter root="/etc/cloudservices/typekit">
         <include pattern="/etc/cloudservices/typekit/jcr:content"/>
-        <include pattern="/etc/cloudservices/typekit/rep:policy"/>
+        <include pattern="/etc/cloudservices/typekit/rep:policy(/.*)?"/>
     </filter>
     <filter root="/etc/dam/video/flacmono"/>
     <filter root="/etc/dam/video/mp3hq"/>
     <filter root="/etc/dam/video/ogghq"/>
     <filter root="/etc/designs/acs-commons"/>
     <filter root="/etc/notification/email">
-        <include pattern="/etc/notification/email/rep:policy"/>
-        <include pattern="/etc/notification/email/acs-commons"/>
-        <include pattern="/etc/notification/email/acs-commons/(.*)?"/>
+        <include pattern="/etc/notification/email/rep:policy(/.*)?"/>
+        <include pattern="/etc/notification/email/acs-commons(/.*)?"/>
     </filter>
     <filter root="/etc/rep:policy"/>
     <filter root="/etc/workflow/instances/rep:policy"/>
@@ -93,15 +78,18 @@
     <filter root="/home/users/rep:policy"/>
     <filter root="/home/users/system/acs-commons"/>
     <filter root="/var/acs-commons">
-        <include pattern="/var/acs-commons/rep:policy"/>
-        <include pattern="/var/acs-commons/jcr:content"/>
+        <include pattern="/var/acs-commons/rep:policy(/.*)?"/>
         <include pattern="/var/acs-commons/reports"/>
-        <include pattern="/var/acs-commons/reports/jcr:content"/>
-        <include
-            pattern="/etc/acs-commons/reports(.*)?"
-            mode="merge"/>
+        <include pattern="/var/acs-commons/reports/sample-component-instances(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-components-report(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-page-report(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-references-report(/.*)?"/>
         <include pattern="/var/acs-commons/httpcache"/>
+        <include pattern="/var/acs-commons/httpcache/root"/>
+        <include pattern="/var/acs-commons/httpcache/rep:policy(/.*)?"/>
         <include pattern="/var/acs-commons/on-deploy-scripts-status"/>
-        <include pattern="/var/acs-commons/mcp"/>
+        <include pattern="/var/acs-commons/on-deploy-scripts-status/rep:policy(/.*)?"/>
+        <include pattern="/var/acs-commons/on-deploy-scripts-status/README.txt(/.*)?"/>
+        <include pattern="/var/acs-commons/mcp(/rep:policy(/.*)?)?"/>
     </filter>
 </workspaceFilter>
diff --git a/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml b/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/global/settings/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.content/src/main/content/jcr_root/etc/acs-commons/qr-code/.content.xml b/ui.content/src/main/content/jcr_root/etc/acs-commons/qr-code/.content.xml
index 489d8247ec..3c3f84d7c6 100644
--- a/ui.content/src/main/content/jcr_root/etc/acs-commons/qr-code/.content.xml
+++ b/ui.content/src/main/content/jcr_root/etc/acs-commons/qr-code/.content.xml
@@ -5,10 +5,5 @@
         jcr:primaryType="cq:PageContent"
         jcr:title="QR Code"
         sling:resourceType="acs-commons/components/utilities/qr-code">
-        <config
-            jcr:primaryType="nt:unstructured"
-            enabled="{Boolean}false"
-            sling:resourceType="acs-commons/components/utilities/qr-code/config">
-        </config>
     </jcr:content>
 </jcr:root>
\ No newline at end of file
diff --git a/ui.content/src/main/content/META-INF/vault/definition/thumbnail.png b/ui.content/src/main/resources/thumbnail.png
similarity index 100%
rename from ui.content/src/main/content/META-INF/vault/definition/thumbnail.png
rename to ui.content/src/main/resources/thumbnail.png