diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 83deb04622..6bcd11e242 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-amps
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 4bf00182cb..ba7424448d 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
- 17.168-SNAPSHOT
+ 17.175-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 13e42dc239..2786bb29de 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 71fc2e7679..d2eb117b7a 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 24e4b78a2d..ba5a16da98 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
- 17.168-SNAPSHOT
+ 17.175-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 272ccf8b91..6555f5c234 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/pom.xml b/amps/pom.xml
index ab6c36336c..e1951666b8 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 4b605bce90..cf6d37d83b 100644
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
org.alfresco
alfresco-community-repo-amps
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
index 01935ec327..3a188f70e2 100644
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js
@@ -14,7 +14,7 @@ function main()
maxResults: (args.maxResults !== null) ? parseInt(args.maxResults, 10) : DEFAULT_MAX_RESULTS,
pageSize: (args.pageSize !== null) ? parseInt(args.pageSize, 10) : DEFAULT_PAGE_SIZE,
startIndex: (args.startIndex !== null) ? parseInt(args.startIndex, 10) : 0,
- facetFields: args.facetFields.replace( /(<([^>]+)>)/ig, ''),
+ facetFields: args.facetFields !== null ? args.facetFields.replace( /(<([^>]+)>)/ig, '') : null,
filters: args.filters,
encodedFilters: args.encodedFilters,
spell: (args.spellcheck !== null) ? (args.spellcheck == "true") : false
diff --git a/core/pom.xml b/core/pom.xml
index a72c930705..a17b9295a7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/data-model/pom.xml b/data-model/pom.xml
index f9edb31f9f..66cabf471c 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/mmt/pom.xml b/mmt/pom.xml
index 9a4c7d5c7d..611122f622 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 7558bb139b..d0a070d4d5 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
org.alfresco
alfresco-community-repo-packaging
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 590fb7075f..cc46259c15 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-packaging
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/pom.xml b/packaging/pom.xml
index edfdcd5d7b..fd9652995b 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 8a91294859..fc964a36dd 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
org.alfresco
alfresco-community-repo-packaging
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index a6e5acf81d..41fd608644 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index a494e80474..258e58d82a 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 29b864805e..7dd3c38c47 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index c4ceeb4f05..95f3ec6a86 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
org.alfresco
alfresco-community-repo-tests
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
index abca2e77c5..4d8ed5799c 100644
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
@@ -26,15 +26,14 @@
package org.alfresco.rest.rules;
import static java.util.stream.Collectors.toList;
-
import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED;
import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION;
+import static org.alfresco.rest.rules.RulesTestsUtils.CHECKIN_ACTION;
import static org.alfresco.rest.rules.RulesTestsUtils.ID;
import static org.alfresco.rest.rules.RulesTestsUtils.INVERTED;
import static org.alfresco.rest.rules.RulesTestsUtils.IS_SHARED;
import static org.alfresco.rest.rules.RulesTestsUtils.RULE_NAME_DEFAULT;
-import static org.alfresco.rest.rules.RulesTestsUtils.RULE_SCRIPT_ID;
-import static org.alfresco.rest.rules.RulesTestsUtils.RULE_SCRIPT_PARAM_ID;
+import static org.alfresco.rest.rules.RulesTestsUtils.TEMPLATE_PARAM;
import static org.alfresco.utility.constants.UserRole.SiteCollaborator;
import static org.alfresco.utility.constants.UserRole.SiteConsumer;
import static org.alfresco.utility.constants.UserRole.SiteContributor;
@@ -58,6 +57,7 @@ import java.util.stream.IntStream;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
+import org.alfresco.rest.model.RestActionConstraintModel;
import org.alfresco.rest.model.RestActionDefinitionModel;
import org.alfresco.rest.model.RestCompositeConditionDefinitionModel;
import org.alfresco.rest.model.RestParameterDefinitionModel;
@@ -390,6 +390,23 @@ public class CreateRulesTests extends RestTest
.assertThat().field(IS_SHARED).isNull();
}
+ /**
+ * Check we can create a rule with check in action with empty description parameter.
+ */
+ @Test(groups = {TestGroup.REST_API, TestGroup.RULES})
+ public void createRuleWithCheckInActionAndEmptyCheckInDescription()
+ {
+ final RestRuleModel ruleModel = rulesUtils.createRuleModelWithDefaultValues();
+ final RestActionBodyExecTemplateModel checkinAction = new RestActionBodyExecTemplateModel();
+ checkinAction.setActionDefinitionId(CHECKIN_ACTION);
+ checkinAction.setParams(Map.of("description", ""));
+ ruleModel.setActions(Arrays.asList(checkinAction));
+
+ restClient.authenticateUser(user).withPrivateAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel);
+
+ restClient.assertStatusCodeIs(CREATED);
+ }
+
/** Check that a normal user cannot create rules that use private actions. */
@Test
public void createRuleWithActions_userCannotUsePrivateAction()
@@ -411,7 +428,9 @@ public class CreateRulesTests extends RestTest
restClient.assertStatusCodeIs(CREATED);
}
- /** Check that an administrator can create rules that use private actions. */
+ /**
+ * Check that an administrator can create rules with email (private) action with reference to an email template.
+ */
@Test
public void createRuleWithActions_adminCanUseMailActionWithTemplate()
{
@@ -424,16 +443,20 @@ public class CreateRulesTests extends RestTest
params.put("from", sender.getEmailAddress());
params.put("to", recipient.getEmailAddress());
params.put("subject", "Test");
- final RestActionDefinitionModel actionDef = restClient.authenticateUser(user).withCoreAPI().usingActions().getActionDefinitionById(RULE_SCRIPT_ID);
- final RestParameterDefinitionModel
- paramDef = actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(RULE_SCRIPT_PARAM_ID)).findFirst().get();
- final String templateScriptRef = paramDef.getParameterConstraintName();
- params.put("template", templateScriptRef);
+ final RestActionDefinitionModel actionDef =
+ restClient.authenticateUser(user).withCoreAPI().usingActions().getActionDefinitionById(MAIL_ACTION);
+ final RestParameterDefinitionModel paramDef =
+ actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(TEMPLATE_PARAM)).findFirst().get();
+ final String constraintName = paramDef.getParameterConstraintName();
+ final RestActionConstraintModel constraint =
+ restClient.authenticateUser(user).withCoreAPI().usingActions().getActionConstraintByName(constraintName);
+ String templateScriptRef = constraint.getConstraintValues().stream().findFirst().get().getValue();
+ params.put(TEMPLATE_PARAM, templateScriptRef);
mailAction.setParams(params);
ruleModel.setActions(Arrays.asList(mailAction));
restClient.authenticateUser(dataUser.getAdminUser()).withPrivateAPI().usingNode(ruleFolder).usingDefaultRuleSet()
- .createSingleRule(rulesUtils.createRuleWithPrivateAction());
+ .createSingleRule(ruleModel);
restClient.assertStatusCodeIs(CREATED);
}
@@ -668,7 +691,7 @@ public class CreateRulesTests extends RestTest
params.put("to", recipient.getEmailAddress());
params.put("subject", "Test");
final String mailTemplate = "non-existing-node-id";
- params.put("template", mailTemplate);
+ params.put(TEMPLATE_PARAM, mailTemplate);
mailAction.setParams(params);
ruleModel.setActions(Arrays.asList(mailAction));
diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java
index 3a9189874b..0f5f4b8c59 100644
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java
@@ -51,12 +51,11 @@ import org.alfresco.utility.data.DataUserAIS;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class RulesTestsUtils implements InitializingBean
+public class RulesTestsUtils
{
static final String RULE_NAME_DEFAULT = "ruleName";
static final String RULE_DESCRIPTION_DEFAULT = "rule description";
@@ -67,6 +66,7 @@ public class RulesTestsUtils implements InitializingBean
static final String RULE_SCRIPT_ID = "script";
static final String RULE_SCRIPT_PARAM_ID = "script-ref";
static final String RULE_ERROR_SCRIPT_LABEL = "Start Pooled Review and Approve Workflow";
+ public static final String CHECKIN_ACTION = "check-in";
static final String INBOUND = "inbound";
static final String UPDATE = "update";
static final String OUTBOUND = "outbound";
@@ -77,6 +77,7 @@ public class RulesTestsUtils implements InitializingBean
static final String IS_SHARED = "isShared";
static final String AUDIO_ASPECT = "audio:audio";
static final String LOCKABLE_ASPECT = "cm:lockable";
+ public static final String TEMPLATE_PARAM = "template";
@Autowired
private RestWrapper restClient;
@@ -87,30 +88,15 @@ public class RulesTestsUtils implements InitializingBean
@Autowired
private DataContent dataContent;
- private SiteModel site;
+ /** Public site used by these helper methods. This is populated by the getter and should not be accessed directly. */
+ private SiteModel publicSite;
+ /** Script node used by these helper methods. This is populated by the getter and should not be accessed directly. */
private String reviewAndApproveWorkflowNode;
-
+ /** Destination folder for copy action used by these helper methods. This is populated by the getter and should not be accessed directly. */
private FolderModel copyDestinationFolder;
-
+ /** Destination folder for check out action used by these helper methods. This is populated by the getter and should not be accessed directly. */
private FolderModel checkOutDestinationFolder;
- /**
- * Initialise the util class.
- */
- @Override
- public void afterPropertiesSet()
- {
- UserModel admin = dataUser.getAdminUser();
- // Obtain the node ref for the review and approve workflow.
- String reviewAndApprove = findConstraintValue(admin, RULE_SCRIPT_ID, RULE_SCRIPT_PARAM_ID, RULE_ERROR_SCRIPT_LABEL);
- reviewAndApproveWorkflowNode = reviewAndApprove;
-
- // Create a couple of public folders to be used as action destinations.
- site = dataSite.usingUser(admin).createPublicRandomSite();
- copyDestinationFolder = dataContent.usingUser(admin).usingSite(site).createFolder();
- checkOutDestinationFolder = dataContent.usingUser(admin).usingSite(site).createFolder();
- }
-
/**
* Get the constraint value for a given action parameter label.
*
@@ -134,11 +120,6 @@ public class RulesTestsUtils implements InitializingBean
return constraintDataModel.getValue();
}
- public RestRuleModel createRuleModelWithModifiedValues()
- {
- return createRuleModelWithModifiedValues(List.of(createAddAudioAspectAction()));
- }
-
/**
* Get the review and approve workflow node (throwing an exception if this utility class has not been initialised).
*
@@ -146,19 +127,49 @@ public class RulesTestsUtils implements InitializingBean
*/
public String getReviewAndApproveWorkflowNode()
{
+ if (reviewAndApproveWorkflowNode == null)
+ {
+ UserModel admin = dataUser.getAdminUser();
+ reviewAndApproveWorkflowNode = findConstraintValue(admin, RULE_SCRIPT_ID, RULE_SCRIPT_PARAM_ID, RULE_ERROR_SCRIPT_LABEL);
+ }
return reviewAndApproveWorkflowNode;
}
+ public SiteModel getPublicSite()
+ {
+ if (publicSite == null)
+ {
+ UserModel admin = dataUser.getAdminUser();
+ publicSite = dataSite.usingUser(admin).createPublicRandomSite();
+ }
+ return publicSite;
+ }
+
public FolderModel getCopyDestinationFolder()
{
+ if (copyDestinationFolder == null)
+ {
+ UserModel admin = dataUser.getAdminUser();
+ copyDestinationFolder = dataContent.usingUser(admin).usingSite(getPublicSite()).createFolder();
+ }
return copyDestinationFolder;
}
public FolderModel getCheckOutDestinationFolder()
{
+ if (checkOutDestinationFolder == null)
+ {
+ UserModel admin = dataUser.getAdminUser();
+ checkOutDestinationFolder = dataContent.usingUser(admin).usingSite(getPublicSite()).createFolder();
+ }
return checkOutDestinationFolder;
}
+ public RestRuleModel createRuleModelWithModifiedValues()
+ {
+ return createRuleModelWithModifiedValues(List.of(createAddAudioAspectAction()));
+ }
+
/**
* Create a rule model filled with custom constant values.
*
@@ -258,10 +269,10 @@ public class RulesTestsUtils implements InitializingBean
public RestRuleModel createRuleWithVariousActions()
{
final Map copyParams =
- Map.of("destination-folder", copyDestinationFolder.getNodeRef(), "deep-copy", true);
+ Map.of("destination-folder", getCopyDestinationFolder().getNodeRef(), "deep-copy", true);
final RestActionBodyExecTemplateModel copyAction = createCustomActionModel("copy", copyParams);
final Map checkOutParams =
- Map.of("destination-folder", checkOutDestinationFolder.getNodeRef(), "assoc-name", "cm:checkout",
+ Map.of("destination-folder", getCheckOutDestinationFolder().getNodeRef(), "assoc-name", "cm:checkout",
"assoc-type", "cm:contains");
final RestActionBodyExecTemplateModel checkOutAction = createCustomActionModel("check-out", checkOutParams);
// The counter action takes no parameters, so check we can omit the "params" entry.
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index bd2cb530bc..5713d4187f 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
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 91883a16e2..5d267432f1 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo-packaging
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index be9540f831..a6ab21a7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
pom
Alfresco Community Repo Parent
@@ -109,8 +109,8 @@
2.7.0
1.1.4
- 3.2.3-A3
- 1.4.1
+ 3.3.0-A1
+ 1.5.0-A7
7.3.0-A1
2.2.0
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index c7a7e347f8..b4cf0df5c2 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java
index 2028551ea1..23f0402320 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java
@@ -33,11 +33,11 @@ import static org.alfresco.rest.api.actions.ActionValidator.ALL_ACTIONS;
import java.io.Serializable;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.stream.Collectors;
import org.alfresco.repo.action.ActionImpl;
import org.alfresco.repo.action.CompositeActionImpl;
@@ -82,7 +82,7 @@ public class RestRuleActionModelMapper implements RestModelMapper convertedParams = actionModel.getParameterValues()
.entrySet()
.stream()
- .collect(Collectors.toMap(Map.Entry::getKey, e -> parameterConverter.convertParamFromServiceModel(e.getValue())));
+ .collect(HashMap::new, (m, v) -> m.put(v.getKey(), parameterConverter.convertParamFromServiceModel(v.getValue())), HashMap::putAll);
convertedParams.remove(ACTION_CONTEXT_PARAM_NAME);
builder.params(convertedParams);
}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java
index 90cca29b46..19f96de839 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java
@@ -27,7 +27,6 @@
package org.alfresco.rest.api.impl.validator.actions;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -49,8 +48,6 @@ import org.apache.commons.collections.MapUtils;
public class ActionParameterDefinitionValidator implements ActionValidator
{
private static final boolean IS_ENABLED = true;
- private static final String BASE_PACKAGE = "org/alfresco/repo/action/executer";
- private static final String NAME = "NAME";
static final String INVALID_PARAMETER_VALUE =
"Action parameter: %s has invalid value (%s). Look up possible values for constraint name %s";
@@ -60,7 +57,6 @@ public class ActionParameterDefinitionValidator implements ActionValidator
"Action parameters should not be null or empty for this action. See Action Definition for action of: %s";
static final String INVALID_ACTION_DEFINITION = "Invalid action definition requested %s";
- private final List actionDefinitionIds = new ArrayList<>();
private final Actions actions;
public ActionParameterDefinitionValidator(Actions actions)
diff --git a/repository/pom.xml b/repository/pom.xml
index e76d625e02..84066bea21 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
org.alfresco
alfresco-community-repo
- 17.168-SNAPSHOT
+ 17.175-SNAPSHOT