Merge branch 'master' into feature/ACS-1383_StorageClasses

2025-09-17 14:21:39 +00:00 · 2021-06-28 15:41:39 +03:00
parent 68a0441772 58017396c3
commit d4e76d9f0f
37 changed files with 62 additions and 31 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>11.73-SNAPSHOT</version>
+      <version>11.77-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>11.73-SNAPSHOT</version>
+      <version>11.77-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>11.73-SNAPSHOT</version>
+      <version>11.77-SNAPSHOT</version>
   </parent>


--- 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>11.73-SNAPSHOT</version>
+      <version>11.77-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.5.0
-SOLR6_TAG=2.0.1
+SOLR6_TAG=2.0.2-RC1
 POSTGRES_TAG=13.1
 ACTIVEMQ_TAG=5.16.1
--- 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>11.73-SNAPSHOT</version>
+      <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+      <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <properties>
--- a/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java
+++ b/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java
@@ -60,14 +60,17 @@ public abstract class ConfigScheduler<Data>
        // Synchronized has little effect in normal operation, but on laptops that are suspended, there can be a number
        // of Threads calling execute concurrently without it, resulting in errors in the log. Theoretically possible in
        // production but not very likely.
-        public synchronized void execute(JobExecutionContext context) throws JobExecutionException
+        public void execute(JobExecutionContext context) throws JobExecutionException
        {
            JobDataMap dataMap = context.getJobDetail().getJobDataMap();
            ConfigScheduler configScheduler = (ConfigScheduler)dataMap.get(CONFIG_SCHEDULER);
+            synchronized (configScheduler)
+            {
                boolean successReadingConfig = configScheduler.readConfigAndReplace(true);
                configScheduler.changeScheduleOnStateChange(successReadingConfig);
            }
        }
+    }

    public static final String CONFIG_SCHEDULER = "configScheduler";

--- 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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.5.0
-SOLR6_TAG=2.0.1
+SOLR6_TAG=2.0.2-RC1
 POSTGRES_TAG=13.1
 ACTIVEMQ_TAG=5.16.1
--- 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>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <developers>
--- 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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <developers>
--- 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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+        <version>11.77-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>11.73-SNAPSHOT</version>
+    <version>11.77-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

--- 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>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/api/People.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/People.java
@@ -92,6 +92,8 @@ public interface People
    CollectionWithPagingInfo<Person> getPeople(Parameters parameters);

    /**
+     * @deprecated from 7.1.0
+     * 
     * Request password reset (an email will be sent to the registered email of the given {@code userId}).
     * The API returns a 202 response for a valid, as well as the invalid (does not exist or disabled) userId
     *
@@ -101,6 +103,8 @@ public interface People
    void requestPasswordReset(String userId, String client);

    /**
+     * @deprecated from 7.1.0
+     * 
     * Performs password reset
     *
     * @param passwordReset the password reset details
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
@@ -866,6 +866,7 @@ public class PeopleImpl implements People
        return authorityService.isAdminAuthority(authorityName);
    }

+    @Deprecated
    @Override
    public void requestPasswordReset(String userId, String client)
    {
@@ -895,6 +896,7 @@ public class PeopleImpl implements People
        });
    }

+    @Deprecated
    @Override
    public void resetPassword(String personId, final PasswordReset passwordReset)
    {
--- a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
@@ -163,6 +163,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
        return people.getPeople(params);
    }

+    @Deprecated
    @Operation("request-password-reset")
    @WebApiDescription(title = "Request Password Reset", description = "Request password reset",
                       successStatus = HttpServletResponse.SC_ACCEPTED)
@@ -172,6 +173,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
        people.requestPasswordReset(personId, client.getClient());
    }

+    @Deprecated
    @Operation("reset-password")
    @WebApiDescription(title = "Reset Password", description = "Performs password reset", successStatus = HttpServletResponse.SC_ACCEPTED)
    @WebApiNoAuth
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>11.73-SNAPSHOT</version>
+        <version>11.77-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -805,7 +805,7 @@
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjrt</artifactId>
-            <version>1.9.6</version>
+            <version>1.9.7</version>
        </dependency>
        <dependency>
            <groupId>commons-net</groupId>
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
@@ -32,11 +32,13 @@ import org.alfresco.repo.client.config.ClientAppNotFoundException;
 import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails;

 /**
+ * @deprecated from 7.1.0
 * Reset password service.
 *
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public interface ResetPasswordService
 {
    /**
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
@@ -74,11 +74,14 @@ import java.util.Locale;
 import java.util.Map;

 /**
+ * @deprecated from 7.1.0
+ * *
 * Reset password implementation based on workflow.
 *
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public class ResetPasswordServiceImpl implements ResetPasswordService
 {
    private static final Log LOGGER = LogFactory.getLog(ResetPasswordServiceImpl.class);
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
@@ -30,9 +30,12 @@ import org.alfresco.repo.security.authentication.ResetPasswordService;
 import org.alfresco.repo.workflow.activiti.BaseJavaDelegate;

 /**
+ * @deprecated from 7.1.0
+ *  
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public abstract class AbstractResetPasswordDelegate extends BaseJavaDelegate
 {
    protected ResetPasswordService resetPasswordService;
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;

 /**
+ * @deprecated from 7.1.0
+ * 
 * This {@link JavaDelegate activiti delegate} is executed when a user resets his/her password.
 *
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public class PerformResetPasswordDelegate extends AbstractResetPasswordDelegate
 {
    @Override
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;

 /**
+ * @deprecated from 7.1.0
+ * 
 * This {@link JavaDelegate activiti delegate} is executed when a user is finished resetting his/her password.
 *
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public class SendResetPasswordConfirmationEmailDelegate extends AbstractResetPasswordDelegate
 {
    private static final String EMAIL_SUBJECT_KEY = "reset-password-confirmation.email.subject";
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;

 /** 
+ * @deprecated from 7.1.0
+ * 
 * This {@link JavaDelegate activiti delegate} is executed when a user request password reset.
 *
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public class SendResetPasswordEmailDelegate extends AbstractResetPasswordDelegate
 {
    private static final String EMAIL_SUBJECT_KEY = "reset-password-request.email.subject";
--- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
+++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
@@ -29,9 +29,12 @@ package org.alfresco.repo.workflow;
 import org.alfresco.service.namespace.QName;

 /**
+ * @deprecated from 7.1.0
+ * 
 * @author Jamal Kaabi-Mofrad
 * @since 5.2.1
 */
+@Deprecated
 public interface WorkflowModelResetPassword
 {
    // namespace
--- a/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
+++ b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
@@ -322,7 +322,7 @@ public class CombinedConfig
                {
                    combinedTransformers.remove(indexToRemove);
                    // this may also require the current index i to be changed so we don't skip one.
-                    if (i <= indexToRemove)
+                    if (i >= indexToRemove)
                    {
                        i--;
                    }