Merge branch 'refs/heads/master' into feature/ACS-9045

Alfresco · Dec 17, 2024 · e3fd7a4 · e3fd7a4
2 parents 985c695 + f731c97
commit e3fd7a4
Show file tree

Hide file tree

Showing 37 changed files with 4,102 additions and 3,990 deletions.
diff --git 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>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <build>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <modules>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <properties>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/amps/pom.xml b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>25.1.0.12-SNAPSHOT</version>
+      <version>25.1.0.17-SNAPSHOT</version>
    </parent>
 
    <dependencies>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/mmt/pom.xml b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 </project>
diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git a/packaging/tests/scripts/wait-for-alfresco-start.sh b/packaging/tests/scripts/wait-for-alfresco-start.sh
@@ -55,4 +55,4 @@ else
    echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
    docker logs --tail=200 $ALFCONTAINER
    exit 1
-fi
+fi
diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <organization>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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>25.1.0.12-SNAPSHOT</version>
+        <version>25.1.0.17-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/People.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/People.java
@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -29,6 +29,12 @@
 
 import java.io.File;
 
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.ValidatableResponse;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+
 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
 import org.alfresco.rest.core.RestResponse;
@@ -56,12 +62,6 @@
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.response.ValidatableResponse;
 
 /**
  * Declares all Rest API under the /people path
@@ -97,9 +97,7 @@ public RestPersonModel updatePerson(String putBody)
     }
 
     /**
-     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities"
-     * Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as
-     * they are created.
+     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities" Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as they are created.
      */
     public RestActivityModelsCollection getPersonActivitiesUntilEntriesCountIs(int expectedNoOfEntries)
     {
@@ -173,6 +171,15 @@ public RestPreferenceModel getPersonPreferenceInformation(String preferenceName)
         return restWrapper.processModel(RestPreferenceModel.class, request);
     }
 
+    /**
+     * Updates a specific preference of a specific person using PUT call on "people/{personId}/preferences/{preferenceName}"
+     */
+    public RestPreferenceModel updatePersonPreferenceInformation(String preferenceName, RestPreferenceModel preferenceModel)
+    {
+        RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, preferenceModel.toJson(), "people/{personId}/preferences/{preferenceName}", this.person.getUsername(), preferenceName);
+        return restWrapper.processModel(RestPreferenceModel.class, request);
+    }
+
     /**
      * Remove a specific site from favorite sites list of a person using DELETE call on "people/{personId}/favorite-sites/{siteId}"
      */
@@ -334,7 +341,7 @@ public RestPersonFavoritesModel addSiteToFavorites(SiteModel siteModel)
      */
     public RestWrapper deleteSiteFromFavorites(SiteModel site)
     {
-        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorites/{favoriteId}", this.person.getUsername(), site.getGuid()); 
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorites/{favoriteId}", this.person.getUsername(), site.getGuid());
         restWrapper.processEmptyModel(request);
         return restWrapper;
     }
@@ -379,7 +386,7 @@ public RestNetworkModel getNetwork()
     public RestNetworkModel getNetwork(UserModel tenant)
     {
         Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
-        String personId = tenant.getUsername().contains("-me-@")? "-me-" : tenant.getUsername();
+        String personId = tenant.getUsername().contains("-me-@") ? "-me-" : tenant.getUsername();
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/networks/{networkId}?{parameters}", personId, tenant.getDomain(), restWrapper.getParameters());
         return restWrapper.processModel(RestNetworkModel.class, request);
     }
@@ -410,10 +417,9 @@ public RestPersonModel createPerson(RestPersonModel newPerson)
         RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, newPerson.toJson(), "people");
         return restWrapper.processModel(RestPersonModel.class, request);
     }
-    
+
     /**
-     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the
-     * renditions response several times because on the alfresco server the rendition can take a while to be created.
+     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the renditions response several times because on the alfresco server the rendition can take a while to be created.
      */
     public RestResponse downloadAvatarContent()
     {
@@ -456,17 +462,8 @@ public WhereClause where()
         return new WhereClause(this);
     }
 
-/**
-     * Construct the Where clause of getFavorites
-     * You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a
-     * single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that
-     * include that one property. The property values are:-
-     * target/file
-     * target/folder
-     * target/site
-     * Usage:
-     * where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...)
-     * At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
+    /**
+     * Construct the Where clause of getFavorites You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that include that one property. The property values are:- target/file target/folder target/site Usage: where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...) At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
      * 
      * @author paul.brodner
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ else @@
        echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
        docker logs --tail=200 $ALFCONTAINER
        exit 1
-    fi
+    fi