diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 87a9fde3fe..a0b2bffd45 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-amps
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 6f14c477eb..f856f27547 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-governance-services-community-parent
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
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
index a10c28ccd5..ee34e33050 100644
--- 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 @@
org.alfresco
alfresco-governance-services-automation-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 4a892b94ee..92a5f64fa1 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-governance-services-community-parent
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index a2a162aedd..47f2e3a53e 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
org.alfresco
alfresco-governance-services-community-repo-parent
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
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
index f1bb42b3e5..10003459cc 100644
--- 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 @@
org.alfresco
alfresco-governance-services-community-repo-parent
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/amps/pom.xml b/amps/pom.xml
index 5a465026d1..d80b32c18c 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 0eee5faecb..cbd778c694 100644
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
org.alfresco
alfresco-community-repo-amps
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/core/pom.xml b/core/pom.xml
index 3825b82c77..1e96dd4be4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 9319f4e37e..a4211d12fc 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/mmt/pom.xml b/mmt/pom.xml
index 3368dec7ca..2c5d590c9e 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 7114e9a5f6..7acf029536 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index dbc421f62c..e8d6ca29da 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 512ce01fb5..eb4b7e138b 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index d237c38572..9f27a93f12 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index f429c717b2..7da3f863fe 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-tests
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index d6c2af08e2..e841a7b7a6 100644
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
org.alfresco
alfresco-community-repo-tests
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index c173c43fd2..d96ed846e4 100644
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
org.alfresco
alfresco-community-repo-tests
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 3aa8a1d199..80a89c6d62 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
org.alfresco
alfresco-community-repo-tests
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 4876da5d83..024385e2e3 100644
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
org.alfresco
alfresco-community-repo-tests
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index cb012162af..0f93df82e2 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 072b3688fb..a793cdb1c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
pom
Alfresco Community Repo Parent
@@ -79,7 +79,7 @@
3.1-HTTPCLIENT-1265
2.12.2
2.0.16
- 2.24.2
+ 2.23.1
3.0.23
2.9.2
7.7.10
@@ -91,7 +91,7 @@
1.27.1
4.2.2
4.1.3
- 1.0.71
+ 1.0.72
3.1.1
3.8.6
2.0.6.1
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 027c406d5d..88ff1377fd 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/repository/pom.xml b/repository/pom.xml
index 46c21dc0e9..48ecdd9340 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.4-SNAPSHOT
+ 25.1.0.6-SNAPSHOT
diff --git a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
index f8c4a68330..efbe210d6a 100644
--- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
+++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
- * Copyright (C) 2005 - 2016 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
@@ -25,14 +25,15 @@
*/
package org.alfresco.repo.site;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.util.Pair;
-import java.util.Comparator;
-import java.util.List;
-
/**
* Conveys information for a member of a site.
*
@@ -52,7 +53,7 @@ public class SiteMembership extends AbstractSiteMembership
public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName,
String role)
{
- super(siteInfo,id, role);
+ super(siteInfo, id, role);
if (firstName == null)
{
throw new java.lang.IllegalArgumentException(
@@ -76,13 +77,8 @@ public class SiteMembership extends AbstractSiteMembership
throw new java.lang.IllegalArgumentException(
"FirstName required building site membership of " + siteInfo.getShortName());
}
- if (lastName == null)
- {
- throw new java.lang.IllegalArgumentException(
- "LastName required building site membership of " + siteInfo.getShortName());
- }
this.firstName = firstName;
- this.lastName = lastName;
+ this.lastName = Optional.ofNullable(lastName).orElse("");
this.isMemberOfGroup = isMemberOfGroup;
}
@@ -164,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership
", isMemberOfGroup = " + isMemberOfGroup + "]";
}
-
static int compareTo(List> sortPairs, SiteMembership o1, SiteMembership o2)
{
String personId1 = o1.getPersonId();