diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 141fd41d81..f289a0fc1c 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-amps
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 090c1b8bba..30336f8fda 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.61-SNAPSHOT
+ 25.1.0.70-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 691fae9704..73ba74c272 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 2a8e19f5fa..cfca1c253d 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env
index 358fd679fc..fb842fec56 100644
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.14
+SOLR6_TAG=2.0.15
POSTGRES_TAG=16.6
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index e33e379e04..f1a2cd0987 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.61-SNAPSHOT
+ 25.1.0.70-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 730e9a42e7..b668184f47 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/pom.xml b/amps/pom.xml
index 8f58fe3618..0738e02077 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 4c5441cbcb..1691d76325 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
index 314e1e1b29..c5e909d740 100644
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
@@ -23,10 +23,6 @@ function runAction(p_params)
if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
{
p_params.destNode.unlock();
- if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
- {
- p_params.destNode.removeAspect("gd2:editingInGoogle");
- }
}
var resultId = originalDoc.name,
diff --git a/core/pom.xml b/core/pom.xml
index 2c6fd6bddb..3344c3e60e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 2e6970001e..9e9be3629d 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/mmt/pom.xml b/mmt/pom.xml
index ccc2e911d4..514d5fe2ae 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 86e563d230..4bdfbb4aef 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 26fff79e35..9a3e0aedc6 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/pom.xml b/packaging/pom.xml
index b010f42adb..afb7c5aecc 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env
index 358fd679fc..fb842fec56 100644
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.14
+SOLR6_TAG=2.0.15
POSTGRES_TAG=16.6
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index ba59f7322e..c0b8fdf84d 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 20d37ebf7b..316ca4e799 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index ec3f68d2ee..a10bc5ded3 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 015e2149ff..5e604b956f 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 73c125f226..0ef72b41f5 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index dee3e38e6d..9b8276dd8b 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.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 3cea4e4a84..7f4764e900 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-packaging
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 4d0c3457b3..5fc22ca55f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
pom
Alfresco Community Repo Parent
@@ -51,8 +51,8 @@
7.0.1
5.23.0
5.23.0
- 5.1.7-A.3
- 4.1.7-A.1
+ 5.1.7
+ 4.1.7
7.1
1.0.2
@@ -112,10 +112,10 @@
2.1.3
1.1.7
2.9.0
- 2.5.1
+ 2.5.2
4.1.0
3.2.0
- 25.1.0-A1
+ 25.1.0
2.2.0
2.4.0
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 873b1c30e1..79b065dfd5 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/repository/pom.xml b/repository/pom.xml
index f0b3f3ab08..f7e409a4ad 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 25.1.0.61-SNAPSHOT
+ 25.1.0.70-SNAPSHOT
diff --git a/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
index 1dfee2d75f..1123ca1542 100644
--- a/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
+++ b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java
@@ -28,11 +28,17 @@ package org.alfresco.repo.workflow.activiti.script;
import java.util.Map;
+import org.activiti.engine.RepositoryService;
import org.activiti.engine.delegate.VariableScope;
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.el.Expression;
import org.activiti.engine.impl.persistence.entity.DeploymentEntity;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.workflow.WorkflowDeployer;
@@ -45,13 +51,12 @@ import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.workflow.WorkflowException;
/**
- * Base class for execution scripts, using {@link ScriptService} as part of
- * activiti workflow.
+ * Base class for execution scripts, using {@link ScriptService} as part of activiti workflow.
*
* @author Frederik Heremans
* @since 3.4.e
*/
-public class ActivitiScriptBase
+public class ActivitiScriptBase
{
protected static final String PERSON_BINDING_NAME = "person";
protected static final String USERHOME_BINDING_NAME = "userhome";
@@ -61,17 +66,19 @@ public class ActivitiScriptBase
protected Expression runAs;
protected Expression scriptProcessor;
+ private static final Logger LOGGER = LoggerFactory.getLogger(ActivitiScriptBase.class);
+
protected Object executeScript(String theScript, Map model, String scriptProcessorName, String runAsUser)
{
String user = AuthenticationUtil.getFullyAuthenticatedUser();
-
+
Object scriptResult = null;
if (runAsUser == null && user != null)
{
// Just execute the script using the current user
scriptResult = executeScript(theScript, model, scriptProcessorName);
}
- else
+ else
{
if (runAsUser != null)
{
@@ -87,26 +94,25 @@ public class ActivitiScriptBase
}
return scriptResult;
}
-
+
protected Object executeScriptAsUser(final String theScript, final Map model, final String scriptProcessorName, final String runAsUser)
{
// execute as specified runAsUser
- return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork