Merge pull request #510 from exadel-inc/bugfix/EAK-509

[EAK-509] Updated packages filters
exadel-inc · Feb 8, 2024 · 2ffc613 · 2ffc613
2 parents 5b42811 + ed2c08d
commit 2ffc613
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -66,13 +66,13 @@
                             <excludeDefaultDirectories>true</excludeDefaultDirectories>
                             <filesets>
                                 <fileset>
-                                    <directory>${basedir}/src/main/content/jcr_root/etc/packages/${project.groupId}/${project.parent.artifactId}</directory>
+                                    <directory>${basedir}/src/main/content/jcr_root/etc/packages/${project.groupId}</directory>
                                     <includes>
                                         <include>**</include>
                                     </includes>
                                     <excludes>
-                                        <exclude>.snapshot</exclude>
-                                        <exclude>.snapshot/.keep</exclude>
+                                        <exclude>${project.parent.artifactId}/.snapshot</exclude>
+                                        <exclude>${project.parent.artifactId}/.snapshot/.keep</exclude>
                                     </excludes>
                                 </fileset>
                             </filesets>

diff --git a/all/src/main/content/META-INF/vault/filter.xml b/all/src/main/content/META-INF/vault/filter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    <!-- The following filters clear old directories in JCR. They can be removed after v.2 release -->
-    <filter root="/etc/packages/authoring-toolkit"/>
-    <filter root="/etc/packages/aem-authoring-toolkit"/>
+    <!-- The following filters clear irrelevant directories in JCR -->
+    <filter root="/etc/packages/com.exadel.etoolbox/etoolbox-authoring-kit-plus"/>
 </workspaceFilter>
diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -7,8 +7,4 @@
         <exclude pattern="/apps/etoolbox-authoring-kit/fixes(/.*)?"/>
         <exclude pattern="/apps/etoolbox-authoring-kit/samples(/.*)?"/>
     </filter>
-
-    <!-- The following filters clear old directories in JCR content. They can be removed after v.2 release -->
-    <filter root="/apps/authoring-toolkit"/>
-    <filter root="/apps/cq/core/content/nav/tools/aembox/lists"/>
 </workspaceFilter>
diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
     <filter root="/conf/etoolbox-authoring-kit"/>
-
-    <!-- The following filter clears an old directory in JCR content. This can be removed after v.2 release -->
-    <filter root="/conf/authoring-toolkit"/>
 </workspaceFilter>