inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
pzurek
2023-06-13 12:20:50 +02:00
parent b075fb9f0a 2bac9bd9d1
commit 6687066edc
24 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amps/ags/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId> <artifactId>alfresco-community-repo-amps</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
amps/ags/rm-automation/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId> <artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId> <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<build> <build>

2
amps/ags/rm-community/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId> <artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
amps/ags/rm-community/rm-community-repo/pom.xml
View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId> <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId> <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<build> <build>

2
amps/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
amps/share-services/pom.xml
View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId> <artifactId>alfresco-community-repo-amps</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

4
amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
View File

@@ -23,6 +23,10 @@ function runAction(p_params)
if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred")) if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
{ {
p_params.destNode.unlock(); p_params.destNode.unlock();
if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
{
p_params.destNode.removeAspect("gd2:editingInGoogle");
}
} }
var resultId = originalDoc.name, var resultId = originalDoc.name,

2
core/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
data-model/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
mmt/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
packaging/distribution/pom.xml
View File

@@ -9,6 +9,6 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
</project> </project>

2
packaging/docker-alfresco/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
packaging/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
packaging/tests/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
packaging/tests/tas-cmis/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<organization> <organization>

2
packaging/tests/tas-email/pom.xml
View File

@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

2
packaging/tests/tas-integration/pom.xml
View File

@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

2
packaging/tests/tas-restapi/pom.xml
View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
packaging/tests/tas-webdav/pom.xml
View File

@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

2
packaging/war/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
remote-api/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

13
repository/pom.xml
View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>23.1.0.131-SNAPSHOT</version> <version>23.1.0.136-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
@@ -358,17 +358,6 @@
<version>6.5.1</version> <version>6.5.1</version>
</dependency> </dependency>
<!-- GData -->
<dependency>
<groupId>com.google.gdata</groupId>
<artifactId>gdata-core-1.0</artifactId>
<version>1.47.1</version>
</dependency>
<dependency>
<groupId>com.google.gdata</groupId>
<artifactId>gdata-media-1.0</artifactId>
<version>1.47.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId> <artifactId>spring-security-crypto</artifactId>