Compare commits

..

8 Commits

Author SHA1 Message Date
alfresco-build
60261aafd1 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-07 07:55:25 +00:00
alfresco-build
8dad225394 [maven-release-plugin][skip ci] prepare release 25.3.0.54 2025-10-07 07:55:23 +00:00
Debjit Chattopadhyay
5cc21c55e7 MNT-24776 adding if-else conditionals to avoid null values
MNT-24776 adding if-else conditionals to avoid null values
2025-10-07 12:38:14 +05:30
alfresco-build
c71aaf7537 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-06 16:27:33 +00:00
alfresco-build
b7d16ac915 [maven-release-plugin][skip ci] prepare release 25.3.0.53 2025-10-06 16:27:31 +00:00
cezary-witkowski
1a436b06e4 [ACS-10454] Bump AOS to fix "Edit in Microsoft Office" error (#3603) 2025-10-06 17:17:28 +02:00
Debjit Chattopadhyay
be02be5a8b MNT-24776 adding if-else conditionals to avoid null values 2025-10-06 19:01:58 +05:30
alfresco-build
a674e574c5 [maven-release-plugin][skip ci] prepare for next development iteration 2025-10-05 00:10:04 +00:00
25 changed files with 117 additions and 108 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>25.3.0.52</version> <version>25.3.0.55-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name> <name>Alfresco Community Repo Parent</name>
@@ -115,7 +115,7 @@
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version> <dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
<dependency.json-smart.version>2.5.2</dependency.json-smart.version> <dependency.json-smart.version>2.5.2</dependency.json-smart.version>
<alfresco.googledrive.version>4.1.0</alfresco.googledrive.version> <alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
<alfresco.aos-module.version>3.3.0</alfresco.aos-module.version> <alfresco.aos-module.version>3.4.0-A.1</alfresco.aos-module.version>
<alfresco.api-explorer.version>25.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share --> <alfresco.api-explorer.version>25.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version> <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
@@ -154,7 +154,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection> <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection> <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-community-repo</url> <url>https://github.com/Alfresco/alfresco-community-repo</url>
<tag>25.3.0.52</tag> <tag>HEAD</tag>
</scm> </scm>
<distributionManagement> <distributionManagement>

View File

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

View File

@@ -1,83 +1,92 @@
<#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>
"name": "${row.item.properties.name!""}", <#if row.item.properties?? && row.item.properties.name??>
<#if row.item.aspects??> "name": "${row.item.properties.name!""}",
"aspects": [ <#else>
<#list row.item.aspects as aspect> "name": "${(row.item.name)!row.item?string!""}",
"${shortQName(aspect)}" </#if>
<#if aspect_has_next>,</#if> <#if row.item.aspects??>
</#list> "aspects": [
], <#list row.item.aspects as aspect>
</#if> "${shortQName(aspect)}"
"title":<#if row.item.properties["lnk:title"]??>"${row.item.properties["lnk:title"]}", <#if aspect_has_next>,</#if>
<#elseif row.item.properties["ia:whatEvent"]??>"${row.item.properties["ia:whatEvent"]}", </#list>
<#else>"${row.item.properties.title!""}",</#if> ],
"description": "${row.item.properties.description!""}", </#if>
<#if row.item.properties.modified??>"modified": "${xmldate(row.item.properties.modified)}",</#if> <#if row.item.properties??>
<#if row.item.properties.modifier??>"modifier": "${row.item.properties.modifier}",</#if> "title":<#if row.item.properties["lnk:title"]??>"${row.item.properties["lnk:title"]}",
<#if row.item.siteShortName??>"site": "${row.item.siteShortName}",</#if> <#elseif row.item.properties["ia:whatEvent"]??>"${row.item.properties["ia:whatEvent"]}",
<#if row.item.properties["ia:fromDate"]??>"fromDate": "${xmldate(row.item.properties["ia:fromDate"])}",</#if> <#else>"${row.item.properties.title!""}",</#if>
"displayPath": "${row.item.displayPath!""}", "description": "${row.item.properties.description!""}",
"qnamePath": "${row.item.qnamePath!""}", <#else>
<#if row.item.typeShort != "cm:person" && row.item.typeShort != "cm:authorityContainer"> "title": "${(row.item.name)!row.item?string!""}",
"userAccess": "description": "",
{ </#if>
"create": ${row.item.hasPermission("CreateChildren")?string}, <#if row.item.properties.modified??>"modified": "${xmldate(row.item.properties.modified)}",</#if>
"edit": ${row.item.hasPermission("Write")?string}, <#if row.item.properties.modifier??>"modifier": "${row.item.properties.modifier}",</#if>
"delete": ${row.item.hasPermission("Delete")?string} <#if row.item.siteShortName??>"site": "${row.item.siteShortName}",</#if>
}, <#if row.item.properties["ia:fromDate"]??>"fromDate": "${xmldate(row.item.properties["ia:fromDate"])}",</#if>
</#if> "displayPath": "${row.item.displayPath!""}",
"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>, "qnamePath": "${row.item.qnamePath!""}",
"selectable" : ${row.selectable?string}</#if> <#if row.item.typeShort != "cm:person" && row.item.typeShort != "cm:authorityContainer">
}<#if row_has_next>,</#if> "userAccess":
</#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> </#macro>

View File

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