Merge branch 'develop'

wcm-io · Jun 6, 2024 · de3e5c5 · de3e5c5
2 parents a0d7563 + e946344
commit de3e5c5
Show file tree

Hide file tree

Showing 74 changed files with 213 additions and 111 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -26,9 +26,9 @@ jobs:
           - java: 11
             os: windows-latest
             distribution: temurin
-          - java: 11
-            os: macos-latest
-            distribution: temurin
+          #- java: 11
+          #  os: macos-latest
+          #  distribution: temurin
 
     steps:
       - name: Checkout code

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="3.8.12" date="2024-06-06">
+      <action type="update" dev="sseifert">
+        Set hideInNav=true and cq:robotsTags=noindex,nofollow by default for structure element and config editor pages.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to AEM 6.5 SP21.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="3.8.10" date="2024-03-21">
       <action type="update" dev="sseifert" issue="39">
         Switch frontend to ES6 modules.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.parent</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.8</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.maven.archetypes</groupId>
   <artifactId>io.wcm.maven.archetypes.aem</artifactId>
-  <version>3.8.10</version>
+  <version>3.8.12</version>
   <packaging>maven-archetype</packaging>
 
   <name>wcm.io Maven Archetype for AEM</name>
@@ -127,7 +127,9 @@
           <version>${maven.archetype.version}</version>
           <configuration>
              <!-- Make sure .git* files can be included as well -->
+             <!-- Use for maven-archetype-plugin 3.3.0 and up:
              <useDefaultExcludes>false</useDefaultExcludes>
+             -->
           </configuration>
         </plugin>
 

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":semanticCommitsDisabled"
+  ],
+  "enabledManagers": [
+    "npm",
+    "nvm",
+    "maven",
+    "custom.regex"
+  ],
+  "npm": {
+    "minimumReleaseAge": "3 days"
+  },
+  "customManagers": [
+    {
+      "customType": "regex",
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}maven{{/if}}",
+      "fileMatch": ["(^|/)pom\\.xml$"],
+      "matchStrings": [
+        "##\\s??renovate:( datasource=(?<datasource>[a-z-.]+?))? depName=(?<depName>[^\\s]+?)(?: packageName=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+<(.+\\.)?version>(?<currentValue>.+)<\\/(.+\\.)?version>"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}maven{{/if}}"
+    }
+  ]
+}
diff --git a/...chetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json b/...chetype-resources/bundles/core/src/main/webapp/app-root/templates/admin/configEditor.json
@@ -8,6 +8,8 @@
 
   "jcr:content": {
     "jcr:primaryType": "cq:PageContent",
-    "sling:resourceType": "${projectName}/core/components/admin/page/configEditor"
+    "sling:resourceType": "${projectName}/core/components/admin/page/configEditor",
+    "hideInNav": true,
+    "cq:robotsTags": ["noindex","nofollow"]
   }
 }
diff --git a/...ype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json b/...ype-resources/bundles/core/src/main/webapp/app-root/templates/admin/structureElement.json
@@ -8,6 +8,8 @@
 
   "jcr:content": {
     "jcr:primaryType": "cq:PageContent",
-    "sling:resourceType": "${projectName}/core/components/admin/page/structureElement"
+    "sling:resourceType": "${projectName}/core/components/admin/page/structureElement",
+    "hideInNav": true,
+    "cq:robotsTags": ["noindex","nofollow"]
   }
 }
diff --git a/...sources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java b/...sources/archetype-resources/bundles/core/src/test/java/components/CustomCarouselTest.java
@@ -77,8 +77,8 @@ void testSlideImageUrls() {
 #end
 #if ($optionWcmioHandler == 'n')
     assertEquals(List.of(
-        "/content/mypage/_jcr_content/myresource/slides/item1.img.png",
-        "/content/mypage/_jcr_content/myresource/slides/item2.img.png"),
+        "/content/mypage/_jcr_content/myresource/slides/item1.coreimg.png",
+        "/content/mypage/_jcr_content/myresource/slides/item2.coreimg.png"),
         underTest.getSlideImages().stream()
             .map(Image::getSrc)
             .collect(Collectors.toList()));

diff --git a/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml
@@ -14,7 +14,7 @@ files:
 
 #if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' )
 # AEM Service Pack
-- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.20.0/zip
+- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.21.0/zip
   dir: packages
   modelOptions:
     delayAfterInstallSec: 30
@@ -107,7 +107,7 @@ files:
 #end
 
 #end
-# Application #if($optionAemVersion=='cloud')bundles and#{end}packages
+# Application #if($optionAemVersion=='cloud')bundles and #{end}packages
 #if ( $optionAemVersion == "cloud" )
 - url: mvn:${groupId}/${rootArtifactId}.core
   dir: bundles

diff --git a/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml b/src/main/resources/archetype-resources/content-packages/conf-content/jcr_root/.content.xml
@@ -1,5 +1,5 @@
 <?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" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable,rep:RepoAccessControllable]"
     jcr:primaryType="rep:root"
     sling:resourceType="sling:redirect"

diff --git a/...in/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/.content.xml b/...in/resources/archetype-resources/content-packages/conf-content/jcr_root/conf/.content.xml
@@ -1,4 +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" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="sling:Folder"/>
diff --git a/...hetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml b/...hetype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/.content.xml
@@ -1,5 +1,5 @@
 <?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" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="sling:Folder"
     jcr:title="${projectName}"

diff --git a/...ype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/_rep_policy.xml b/...ype-resources/content-packages/conf-content/jcr_root/conf/__projectName__/_rep_policy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
     jcr:primaryType="rep:ACL">
     <allow
         jcr:primaryType="rep:GrantACE"

diff --git a/...sources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/.content.xml b/...sources/content-packages/conf-content/jcr_root/conf/__projectName__/settings/.content.xml
@@ -1,4 +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:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="sling:Folder"
     sling:resourceType="sling:Folder"/>
diff --git a/...ces/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml b/...ces/content-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Page">
     <policies/>
     <template-types/>

diff --git a/...nt-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml b/...nt-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="cq:Page">
     <rep:policy/>

diff --git a/...packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml b/...packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/policies/_rep_policy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
     jcr:primaryType="rep:ACL">
     <allow
         jcr:primaryType="rep:GrantACE"

diff --git a/...kages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/.content.xml b/...kages/conf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="cq:Page">
     <content/>

diff --git a/...nf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml b/...nf-content/jcr_root/conf/__projectName__/settings/wcm/template-types/content/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:mixinTypes="[mix:lockable]"
     jcr:primaryType="cq:Template">
     <jcr:content

diff --git a/...nt/jcr_root/conf/__projectName__/settings/wcm/template-types/content/initial/.content.xml b/...nt/jcr_root/conf/__projectName__/settings/wcm/template-types/content/initial/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="cq:PageContent"

diff --git a/...t/jcr_root/conf/__projectName__/settings/wcm/template-types/content/policies/.content.xml b/...t/jcr_root/conf/__projectName__/settings/wcm/template-types/content/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="nt:unstructured"

diff --git a/.../jcr_root/conf/__projectName__/settings/wcm/template-types/content/structure/.content.xml b/.../jcr_root/conf/__projectName__/settings/wcm/template-types/content/structure/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[mobile/groups/responsive]"

diff --git a/..._projectName__/settings/wcm/template-types/experience-fragment-web-variation/.content.xml b/..._projectName__/settings/wcm/template-types/experience-fragment-web-variation/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:mixinTypes="[mix:lockable]"
     jcr:primaryType="cq:Template">
     <jcr:content

diff --git a/...Name__/settings/wcm/template-types/experience-fragment-web-variation/initial/.content.xml b/...Name__/settings/wcm/template-types/experience-fragment-web-variation/initial/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:xfVariantType="web"

diff --git a/...ame__/settings/wcm/template-types/experience-fragment-web-variation/policies/.content.xml b/...ame__/settings/wcm/template-types/experience-fragment-web-variation/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="nt:unstructured"

diff --git a/...me__/settings/wcm/template-types/experience-fragment-web-variation/structure/.content.xml b/...me__/settings/wcm/template-types/experience-fragment-web-variation/structure/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[mobile/groups/responsive]"

diff --git a/...t-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/.content.xml b/...t-packages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:mixinTypes="[rep:AccessControllable]"
     jcr:primaryType="cq:Page">
     <homepage/>

diff --git a/...ackages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml b/...ackages/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/_rep_policy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:crx="http://www.day.com/crx/1.0" xmlns:rep="internal"
     jcr:primaryType="rep:ACL">
     <allow
         jcr:primaryType="rep:GrantACE"

diff --git a/...onf-content/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/.content.xml b/...onf-content/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
         cq:templateType="/conf/${projectName}/settings/wcm/template-types/content"

diff --git a/...ent/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/initial/.content.xml b/...ent/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/initial/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/conf/${projectName}/settings/wcm/templates/contentpage"

diff --git a/...nt/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/policies/.content.xml b/...nt/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="nt:unstructured"

diff --git a/...t/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/structure/.content.xml b/...t/jcr_root/conf/__projectName__/settings/wcm/templates/contentpage/structure/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[mobile/groups/responsive]"

diff --git a/...ot/conf/__projectName__/settings/wcm/templates/contentpage/thumbnail.png.dir/.content.xml b/...ot/conf/__projectName__/settings/wcm/templates/contentpage/thumbnail.png.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mixinTypes="[dam:Thumbnails]"

diff --git a/...onf/__projectName__/settings/wcm/templates/experience-fragment-web-variation/.content.xml b/...onf/__projectName__/settings/wcm/templates/experience-fragment-web-variation/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
         cq:templateType="/conf/${projectName}/settings/wcm/template-types/experience-fragment-web-variation"

diff --git a/...ojectName__/settings/wcm/templates/experience-fragment-web-variation/initial/.content.xml b/...ojectName__/settings/wcm/templates/experience-fragment-web-variation/initial/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/conf/${projectName}/settings/wcm/templates/experience-fragment-web-variation"

diff --git a/...jectName__/settings/wcm/templates/experience-fragment-web-variation/policies/.content.xml b/...jectName__/settings/wcm/templates/experience-fragment-web-variation/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="nt:unstructured"

diff --git a/...ectName__/settings/wcm/templates/experience-fragment-web-variation/structure/.content.xml b/...ectName__/settings/wcm/templates/experience-fragment-web-variation/structure/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[mobile/groups/responsive]"

diff --git a/..._/settings/wcm/templates/experience-fragment-web-variation/thumbnail.png.dir/.content.xml b/..._/settings/wcm/templates/experience-fragment-web-variation/thumbnail.png.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mixinTypes="[dam:Thumbnails]"

diff --git a/...s/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/.content.xml b/...s/conf-content/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
         cq:templateType="/conf/${projectName}/settings/wcm/template-types/content"

diff --git a/...ontent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/initial/.content.xml b/...ontent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/initial/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:template="/conf/${projectName}/settings/wcm/templates/homepage"

diff --git a/...ntent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/policies/.content.xml b/...ntent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/policies/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         jcr:primaryType="nt:unstructured"

diff --git a/...tent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/structure/.content.xml b/...tent/jcr_root/conf/__projectName__/settings/wcm/templates/homepage/structure/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[mobile/groups/responsive]"

diff --git a/..._root/conf/__projectName__/settings/wcm/templates/homepage/thumbnail.png.dir/.content.xml b/..._root/conf/__projectName__/settings/wcm/templates/homepage/thumbnail.png.dir/.content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="nt:file">
     <jcr:content
         jcr:mixinTypes="[dam:Thumbnails]"

diff --git a/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/.content.xml b/src/main/resources/archetype-resources/content-packages/sample-content/jcr_root/.content.xml
@@ -1,5 +1,5 @@
 <?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" xmlns:rep="internal"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
     jcr:mixinTypes="[rep:AccessControllable,rep:RepoAccessControllable]"
     jcr:primaryType="rep:root"
     sling:resourceType="sling:redirect"