mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-09-24 14:32:01 +00:00
Compare commits
35 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
dea6049bc0 | ||
|
7a64964644 | ||
|
3d2bfe6b08 | ||
|
01ec63cf33 | ||
|
05425e3cbe | ||
|
2a80d17c9d | ||
|
e7ea900096 | ||
|
89847d260d | ||
|
0bb31fe4ba | ||
|
4e2d3e899a | ||
|
72965f81a8 | ||
|
7d84505c44 | ||
|
c5a753ebb8 | ||
|
24236be595 | ||
|
5d0055d9aa | ||
|
9cdc916189 | ||
|
8272347b71 | ||
|
cde7f0bba1 | ||
|
959678eb70 | ||
|
cf7bb499dc | ||
|
a915a4246c | ||
|
89b5fa9e90 | ||
|
03744ff5d5 | ||
|
965add646c | ||
|
1c93cc7ca4 | ||
|
0564b27ece | ||
|
b98fdf4ca9 | ||
|
1aff1eab1e | ||
|
c3b82354c1 | ||
|
04215f84a6 | ||
|
e6e05c8890 | ||
|
af69c12be3 | ||
|
e3407e5a53 | ||
|
8d978d6527 | ||
|
3b574c56dc |
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -9,6 +9,6 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
</project>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<organization>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
18
pom.xml
18
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.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Alfresco Community Repo Parent</name>
|
||||
|
||||
@@ -51,10 +51,10 @@
|
||||
<dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
|
||||
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
|
||||
<dependency.activiti.version>5.23.0</dependency.activiti.version>
|
||||
<dependency.alfresco-transform-core.version>5.0.1</dependency.alfresco-transform-core.version>
|
||||
<dependency.alfresco-transform-service.version>4.0.1</dependency.alfresco-transform-service.version>
|
||||
<dependency.alfresco-transform-core.version>5.1.0-A1</dependency.alfresco-transform-core.version>
|
||||
<dependency.alfresco-transform-service.version>4.1.0-A1</dependency.alfresco-transform-service.version>
|
||||
<dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
|
||||
<dependency.acs-event-model.version>0.0.26</dependency.acs-event-model.version>
|
||||
<dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>
|
||||
|
||||
<dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
|
||||
<dependency.spring.version>6.0.14</dependency.spring.version>
|
||||
@@ -88,7 +88,7 @@
|
||||
<dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
|
||||
<dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
|
||||
<dependency.activemq.version>5.18.3</dependency.activemq.version>
|
||||
<dependency.apache-compress.version>1.25.0</dependency.apache-compress.version>
|
||||
<dependency.apache-compress.version>1.26.0</dependency.apache-compress.version>
|
||||
<dependency.awaitility.version>4.2.0</dependency.awaitility.version>
|
||||
<dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
|
||||
<dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
|
||||
@@ -110,10 +110,10 @@
|
||||
<dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
|
||||
<dependency.jakarta-ee-json-api.version>2.1.2</dependency.jakarta-ee-json-api.version>
|
||||
<dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
|
||||
<dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
|
||||
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
|
||||
<dependency.json-smart.version>2.5.0</dependency.json-smart.version>
|
||||
<alfresco.googledrive.version>4.0.0</alfresco.googledrive.version>
|
||||
<alfresco.aos-module.version>2.0.0</alfresco.aos-module.version>
|
||||
<alfresco.googledrive.version>4.1.0-A2</alfresco.googledrive.version>
|
||||
<alfresco.aos-module.version>3.0.0-A1</alfresco.aos-module.version>
|
||||
<alfresco.api-explorer.version>23.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
|
||||
|
||||
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
|
||||
@@ -151,7 +151,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.2.0.46</tag>
|
||||
<tag>23.2.0.56</tag>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -175,6 +175,10 @@ public class NodesMetaDataGet extends DeclarativeWebScript
|
||||
{
|
||||
filter.setIncludeChildIds(o.getBoolean("includeChildIds"));
|
||||
}
|
||||
if(o.has("includeChildAssociations"))
|
||||
{
|
||||
filter.setIncludeChildAssociations(o.getBoolean("includeChildAssociations"));
|
||||
}
|
||||
if(o.has("includeTxnId"))
|
||||
{
|
||||
filter.setIncludeTxnId(o.getBoolean("includeTxnId"));
|
||||
|
@@ -147,7 +147,7 @@ public class GroupsImpl implements Groups
|
||||
}
|
||||
|
||||
Map<QName, Serializable> props = new HashMap<>();
|
||||
if (StringUtils.isNotEmpty(group.getDescription()))
|
||||
if (group.getDescription() != null)
|
||||
{
|
||||
props.put(ContentModel.PROP_DESCRIPTION, group.getDescription());
|
||||
}
|
||||
@@ -170,7 +170,7 @@ public class GroupsImpl implements Groups
|
||||
|
||||
try
|
||||
{
|
||||
if (StringUtils.isNotEmpty(group.getDescription()))
|
||||
if (group.getDescription() != null)
|
||||
{
|
||||
authorityService.setAuthorityDisplayNameAndDescription(groupId, group.getDisplayName(), group.getDescription());
|
||||
}
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<version>23.2.0.46</version>
|
||||
<version>23.2.0.56</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -424,6 +424,11 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
|
||||
@SuppressWarnings("rawtypes")
|
||||
private Pair decide(Authentication authentication, Object object, ConfigAttributeDefinition config, Pair returnedObject) throws AccessDeniedException
|
||||
{
|
||||
if (returnedObject.getSecond() != null && !NodeRef.class.isAssignableFrom(returnedObject.getSecond().getClass()))
|
||||
{
|
||||
return returnedObject;
|
||||
}
|
||||
|
||||
NodeRef nodeRef = (NodeRef) returnedObject.getSecond();
|
||||
decide(authentication, object, config, nodeRef);
|
||||
// the noderef was allowed
|
||||
|
Reference in New Issue
Block a user