[maven-release-plugin][skip ci] prepare release 23.6.0.29

[ACS-10454] Bump AOS to fix "Edit in Microsoft Office" error (#3602 )
[maven-release-plugin][skip ci] prepare for next development iteration
2025-10-08 14:51:49 +00:00 · 2025-10-06 13:25:16 +00:00 · 2025-10-06 14:16:10 +02:00 · 2025-10-03 11:40:58 +00:00 · 2025-10-03 11:40:56 +00:00 · 2025-10-03 12:54:03 +02:00
26 changed files with 56 additions and 48 deletions
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/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.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/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.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <properties>
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/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.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.6.0.23</version>
+      <version>23.6.0.29</version>
   </parent>
   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <properties>
--- a/pom.xml
+++ b/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.6.0.23</version>
+    <version>23.6.0.29</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>
@@ -51,14 +51,14 @@
        <dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-core.version>5.2.2-A.4</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-core.version>5.2.2</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.2.2-A.2</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-service.version>4.2.2</dependency.alfresco-transform-service.version>
        <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.33</dependency.acs-event-model.version>
        <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
-        <dependency.spring.version>6.2.8</dependency.spring.version>
+        <dependency.spring.version>6.2.11</dependency.spring.version>
-        <dependency.spring-security.version>6.3.9</dependency.spring-security.version>
+        <dependency.spring-security.version>6.4.11</dependency.spring-security.version>
        <dependency.antlr.version>3.5.3</dependency.antlr.version>
        <dependency.jackson.version>2.17.2</dependency.jackson.version>
        <dependency.cxf.version>4.1.2</dependency.cxf.version>
@@ -113,7 +113,7 @@
        <dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
        <dependency.json-smart.version>2.5.2</dependency.json-smart.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>23.4.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
        <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>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.6.0.23</tag>
+        <tag>23.6.0.29</tag>
    </scm>
    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <dependencies>
--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
@@ -40,7 +40,6 @@
 		"items":
 		[
 		<#list results as row>
 			<#if row.item.hasPermission("Read")>
 			{
 				"type": "${row.item.typeShort}",
 				"parentType": "${row.item.parentTypeShort!""}",
@@ -76,7 +75,6 @@
 				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
 				"selectable" : ${row.selectable?string}</#if>
 			}<#if row_has_next>,</#if>
 			</#if>
 		</#list>
 		]
 	}
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.6.0.23</version>
+        <version>23.6.0.29</version>
    </parent>
    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2023 Alfresco Software Limited
+ * Copyright (C) 2005 - 2025 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * If the software was purchased under a paid Alfresco license, the terms of
@@ -39,8 +39,10 @@ import org.alfresco.service.namespace.QName;
 /**
 * Encapsulates events occurred in a single transaction.
 *
- * @param <REF> entity (e.g. node, child association, peer association) reference type
+ * @param <REF>
- * @param <RES> entity resource type
+ *            entity (e.g. node, child association, peer association) reference type
 * @param <RES>
 *            entity resource type
 */
 public abstract class EventConsolidator<REF extends EntityRef, RES extends Resource>
 {
@@ -90,23 +92,31 @@ public abstract class EventConsolidator<REF extends EntityRef, RES extends Resou
    /**
     * Builds and returns the {@link RepoEvent} instance.
     *
-     * @param eventInfo the object holding the event information
+     * @param eventInfo
     *            the object holding the event information
     * @return the {@link RepoEvent} instance
     */
    public RepoEvent<DataAttributes<RES>> getRepoEvent(EventInfo eventInfo)
    {
        final RepoEvent.Builder<DataAttributes<RES>> builder = RepoEvent.builder();
        configureRepoEventBuilder(builder, eventInfo);
        return builder.build();
    }
    protected void configureRepoEventBuilder(RepoEvent.Builder<DataAttributes<RES>> builder, EventInfo eventInfo)
    {
        EventType eventType = getDerivedEvent();
        DataAttributes<RES> eventData = buildEventData(eventInfo, resource, eventType);
-        return RepoEvent.<DataAttributes<RES>>builder()
+        builder.setId(eventInfo.getId())
-            .setId(eventInfo.getId())
+                .setSource(eventInfo.getSource())
-            .setSource(eventInfo.getSource())
+                .setTime(eventInfo.getTimestamp())
-            .setTime(eventInfo.getTimestamp())
+                .setType(eventType.getType())
-            .setType(eventType.getType())
+                .setData(eventData)
-            .setData(eventData)
+                .setDataschema(EventJSONSchema.getSchemaV1(eventType));
            .setDataschema(EventJSONSchema.getSchemaV1(eventType))
            .build();
    }
    /**
@@ -114,9 +124,9 @@ public abstract class EventConsolidator<REF extends EntityRef, RES extends Resou
     */
    protected DataAttributes<RES> buildEventData(EventInfo eventInfo, RES resource, EventType eventType)
    {
-        return EventData.<RES>builder()
+        return EventData.<RES> builder()
-            .setEventGroupId(eventInfo.getTxnId())
+                .setEventGroupId(eventInfo.getTxnId())
-            .setResource(resource)
+                .setResource(resource)
-            .build();
+                .build();
    }
 }
Author	SHA1	Message	Date
alfresco-build	8d790ed1cb	[maven-release-plugin][skip ci] prepare release 23.6.0.29	2025-10-06 13:25:16 +00:00
cezary-witkowski	87c7bd2877	[ACS-10454] Bump AOS to fix "Edit in Microsoft Office" error (#3602 )	2025-10-06 14:16:10 +02:00
alfresco-build	9125f889b0	[maven-release-plugin][skip ci] prepare for next development iteration	2025-10-03 11:40:58 +00:00
alfresco-build	2fb74d2691	[maven-release-plugin][skip ci] prepare release 23.6.0.28	2025-10-03 11:40:56 +00:00
Gerard Olenski	d671162dae	ACS-10427 Bump ATS 4.2.2 (#3601 )	2025-10-03 12:54:03 +02:00
alfresco-build	bfaa629da7	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-26 17:19:48 +00:00
alfresco-build	719d73a558	[maven-release-plugin][skip ci] prepare release 23.6.0.27	2025-09-26 17:19:46 +00:00
Piotr Żurek	a2aa867f3f	ACS-9665 Fix formatting	2025-09-26 18:34:04 +02:00
Piotr Żurek	8d745c536a	Cherry pick ACS-9665 add event generation extensions (#3593 ) `280a873cb6` Piotr Żurek <Piotr.Zurek@hyland.com> 26 Sep 2025 at 10:25	2025-09-26 18:25:10 +02:00
alfresco-build	b0f4c21ae3	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-26 12:31:24 +00:00
alfresco-build	72494e34fa	[maven-release-plugin][skip ci] prepare release 23.6.0.26	2025-09-26 12:31:22 +00:00
Tiago Salvado	792b7024ea	[ACS-9940] Bump spring security version to 6.4.11 (#3592 ) (#3594 )	2025-09-26 12:44:25 +01:00
alfresco-build	40a1371f0d	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-25 20:52:06 +00:00
alfresco-build	c22c47e63f	[maven-release-plugin][skip ci] prepare release 23.6.0.25	2025-09-25 20:52:03 +00:00
Tiago Salvado	232299d42d	[ACS-10155] Bump spring version to 6.2.11 (#3589 ) (#3591 )	2025-09-25 21:04:30 +01:00
alfresco-build	aca7969849	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-25 10:22:26 +00:00
alfresco-build	4ab2bbd3d6	[maven-release-plugin][skip ci] prepare release 23.6.0.24	2025-09-25 10:22:24 +00:00
Debjit Chattopadhyay	f68f02372d	Merge pull request #3590 from Alfresco/fix/MNT-24776_revert Revert MNT-24776 as this fix is affecting other scenarios.	2025-09-25 15:05:51 +05:30
Debjit Chattopadhyay	9b0eedc8c1	Revert MNT-24776 as this fix is affecting other scenarios.	2025-09-25 13:19:23 +05:30
alfresco-build	f164dedcee	[maven-release-plugin][skip ci] prepare for next development iteration	2025-09-23 12:55:06 +00:00