Merge branch 'release/3.0.1'

valtech · Dec 11, 2019 · 40605ed · 40605ed
2 parents 354894e + b811493
commit 40605ed
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 11 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,4 +1,7 @@
-??? 2.1.0
+2019-12-11 3.0.1
+  - Fixed installation issues on new instances
+
+2019-11-22 3.0.0
   - Update to Groovy Console 14.0.0
   - Groovy Console binding:
    - ACL testing allows to check rights of your groups

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>aecu.api</artifactId>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>aecu.bundle</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>aecu.core</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>aecu.examples</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>de.valtech.aecu</groupId>
     <artifactId>aecu</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <name>AECU</name>
     <description>AEM Easy Content Upgrade</description>
     <url>https://github.com/valtech/aem-easy-content-upgrade</url>

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@
 sonar.projectKey=aecu
 # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
 sonar.projectName=AEM Easy Content Upgrade
-sonar.projectVersion=2.0.2-SNAPSHOT
+sonar.projectVersion=3.0.1-SNAPSHOT
 
 # Encoding of the source code. Default is default system encoding
 sonar.sourceEncoding=UTF-8

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>aecu.ui.apps</artifactId>

diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -6,16 +6,22 @@
     <filter root="/var/groovyconsole/scripts/aecu" mode="merge"/>
     <filter root="/apps/settings/granite/operations/hc/aecu"/>
     <filter root="/apps/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge"/><!--removes the old location-->
-    <filter root="/conf/global/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge"/>
+
+    <filter root="/conf/global/settings/granite" mode="merge"/> <!-- required for a bug in filevault-package-maven-plugin 1.0.4 JCRVLT-354 -->
+    <!-- <filter root="/conf/global/settings/granite/operations/maintenance/granite_weekly/aecu_history_purge"/> readd with fix for JCRVLT-354 -->
+
     <filter root="/etc/groovyconsole/scripts/aecu"/><!--removes the old location-->
     <filter root="/rep:policy" mode="merge"/>
     <filter root="/rep:repoPolicy" mode="merge"/>
     <filter root="/var/rep:policy" mode="merge"/>
-    <filter root="/var/aecu/rep:policy" mode="merge"/>
     <filter root="/content/rep:policy" mode="merge"/>
     <filter root="/conf/rep:policy" mode="merge"/>
     <filter root="/etc/rep:policy" mode="merge"/>
     <filter root="/apps/rep:policy" mode="merge"/>
-    <filter root="/var/aecu/oak:index/aecuHistory"/>
+
+    <filter root="/var/aecu" mode="merge"/> <!-- required for a bug in filevault-package-maven-plugin 1.0.4 JCRVLT-354 -->
+    <!-- <filter root="/var/aecu/oak:index/aecuHistory"/> readd with fix for JCRVLT-354 -->
+    <!-- <filter root="/var/aecu/rep:policy" mode="merge"/> readd with fix for JCRVLT-354 -->
+
     <filter root="/home/rep:policy" mode="merge"/>
 </workspaceFilter>
diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/.content.xml
@@ -0,0 +1,6 @@
+<?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"
+          jcr:mixinTypes="rep:AccessControllable"
+          >
+</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/.content.xml
@@ -0,0 +1,4 @@
+<?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="nt:folder">
+</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml b/ui.apps/src/main/content/jcr_root/conf/global/settings/granite/operations/.content.xml
@@ -0,0 +1,4 @@
+<?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="nt:folder">
+</jcr:root>