Merge branch 'master' into APPS-2000_Data_dictionary_Issue

Fixing failure issues
2025-11-05 15:32:21 +00:00 · 2023-07-24 19:21:26 +05:30 · 2023-07-24 17:53:19 +05:30 · 2023-07-19 21:55:11 +05:30 · 2023-07-19 16:56:59 +05:30 · 2023-07-19 14:25:45 +05:30
25 changed files with 61 additions and 43 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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+      <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</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.1.0.169</version>
+    <version>23.1.0.168-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -84,8 +84,10 @@
        <dependency.poi.version>5.2.2</dependency.poi.version>
        <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
        <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.21.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
-        <dependency.netty.version>4.1.95.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
+        <dependency.camel.version>3.20.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
+        <dependency.netty.version>4.1.87.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
+        <dependency.netty.qpid.version>4.1.82.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
+        <dependency.netty-tcnative.version>2.0.56.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
        <dependency.activemq.version>5.17.4</dependency.activemq.version>
        <dependency.apache-compress.version>1.23.0</dependency.apache-compress.version>
        <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -148,7 +150,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.1.0.169</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -849,6 +851,17 @@
                <artifactId>camel-mock</artifactId>
                <version>${dependency.camel.version}</version>
            </dependency>
+            <!-- Netty non-transitive dependencies declared for depending projects usage in conjunction with Camel's other transitive netty dependencies -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler-proxy</artifactId>
+                <version>${dependency.netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-tcnative-classes</artifactId>
+                <version>${dependency.netty-tcnative.version}</version>
+            </dependency>

            <dependency>
                <groupId>org.apache.taglibs</groupId>
@@ -893,15 +906,6 @@
                    </exclusion>
                </exclusions>
            </dependency>
-
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-bom</artifactId>
-                <version>${dependency.netty.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
            <dependency>
                <groupId>org.springframework.security</groupId>
                <artifactId>spring-security-bom</artifactId>
--- 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.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.169</version>
+        <version>23.1.0.168-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -101,7 +101,9 @@ import org.alfresco.util.PropertyMap;
 import org.alfresco.util.transaction.TransactionListenerAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * Node service using database persistence layer to fulfill functionality
@@ -1068,11 +1070,13 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
     * @param allowArchival     <tt>true</tt> if normal archival may occur or
     *                          <tt>false</tt> if the node must be forcibly deleted
     */
+    @Transactional
    private void deleteNode(NodeRef nodeRef, boolean allowArchival)
    {
+
        // The node(s) involved may not be pending deletion
        checkPendingDelete(nodeRef);
-        
+
        // Pair contains NodeId, NodeRef
        Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
        Long nodeId = nodePair.getFirst();
@@ -1100,7 +1104,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
        // Gather information about the hierarchy
        NodeHierarchyWalker walker = new NodeHierarchyWalker(nodeDAO);
        walker.walkHierarchy(nodePair, childAssocPair);
-        
+
        // Protect the nodes from being link/unlinked for the remainder of the process
        Set<NodeRef> nodesPendingDelete = new HashSet<NodeRef>(walker.getNodes(false).size());
        for (VisitedNode visitedNode : walker.getNodes(true))
@@ -1109,7 +1113,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
        }
        Set<NodeRef> nodesPendingDeleteTxn = TransactionalResourceHelper.getSet(KEY_PENDING_DELETE_NODES);
        nodesPendingDeleteTxn.addAll(nodesPendingDelete);           // We need to remove these later, again
-        
+
        // Work out whether we need to archive or delete the node.
        if (!allowArchival)
        {
@@ -1150,7 +1154,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                }
            }
        }
-        
+
        // Propagate timestamps
        propagateTimeStamps(childAssocRef);

@@ -1199,7 +1203,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                }
                invokeBeforeDeleteChildAssociation(secondaryParentAssocPair.getSecond());
            }
-            
+
            // Primary child associations
            if (archive)
            {
@@ -1207,7 +1211,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
            }
            invokeBeforeDeleteNode(nodeToDelete.nodeRef);
        }
-        
+
        // Archive, if necessary
        if (archive)
        {
@@ -1263,8 +1267,18 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
            QName childNodeTypeQName = nodeDAO.getNodeType(nodeToDelete.id);
            Set<QName> childAspectQnames = nodeDAO.getNodeAspects(nodeToDelete.id);
            // Delete the node
+
            nodeDAO.deleteChildAssoc(nodeToDelete.primaryParentAssocPair.getFirst());
-            nodeDAO.deleteNode(nodeToDelete.id);
+            for (VisitedNode assocRefRemoved : nodesToDelete)
+            {
+                if (!nodeDAO.exists(assocRefRemoved.id))
+                {
+                    throw new ConcurrencyFailureException("Child association not found : " + assocRefRemoved.id);
+                }
+                nodeDAO.deleteChildAssoc(assocRefRemoved.id);
+                invokeOnDeleteNode(assocRefRemoved.primaryParentAssocPair.getSecond(),
+                        childNodeTypeQName, childAspectQnames, archive);
+            }
            invokeOnDeleteNode(
                    nodeToDelete.primaryParentAssocPair.getSecond(),
                    childNodeTypeQName, childAspectQnames, archive);
Author	SHA1	Message	Date
kshah	4c406c1301	Merge branch 'master' into APPS-2000_Data_dictionary_Issue	2023-07-24 19:21:26 +05:30
pksingh	32bdf67969	Fixing failure issues	2023-07-24 17:53:19 +05:30
pksingh	b5076c6fdd	Fixing failure issues	2023-07-19 21:55:11 +05:30
pksingh	78359d396f	Fixing failure issue	2023-07-19 16:56:59 +05:30
pksingh	bcba412d73	[APPS-2000] Data Dictionary folder deletion behaviour should be consistent	2023-07-19 14:25:45 +05:30