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

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>

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

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)
     {

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