Creating hotfix branch test/release/23.6 for 23.6.0 ACS release [skip ci]

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties

@@ -4,8 +4,8 @@
 
 # Version label
 version.major=23
-version.minor=7
+version.minor=6
-version.revision=0
+version.revision=1
 version.label=
 
 # Edition label

amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.7.0.2</version>
+      <version>23.6.1.1-SNAPSHOT</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <organization>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>23.7.0.2</version>
+    <version>23.6.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -24,8 +24,8 @@
 
     <properties>
         <acs.version.major>23</acs.version.major>
-        <acs.version.minor>7</acs.version.minor>
+        <acs.version.minor>6</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
@@ -154,7 +154,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.7.0.2</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -31,14 +31,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-import org.json.simple.JSONObject;
-import org.owasp.html.PolicyFactory;
-import org.owasp.html.Sanitizers;
-import org.springframework.extensions.webscripts.Cache;
-import org.springframework.extensions.webscripts.Status;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.ForumModel;
 import org.alfresco.repo.content.MimetypeMap;
@@ -52,6 +44,10 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
 
 /**
  * This class is the controller for the comments.post web script.
@@ -62,7 +58,7 @@ import org.alfresco.service.namespace.RegexQNamePattern;
 public class CommentsPost extends AbstractCommentsWebScript
 {
     /**
-     * Overrides AbstractCommentsWebScript to add comment
+     *  Overrides AbstractCommentsWebScript to add comment
      */
     @Override
     protected Map<String, Object> executeImpl(NodeRef nodeRef, WebScriptRequest req, Status status, Cache cache)
@@ -70,19 +66,6 @@ public class CommentsPost extends AbstractCommentsWebScript
         // get json object from request
         JSONObject json = parseJSON(req);
 
-        // Validating and Sanitizing comment content to prevent XSS
-        String commentContent = getOrNull(json, "content");
-        if (StringUtils.isBlank(commentContent))
-        {
-            throw new IllegalArgumentException("Comment content must not be empty");
-        }
-        else
-        {
-            PolicyFactory policy = Sanitizers.FORMATTING.and(Sanitizers.LINKS);
-            String safeContent = policy.sanitize(commentContent);
-            json.replace("content", safeContent);
-        }
-
         /* MNT-10231, MNT-9771 fix */
         this.behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
 
@@ -116,32 +99,32 @@ public class CommentsPost extends AbstractCommentsWebScript
     {
         // fetch the parent to add the node to
         NodeRef commentsFolder = getOrCreateCommentsFolder(nodeRef);
-
+        
         // get a unique name
         String name = getUniqueChildName("comment");
-
+        
         // create the comment
-        NodeRef commentNodeRef = nodeService.createNode(commentsFolder,
+        NodeRef commentNodeRef = nodeService.createNode(commentsFolder, 
-                ContentModel.ASSOC_CONTAINS,
+                ContentModel.ASSOC_CONTAINS, 
-                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(name)),
+                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(name)), 
                 ForumModel.TYPE_POST).getChildRef();
-
+            
         // fetch the title required to create a comment
         String title = getOrNull(json, JSON_KEY_TITLE);
         HashMap<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
         props.put(ContentModel.PROP_TITLE, title != null ? title : "");
         nodeService.addProperties(commentNodeRef, props);
-
+        
         ContentWriter writer = contentService.getWriter(commentNodeRef, ContentModel.PROP_CONTENT, true);
         // fetch the content of a comment
         String contentString = getOrNull(json, JSON_KEY_CONTENT);
-
+        
         writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
         writer.putContent(contentString);
-
+        
         return commentNodeRef;
     }
-
+    
     /**
      * generates an comment item value
      * 
@@ -151,34 +134,34 @@ public class CommentsPost extends AbstractCommentsWebScript
     private Map<String, Object> generateItemValue(NodeRef commentNodeRef)
     {
         Map<String, Object> result = new HashMap<String, Object>(4, 1.0f);
-
+        
-        String creator = (String) this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATOR);
+        String creator = (String)this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATOR);
-
+        
         Serializable created = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATED);
         Serializable modified = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_MODIFIED);
-
+        
         boolean isUpdated = false;
         if (created instanceof Date && modified instanceof Date)
         {
-            isUpdated = ((Date) modified).getTime() - ((Date) created).getTime() > 5000;
+           isUpdated = ((Date)modified).getTime() - ((Date)created).getTime() > 5000;
         }
 
         // TODO refactor v0 Comments API to use CommentService (see ACE-5437)
         Serializable owner = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_OWNER);
         String currentUser = this.serviceRegistry.getAuthenticationService().getCurrentUserName();
-
+        
         boolean isSiteManager = this.permissionService.hasPermission(commentNodeRef, SiteModel.SITE_MANAGER) == (AccessStatus.ALLOWED);
         boolean isCoordinator = this.permissionService.hasPermission(commentNodeRef, PermissionService.COORDINATOR) == (AccessStatus.ALLOWED);
         boolean canEditComment = isSiteManager || isCoordinator || currentUser.equals(creator) || currentUser.equals(owner);
-
+        
         result.put("node", commentNodeRef);
         result.put("author", this.personService.getPerson(creator));
         result.put("isUpdated", isUpdated);
         result.put("canEditComment", canEditComment);
-
+        
         return result;
     }
-
+    
     /**
      * generates the response model for adding a comment
      * 
@@ -211,7 +194,7 @@ public class CommentsPost extends AbstractCommentsWebScript
         }
         return commentsFolder;
     }
-
+    
     /**
      * returns the nodeRef of the existing one
      * 
@@ -224,7 +207,7 @@ public class CommentsPost extends AbstractCommentsWebScript
         {
             List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL);
             ChildAssociationRef firstAssoc = assocs.get(0);
-
+            
             return nodeService.getChildByName(firstAssoc.getChildRef(), ContentModel.ASSOC_CONTAINS, COMMENTS_TOPIC_NAME);
         }
         else
@@ -237,7 +220,7 @@ public class CommentsPost extends AbstractCommentsWebScript
     {
         return prefix + "-" + System.currentTimeMillis();
     }
-
+    
     /**
      * creates the comments folder if it does not exists
      * 
@@ -246,34 +229,35 @@ public class CommentsPost extends AbstractCommentsWebScript
      */
     private NodeRef createCommentsFolder(final NodeRef nodeRef)
     {
-        NodeRef commentsFolder = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>() {
+        NodeRef commentsFolder = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>()
+        {
             public NodeRef doWork() throws Exception
             {
                 NodeRef commentsFolder = null;
                 AuthenticationUtil.pushAuthentication();
-
+                
                 // ALF-5240: turn off auditing round the discussion node creation to prevent
                 // the source document from being modified by the first user leaving a comment
                 behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
-
+                
                 try
-                {
+                {  
                     // MNT-12082: set System user for creating forumFolder and commentsFolder nodes
                     AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
-
+                    
                     nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussable"), null);
                     nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "commentsRollup"), null);
                     List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"), RegexQNamePattern.MATCH_ALL);
                     if (assocs.size() != 0)
                     {
                         NodeRef forumFolder = assocs.get(0).getChildRef();
-
+                        
                         Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
                         props.put(ContentModel.PROP_NAME, COMMENTS_TOPIC_NAME);
                         commentsFolder = nodeService.createNode(
                                 forumFolder,
-                                ContentModel.ASSOC_CONTAINS,
+                                ContentModel.ASSOC_CONTAINS, 
-                                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, COMMENTS_TOPIC_NAME),
+                                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, COMMENTS_TOPIC_NAME), 
                                 QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "topic"),
                                 props).getChildRef();
                     }
@@ -283,12 +267,12 @@ public class CommentsPost extends AbstractCommentsWebScript
                     AuthenticationUtil.popAuthentication();
                     behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
                 }
-
+                
                 return commentsFolder;
             }
-
+    
-        }, AuthenticationUtil.getSystemUserName());
+        }, AuthenticationUtil.getSystemUserName()); 
-
+        
         return commentsFolder;
     }
 

remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl

@@ -1,92 +1,83 @@
-<#macro renderParent node indent="   ">
+<#macro renderParent node indent="   ">
-	<#escape x as jsonUtils.encodeJSONString(x)>
+	<#escape x as jsonUtils.encodeJSONString(x)>
-	${indent}"parent":
+	${indent}"parent":
-	${indent}{
+	${indent}{
-	<#if (node != rootNode) && node.parent??>
+	<#if (node != rootNode) && node.parent??>
-		<@renderParent node.parent indent+"   " />
+		<@renderParent node.parent indent+"   " />
-	</#if>
+	</#if>
-		${indent}"type": "${node.typeShort}",
+		${indent}"type": "${node.typeShort}",
-		${indent}"isContainer": ${node.isContainer?string},
+		${indent}"isContainer": ${node.isContainer?string},
-		${indent}"name": "${node.properties.name!""}",
+		${indent}"name": "${node.properties.name!""}",
-		${indent}"title": "${node.properties.title!""}",
+		${indent}"title": "${node.properties.title!""}",
-		${indent}"description": "${node.properties.description!""}",
+		${indent}"description": "${node.properties.description!""}",
-		<#if node.properties.modified??>${indent}"modified": "${xmldate(node.properties.modified)}",</#if>
+		<#if node.properties.modified??>${indent}"modified": "${xmldate(node.properties.modified)}",</#if>
-		<#if node.properties.modifier??>${indent}"modifier": "${node.properties.modifier}",</#if>
+		<#if node.properties.modifier??>${indent}"modifier": "${node.properties.modifier}",</#if>
-		${indent}"displayPath": "${node.displayPath!""}",
+		${indent}"displayPath": "${node.displayPath!""}",
-		${indent}"qnamePath": "${node.qnamePath!""}",
+		${indent}"qnamePath": "${node.qnamePath!""}",
-		<#if node.aspects??>
+		<#if node.aspects??>
-        ${indent}"aspects": 
+        ${indent}"aspects": 
-        ${indent}[
+        ${indent}[
-           <#list node.aspects as aspect>
+           <#list node.aspects as aspect>
-                 "${shortQName(aspect)}"
+                 "${shortQName(aspect)}"
-              <#if aspect_has_next>,</#if>
+              <#if aspect_has_next>,</#if>
-           </#list>
+           </#list>
-        
+        
-           ${indent}],
+           ${indent}],
-       </#if>
+       </#if>
-		${indent}"nodeRef": "${node.nodeRef}"
+		${indent}"nodeRef": "${node.nodeRef}"
-	${indent}},
+	${indent}},
-	</#escape>
+	</#escape>
-</#macro>
+</#macro>
-
+
-<#macro pickerResultsJSON results>
+<#macro pickerResultsJSON results>
-	<#escape x as jsonUtils.encodeJSONString(x)>
+	<#escape x as jsonUtils.encodeJSONString(x)>
-{
+{
-	"data":
+	"data":
-	{
+	{
-<#if parent??>
+<#if parent??>
-	<@renderParent parent />
+	<@renderParent parent />
-</#if>
+</#if>
-		"items":
+		"items":
-		[
+		[
-		<#list results as row>
+		<#list results as row>
-			{
+			{
-				"type": "${row.item.typeShort}",
+				"type": "${row.item.typeShort}",
-				"parentType": "${row.item.parentTypeShort!""}",
+				"parentType": "${row.item.parentTypeShort!""}",
-				"isContainer": ${row.item.isContainer?string},
+				"isContainer": ${row.item.isContainer?string},
-				<#if row.container??>"container": "${row.container!""}",</#if>
+				<#if row.container??>"container": "${row.container!""}",</#if>
-                <#if row.item.properties?? && row.item.properties.name??>
+				"name": "${row.item.properties.name!""}",
-                	"name": "${row.item.properties.name!""}",
+				<#if row.item.aspects??>
-                <#else>
+                 "aspects": [
-                	"name": "${(row.item.name)!row.item?string!""}",
+                   <#list row.item.aspects as aspect>
-                </#if>
+                     "${shortQName(aspect)}"
-                <#if row.item.aspects??>
+                      <#if aspect_has_next>,</#if>
-                 "aspects": [
+                   </#list>
-                   <#list row.item.aspects as aspect>
+                   ],
-                     "${shortQName(aspect)}"
+                 </#if>
-                      <#if aspect_has_next>,</#if>
+				"title":<#if row.item.properties["lnk:title"]??>"${row.item.properties["lnk:title"]}",
-                   </#list>
+						<#elseif row.item.properties["ia:whatEvent"]??>"${row.item.properties["ia:whatEvent"]}",
-                   ],
+						<#else>"${row.item.properties.title!""}",</#if>
-                 </#if>
+				"description": "${row.item.properties.description!""}",
-                <#if row.item.properties??>
+				<#if row.item.properties.modified??>"modified": "${xmldate(row.item.properties.modified)}",</#if>
-					"title":<#if row.item.properties["lnk:title"]??>"${row.item.properties["lnk:title"]}",
+				<#if row.item.properties.modifier??>"modifier": "${row.item.properties.modifier}",</#if>
-							<#elseif row.item.properties["ia:whatEvent"]??>"${row.item.properties["ia:whatEvent"]}",
+				<#if row.item.siteShortName??>"site": "${row.item.siteShortName}",</#if>
-							<#else>"${row.item.properties.title!""}",</#if>
+				<#if row.item.properties["ia:fromDate"]??>"fromDate": "${xmldate(row.item.properties["ia:fromDate"])}",</#if>
-					"description": "${row.item.properties.description!""}",
+				"displayPath": "${row.item.displayPath!""}",
-                <#else>
+				"qnamePath": "${row.item.qnamePath!""}",
-					"title": "${(row.item.name)!row.item?string!""}",
+				<#if row.item.typeShort != "cm:person" && row.item.typeShort != "cm:authorityContainer">
-					"description": "",
+					"userAccess":
-                </#if>
+					{
-				<#if row.item.properties.modified??>"modified": "${xmldate(row.item.properties.modified)}",</#if>
+						"create": ${row.item.hasPermission("CreateChildren")?string},
-				<#if row.item.properties.modifier??>"modifier": "${row.item.properties.modifier}",</#if>
+						"edit": ${row.item.hasPermission("Write")?string},
-				<#if row.item.siteShortName??>"site": "${row.item.siteShortName}",</#if>
+						"delete": ${row.item.hasPermission("Delete")?string}
-				<#if row.item.properties["ia:fromDate"]??>"fromDate": "${xmldate(row.item.properties["ia:fromDate"])}",</#if>
+					},
-				"displayPath": "${row.item.displayPath!""}",
+				</#if>
-				"qnamePath": "${row.item.qnamePath!""}",
+				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
-				<#if row.item.typeShort != "cm:person" && row.item.typeShort != "cm:authorityContainer">
+				"selectable" : ${row.selectable?string}</#if>
-					"userAccess":
+			}<#if row_has_next>,</#if>
-					{
+		</#list>
-						"create": ${row.item.hasPermission("CreateChildren")?string},
+		]
-						"edit": ${row.item.hasPermission("Write")?string},
+	}
-						"delete": ${row.item.hasPermission("Delete")?string}
+}
-					},
+	</#escape>
-				</#if>
-				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
-				"selectable" : ${row.selectable?string}</#if>
-			}<#if row_has_next>,</#if>
-		</#list>
-		]
-	}
-}
-	</#escape>
 </#macro>

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.7.0.2</version>
+        <version>23.6.1.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

repository/src/main/resources/alfresco/repository.properties

@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=19600
+version.schema=19500
 
 # Directory configuration