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

ACS-5421 Remove RepoUrlConfigSource (#1992 )
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-24 14:32:01 +00:00 · 2023-06-15 09:33:24 +00:00 · 2023-06-15 09:36:44 +01:00 · 2023-06-13 08:40:14 +00:00 · 2023-06-13 08:40:11 +00:00 · 2023-06-13 13:19:47 +05:30
29 changed files with 72 additions and 226 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.116</version>
+      <version>23.1.0.136</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.116</version>
+      <version>23.1.0.136</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.116</version>
+      <version>23.1.0.136</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.116</version>
+      <version>23.1.0.136</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.116</version>
+      <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <properties>
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
@@ -23,6 +23,10 @@ function runAction(p_params)
      if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
      {
         p_params.destNode.unlock();
+         if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
+         {
+             p_params.destNode.removeAspect("gd2:editingInGoogle");
+         }
      }

      var resultId = originalDoc.name,
--- 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.116</version>
+      <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <properties>
@@ -119,7 +119,7 @@
        <dependency>
            <groupId>org.jibx</groupId>
            <artifactId>jibx-run</artifactId>
-            <version>1.3.3</version>
+            <version>1.4.2</version>
        </dependency>
        <dependency> 
            <groupId>com.fasterxml.jackson.core</groupId> 
--- 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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <properties>
@@ -16,7 +16,7 @@
        <maven.build.sourceVersion>17</maven.build.sourceVersion>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <rest.api.explorer.branch>master</rest.api.explorer.branch>
-        <httpclient-osgi-version>4.5.14</httpclient-osgi-version>
+        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
        <org.glassfish.version>1.1.4</org.glassfish.version>
        <commons-lang3.version>3.12.0</commons-lang3.version>
        <scribejava-apis.version>8.3.3</scribejava-apis.version>
--- 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.116</version>
+        <version>23.1.0.136</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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <properties>
@@ -30,10 +30,6 @@
            <groupId>org.alfresco</groupId>
            <artifactId>alfresco-trashcan-cleaner</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.alfresco.services</groupId>
-            <artifactId>alfresco-messaging-repo</artifactId>
-        </dependency>
        <dependency>
            <groupId>xalan</groupId>
            <artifactId>xalan</artifactId>
--- 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.116</version>
+    <version>23.1.0.136</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -45,24 +45,23 @@

        <dir.root>${project.build.directory}/alf_data</dir.root>

-        <dependency.alfresco-hb-data-sender.version>1.1.0</dependency.alfresco-hb-data-sender.version>
-        <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
-        <dependency.alfresco-jlan.version>7.4</dependency.alfresco-jlan.version>
+        <dependency.alfresco-hb-data-sender.version>1.1.1</dependency.alfresco-hb-data-sender.version>
+        <dependency.alfresco-trashcan-cleaner.version>2.4.2</dependency.alfresco-trashcan-cleaner.version>
+        <dependency.alfresco-jlan.version>7.5</dependency.alfresco-jlan.version>
        <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.21</dependency.alfresco-messaging-repo.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
        <dependency.alfresco-transform-service.version>2.2.0-A1</dependency.alfresco-transform-service.version>
        <dependency.alfresco-transform-core.version>3.2.0-A1</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-greenmail.version>6.8</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.21</dependency.acs-event-model.version>
+        <dependency.alfresco-greenmail.version>6.9</dependency.alfresco-greenmail.version>
+        <dependency.acs-event-model.version>0.0.22</dependency.acs-event-model.version>

        <dependency.spring.version>5.3.27</dependency.spring.version>
        <dependency.antlr.version>3.5.3</dependency.antlr.version>
        <dependency.jackson.version>2.15.1</dependency.jackson.version>
        <dependency.cxf.version>3.5.5</dependency.cxf.version>
        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.40</dependency.webscripts.version>
+        <dependency.webscripts.version>8.43</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
        <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
        <dependency.assertj.version>3.24.2</dependency.assertj.version>
@@ -76,7 +75,7 @@
        <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
        <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
        <dependency.log4j.version>2.20.0</dependency.log4j.version>
-        <dependency.gytheio.version>0.18</dependency.gytheio.version>
+        <dependency.gytheio.version>0.20.0-A1</dependency.gytheio.version>
        <dependency.groovy.version>3.0.17</dependency.groovy.version>
        <dependency.tika.version>2.4.1</dependency.tika.version>
        <dependency.spring-security.version>5.8.3</dependency.spring-security.version>
@@ -111,9 +110,9 @@
        <dependency.json-smart.version>2.4.11</dependency.json-smart.version>
        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>

-        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.4.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.googledrive.version>3.5.0-A2</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.6.1-A1</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
        <license-maven-plugin.version>2.0.1</license-maven-plugin.version>
@@ -150,7 +149,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.116</tag>
+        <tag>23.1.0.136</tag>
    </scm>

    <distributionManagement>
@@ -297,17 +296,6 @@
                    </exclusion>
                </exclusions>
            </dependency>
-            <dependency>
-                <groupId>org.alfresco.services</groupId>
-                <artifactId>alfresco-messaging-repo</artifactId>
-                <version>${dependency.alfresco-messaging-repo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-broker</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
            <dependency>
                <groupId>org.alfresco</groupId>
                <artifactId>alfresco-server-root</artifactId>
@@ -936,7 +924,7 @@
                <plugin>
                    <groupId>io.fabric8</groupId>
                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.42.1</version>
+                    <version>0.43.0</version>
                </plugin>
                <plugin>
                    <artifactId>maven-surefire-plugin</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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <dependencies>
@@ -154,7 +154,7 @@
        <dependency>
            <groupId>org.alfresco.cmis.client</groupId>
            <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
            <scope>test</scope>
            <exclusions>
              <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
--- 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.116</version>
+        <version>23.1.0.136</version>
    </parent>

    <dependencies>
@@ -378,17 +378,6 @@
            <version>6.5.1</version>
        </dependency>

-        <!-- GData -->
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-core-1.0</artifactId>
-            <version>1.47.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>gdata-media-1.0</artifactId>
-            <version>1.47.1</version>
-        </dependency>
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-crypto</artifactId>
--- a/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java
+++ b/repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java
@@ -1,158 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * 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 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.config.source;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.springframework.extensions.config.ConfigException;
-import org.springframework.extensions.config.source.UrlConfigSource;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.tenant.TenantService;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentService;
-import org.alfresco.service.cmr.repository.InvalidStoreRefException;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.SearchService;
-import org.alfresco.service.namespace.NamespaceService;
-
-/**
- * ConfigSource that looks for a prefix to determine where to look for the config.</br>
- * Valid prefixes are:
- * <ul>
- *   <li><b><storeProtocol>://<storeIdentifier></b> the location provided is a path to a repository file</li>
- * </ul>
- * as well as those defined in the core (UrlConfigSource)
- *
- * Example store URLs
- *   <code>workspace://SpacesStore/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webclient_extension.childname}/cm:web-client-config-custom.xml</code>
- *   <code>workspace://SpacesStore/app:company_home/app:dictionary/app:webclient_extension/cm:web-client-config-custom.xml</code> 
- */
-public class RepoUrlConfigSource extends UrlConfigSource
-{   
-    private TenantService tenantService;
-    private SearchService searchService;
-    private ContentService contentService;
-    private NamespaceService namespaceService;
-    private NodeService nodeService;
-    
-
-    public void setTenantService(TenantService tenantService) 
-    {
-        this.tenantService = tenantService;
-    }
-    
-    public void setSearchService(SearchService searchService) 
-    {
-        this.searchService = searchService;
-    }
-    
-    public void setContentService(ContentService contentService) 
-    {
-        this.contentService = contentService;
-    }
-    
-    public void setNamespaceService(NamespaceService namespaceService)
-    {
-        this.namespaceService = namespaceService;
-    }
-    
-    public void setNodeService(NodeService nodeService) 
-    {
-        this.nodeService = nodeService;
-    }
-    
-    
-    public RepoUrlConfigSource(String sourceLocation)
-    {
-        super(sourceLocation);
-    }
-
-    public RepoUrlConfigSource(List<String> sourceLocations)
-    {
-        super(sourceLocations);
-    }
-    
-
-    public InputStream getInputStream(String sourceUrl)
-    {
-        // determine the config source       
-        try
-        {
-            return super.getInputStream(sourceUrl);
-        } 
-        catch (ConfigException ce)
-        {     
-            int idx = sourceUrl.indexOf(StoreRef.URI_FILLER); 
-            if (idx != -1)
-            {
-                // assume this is a repository location
-                int idx2 = sourceUrl.indexOf("/", idx+3);
-                                
-                String store = sourceUrl.substring(0, idx2);
-                String path = sourceUrl.substring(idx2);
-                
-                StoreRef storeRef = tenantService.getName(new StoreRef(store));    
-                NodeRef rootNode = null;
-                
-                try 
-                {
-                    rootNode = nodeService.getRootNode(storeRef);
-                } 
-                catch (InvalidStoreRefException e)
-                {
-                    throw ce;
-                }
-                
-                List<NodeRef> nodeRefs = searchService.selectNodes(rootNode, path, null, namespaceService, false);
-                
-                if (nodeRefs.size() == 0)
-                {
-                    // if none found, then simply skip
-                    return null;
-                }
-                else if (nodeRefs.size() > 1)
-                {
-                    // unexpected
-                    throw new ConfigException("Found duplicate config sources in the repository " + sourceUrl);
-                }
-
-                NodeRef nodeRef = nodeRefs.get(0);
-                
-                ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
-                                   
-                return cr.getContentInputStream();                                                  
-            } 
-            else
-            {
-                // not a repository url
-                throw ce;
-            }
-        }
-    }
-}
--- a/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
+++ b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
@@ -1605,8 +1605,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                    this.userSearchCtls = new SearchControls();
                    this.userSearchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
                    this.userSearchCtls.setReturningAttributes(LDAPUserRegistry.this.userKeys.getFirst());
-                    // MNT-14001 fix, set search limit to ensure that server will not return more search results then provided by paged result control
-                    this.userSearchCtls.setCountLimit(LDAPUserRegistry.this.queryBatchSize > 0 ? LDAPUserRegistry.this.queryBatchSize : 0);

                    this.next = fetchNext();
                }
--- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
@@ -997,6 +997,20 @@ public class WorkflowServiceImpl implements WorkflowService
    public WorkflowTask updateTask(String taskId, Map<QName, Serializable> properties, Map<QName, List<NodeRef>> add,
                Map<QName, List<NodeRef>> remove)
    {
+    	if(properties.containsKey(WorkflowModel.PROP_STATUS)) {
+
+            LinkedList<String> validTaskStatus = new LinkedList<>();
+            validTaskStatus.add("Not Yet Started");
+            validTaskStatus.add("In Progress");
+            validTaskStatus.add("On Hold");
+            validTaskStatus.add("Cancelled");
+            validTaskStatus.add("Completed");
+
+            if (!validTaskStatus.contains(properties.get(WorkflowModel.PROP_STATUS))) {
+                throw new WorkflowException("Invalid Value is Passed for Task Status.");
+            }
+        }
+	
        String engineId = BPMEngineRegistry.getEngineId(taskId);
        TaskComponent component = getTaskComponent(engineId);
        // get the current assignee before updating the task
--- a/repository/src/main/resources/alfresco/core-services-context.xml
+++ b/repository/src/main/resources/alfresco/core-services-context.xml
@@ -75,6 +75,9 @@
        <property name="propertiesPersister">
        	<bean class="org.alfresco.config.AlfrescoPropertiesPersister"/>
        </property>
+        <property name="order">
+            <value>9999999</value>
+        </property>
    </bean>

    <!-- Expand global properties and version information in bean definitions -->
@@ -101,6 +104,18 @@
        </property>
    </bean>

+    <bean id="default-properties-resolver" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="ignoreUnresolvablePlaceholders">
+            <value>true</value>
+        </property>
+        <property name="searchSystemEnvironment">
+            <value>false</value>
+        </property>
+        <property name="order">
+            <value>2147483647</value>
+        </property>
+    </bean>
+

    <!-- Load properties that must be shared between the        -->
    <!-- Alfresco server and its remote clients.                -->
Author	SHA1	Message	Date
alfresco-build	8ebaf16a45	[maven-release-plugin][skip ci] prepare release 23.1.0.136	2023-06-15 09:33:24 +00:00
Sara	c3dcf8891e	ACS-5421 Remove RepoUrlConfigSource (#1992 )	2023-06-15 09:36:44 +01:00
alfresco-build	2bac9bd9d1	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-13 08:40:14 +00:00
alfresco-build	fffef168d9	[maven-release-plugin][skip ci] prepare release 23.1.0.135	2023-06-13 08:40:11 +00:00
rrajoria	0f89c3ce8a	Update surf-webscript version	2023-06-13 13:19:47 +05:30
alfresco-build	497b197c12	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-11 00:07:14 +00:00
alfresco-build	2b8ea3bb50	[maven-release-plugin][skip ci] prepare release 23.1.0.134	2023-06-11 00:07:11 +00:00
Alfresco CI User	5e7394a37d	[force] Force release for 2023-06-11.	2023-06-11 00:03:26 +00:00
alfresco-build	89329d7984	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-09 07:30:59 +00:00
alfresco-build	3f94b1632b	[maven-release-plugin][skip ci] prepare release 23.1.0.133	2023-06-09 07:30:55 +00:00
dependabot[bot]	d0f6867887	Bump docker-maven-plugin from 0.42.1 to 0.43.0 (#1944 ) Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.42.1 to 0.43.0. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.42.1...v0.43.0) --- updated-dependencies: - dependency-name: io.fabric8:docker-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-06-08 17:06:42 +02:00
dependabot[bot]	49c56e9a9d	Bump docker-maven-plugin from 0.42.1 to 0.43.0 (#1944 ) Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.42.1 to 0.43.0. - [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases) - [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md) - [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.42.1...v0.43.0) --- updated-dependencies: - dependency-name: io.fabric8:docker-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-06-08 17:05:57 +02:00
alfresco-build	78b54e65c4	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-07 07:25:49 +00:00
alfresco-build	b93212f3bf	[maven-release-plugin][skip ci] prepare release 23.1.0.132	2023-06-07 07:25:46 +00:00
Kacper Magdziarz	636d63e34f	[ACS-5369] Remove Gdata (#1984 )	2023-06-07 08:02:48 +02:00
alfresco-build	ad934e511d	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-06 08:04:56 +00:00
alfresco-build	16db159092	[maven-release-plugin][skip ci] prepare release 23.1.0.131	2023-06-06 08:04:52 +00:00
MohinishSah	fd8e44e365	Merge pull request #1978 from Alfresco/fix/AFI-203 AFI-203 : Option to edit the file in Google Docs should be visible af…	2023-06-06 12:46:35 +05:30
alfresco-build	ed924094ff	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-04 00:06:35 +00:00
alfresco-build	3181d2b8bf	[maven-release-plugin][skip ci] prepare release 23.1.0.130	2023-06-04 00:06:32 +00:00
Alfresco CI User	2891a3ba61	[force] Force release for 2023-06-04.	2023-06-04 00:03:16 +00:00
rrajoria	92f27bbcd7	AFI-203 : Option to edit the file in Google Docs should be visible after admin unlocks the file.	2023-06-02 16:06:48 +05:30
Kacper Magdziarz	80d4db2e81	[ACS-5307] Bump aos-module to 1.6.1-A1 (#1975 )	2023-06-01 11:31:58 +02:00
dependabot[bot]	6bd598fadf	Bump alfresco-jlan-embed from 7.4 to 7.5 (#1971 )	2023-05-31 06:21:05 +00:00
alfresco-build	c1b4b30262	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-30 13:36:52 +00:00
alfresco-build	f0e5dcaa67	[maven-release-plugin][skip ci] prepare release 23.1.0.129	2023-05-30 13:36:49 +00:00
tiagosalvado10	07c7342032	[MNT-23665] Removed search controls count limit (#1936 )	2023-05-30 13:42:32 +01:00
alfresco-build	b0af817377	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-28 00:07:07 +00:00
alfresco-build	e8cf0f7d12	[maven-release-plugin][skip ci] prepare release 23.1.0.128	2023-05-28 00:07:04 +00:00
Alfresco CI User	b8e621d3d9	[force] Force release for 2023-05-28.	2023-05-28 00:03:07 +00:00
Marcin Strankowski	a62db22ecb	ACS-5251 Update heartbeat to 1.1.1 (java 17) (#1962 )	2023-05-27 07:53:18 +02:00
alfresco-build	5fcee3ec55	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-26 21:12:21 +00:00
alfresco-build	8a6274b37e	[maven-release-plugin][skip ci] prepare release 23.1.0.127	2023-05-26 21:12:18 +00:00
Marcin Strankowski	d279b3e3c3	ACS-5259: Update trashcan dependency to java17 version (#1961 )	2023-05-26 16:53:24 +02:00
alfresco-build	da5505a21f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-26 07:20:03 +00:00
alfresco-build	e476334998	[maven-release-plugin][skip ci] prepare release 23.1.0.126	2023-05-26 07:19:59 +00:00
Piotr Żurek	7990991453	ACS-5298 Remove alfresco-messaging-repo dependency (#1956 ) * ACS-5298 Remove alfresco-messaging-repo dependency	2023-05-26 08:35:10 +02:00
alfresco-build	9289fc7f89	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-24 16:35:26 +00:00
alfresco-build	20af2a5dd9	[maven-release-plugin][skip ci] prepare release 23.1.0.125	2023-05-24 16:35:23 +00:00
Marcin Strankowski	59069ae38f	Update opencmis-extension to version compiled with java 17 - 2.3 (#1958 )	2023-05-24 17:48:58 +02:00
Sara	ea4eac5a77	ACS-5204 Bump gytheio to 0.20.0-A1 and googledrive to 3.5.0-A2 (#1957 )	2023-05-24 16:11:33 +01:00
alfresco-build	83bc0dcee1	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-24 12:48:23 +00:00
alfresco-build	5af7a1e284	[maven-release-plugin][skip ci] prepare release 23.1.0.124	2023-05-24 12:48:19 +00:00
kcichonczyk	11333eb1e5	bump api explorer to version 23.1.0-A1 (upgraded to java 17) (#1953 )	2023-05-24 14:00:47 +02:00
alfresco-build	e901ffb751	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-24 09:43:45 +00:00
alfresco-build	7dbe25d754	[maven-release-plugin][skip ci] prepare release 23.1.0.123	2023-05-24 09:43:42 +00:00
Kacper Magdziarz	1f764b446e	[ACS-5250] Bump alfresco-greenmail to 6.9 (#1955 )	2023-05-24 10:58:03 +02:00
rrajoria	4c256ab546	Fix/MNT-23612 Fix to allow only valid task status. (#1954 ) * Update WorkflowServiceImpl.java * Update WorkflowServiceImpl.java	2023-05-24 14:16:04 +05:30
Marcin Strankowski	8fe2f5b251	ACS-5209: Propagate alfresco-messaging-repo update to 1.2.22 (java17 compilation) (#1948 )	2023-05-24 10:32:39 +02:00
alfresco-build	841826fcdd	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-23 19:58:33 +00:00
alfresco-build	1a98715d35	[maven-release-plugin][skip ci] prepare release 23.1.0.122	2023-05-23 19:58:30 +00:00
Kacper Magdziarz	334126ec72	[ACS-5240] Bump surf-webscripts to 8.42 (#1947 )	2023-05-23 21:10:24 +02:00
MohinishSah	e02c334362	Update Webscript version	2023-05-23 17:49:18 +05:30
alfresco-build	269cc165e0	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-23 11:38:01 +00:00
alfresco-build	b724203f5b	[maven-release-plugin][skip ci] prepare release 23.1.0.121	2023-05-23 11:37:58 +00:00
Domenico Sibilio	5912726372	Revert "Bump dependency.camel.version from 3.20.2 to 3.20.4 (#1905 )" (#1946 ) This reverts commit `e00959a089`.	2023-05-23 12:20:04 +02:00
alfresco-build	eb85205df1	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-23 10:03:09 +00:00
alfresco-build	88616a2c48	[maven-release-plugin][skip ci] prepare release 23.1.0.120	2023-05-23 10:03:06 +00:00
Domenico Sibilio	90e9764d63	ACS-4955 Restore httpclient-osgi 4.5.6 (#1942 )	2023-05-22 15:34:04 +02:00
alfresco-build	50e91a40bc	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-22 11:18:57 +00:00
alfresco-build	391ba106c4	[maven-release-plugin][skip ci] prepare release 23.1.0.119	2023-05-22 11:18:55 +00:00
Kacper Magdziarz	46942b9e77	ACS-5242 Bump acs-event-model to 0.0.22 (#1941 )	2023-05-22 12:36:54 +02:00
dependabot[bot]	4ff76617a9	Bump jibx-run from 1.3.3 to 1.4.2 (#1367 ) Bumps jibx-run from 1.3.3 to 1.4.2. --- updated-dependencies: - dependency-name: org.jibx:jibx-run dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-05-22 12:32:03 +02:00
alfresco-build	82c671c07a	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-21 00:06:10 +00:00
alfresco-build	06ce348cdd	[maven-release-plugin][skip ci] prepare release 23.1.0.118	2023-05-21 00:06:08 +00:00
Alfresco CI User	099cbb614c	[force] Force release for 2023-05-21.	2023-05-21 00:03:04 +00:00
alfresco-build	0acc6d31ef	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-19 15:58:03 +00:00
alfresco-build	a218cfa0ed	[maven-release-plugin][skip ci] prepare release 23.1.0.117	2023-05-19 15:57:59 +00:00
dependabot[bot]	e00959a089	Bump dependency.camel.version from 3.20.2 to 3.20.4 (#1905 ) * Bump dependency.camel.version from 3.20.2 to 3.20.4 Bumps `dependency.camel.version` from 3.20.2 to 3.20.4. Updates `camel-core` from 3.20.2 to 3.20.4 Updates `camel-spring-xml` from 3.20.2 to 3.20.4 Updates `camel-activemq` from 3.20.2 to 3.20.4 Updates `camel-amqp` from 3.20.2 to 3.20.4 Updates `camel-jackson` from 3.20.2 to 3.20.4 Updates `camel-directvm` from 3.20.2 to 3.20.4 Updates `camel-direct` from 3.20.2 to 3.20.4 Updates `camel-management` from 3.20.2 to 3.20.4 Updates `camel-mock` from 3.20.2 to 3.20.4 --- updated-dependencies: - dependency-name: org.apache.camel:camel-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-spring-xml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-activemq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-amqp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-jackson dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-directvm dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-direct dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-management dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.camel:camel-mock dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * bump netty and gytheio --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mikolajbrzezinski <mikolaj.brzezinski@hyland.com> Co-authored-by: mikolajbrzezinski <86791239+mikolajbrzezinski@users.noreply.github.com>	2023-05-19 17:09:34 +02:00
alfresco-build	a9ac83704b	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-19 15:01:47 +00:00