diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index d24e378d35..0fbe8861e9 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4cdc025836..d6ac96d0ee 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 - 11.73-SNAPSHOT + 11.77-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 e0376bfc23..269154a453 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ca71a7b51e..be5ee5a832 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 53c3e10df9..a8c1af48c7 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,4 +1,4 @@ TRANSFORMERS_TAG=2.5.0 -SOLR6_TAG=2.0.1 +SOLR6_TAG=2.0.2-RC1 POSTGRES_TAG=13.1 ACTIVEMQ_TAG=5.16.1 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index dd4669e1d2..2eb53e3fa1 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 - 11.73-SNAPSHOT + 11.77-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 d8ecce8b98..b725293407 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 0eb3f2cacf..244a09d50d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index b2ac1d6ba0..472eb18c7b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 135b695505..1090d72add 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index daecfbf34d..7592db2f87 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java b/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java index ff932c5681..78330ae0ed 100644 --- a/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java +++ b/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java @@ -60,12 +60,15 @@ public abstract class ConfigScheduler // Synchronized has little effect in normal operation, but on laptops that are suspended, there can be a number // of Threads calling execute concurrently without it, resulting in errors in the log. Theoretically possible in // production but not very likely. - public synchronized void execute(JobExecutionContext context) throws JobExecutionException + public void execute(JobExecutionContext context) throws JobExecutionException { JobDataMap dataMap = context.getJobDetail().getJobDataMap(); ConfigScheduler configScheduler = (ConfigScheduler)dataMap.get(CONFIG_SCHEDULER); - boolean successReadingConfig = configScheduler.readConfigAndReplace(true); - configScheduler.changeScheduleOnStateChange(successReadingConfig); + synchronized (configScheduler) + { + boolean successReadingConfig = configScheduler.readConfigAndReplace(true); + configScheduler.changeScheduleOnStateChange(successReadingConfig); + } } } diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 543e35c625..a4a9ee133f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3e0f1da502..127df63205 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 6dd904a829..c96a1a8a21 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 53c3e10df9..a8c1af48c7 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,4 +1,4 @@ TRANSFORMERS_TAG=2.5.0 -SOLR6_TAG=2.0.1 +SOLR6_TAG=2.0.2-RC1 POSTGRES_TAG=13.1 ACTIVEMQ_TAG=5.16.1 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 5c17471229..9ec6e2c6fa 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index dc1feb5441..1a0b9d3af2 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a63df769ac..b4417d5af3 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index fb713950b8..167a875c13 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 953a990b55..da4bb4d7e1 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 92f0692096..e2cf1da9e4 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 - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f7d5dc2477..6198a12966 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/pom.xml b/pom.xml index b117ec8809..7fdd666752 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT pom Alfresco Community Repo Parent diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 76d48fa32a..88f16dfc68 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT diff --git a/remote-api/src/main/java/org/alfresco/rest/api/People.java b/remote-api/src/main/java/org/alfresco/rest/api/People.java index ea7af6886c..0b1af59916 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/People.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/People.java @@ -92,6 +92,8 @@ public interface People CollectionWithPagingInfo getPeople(Parameters parameters); /** + * @deprecated from 7.1.0 + * * Request password reset (an email will be sent to the registered email of the given {@code userId}). * The API returns a 202 response for a valid, as well as the invalid (does not exist or disabled) userId * @@ -101,6 +103,8 @@ public interface People void requestPasswordReset(String userId, String client); /** + * @deprecated from 7.1.0 + * * Performs password reset * * @param passwordReset the password reset details diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java index 9d8ea818cc..706e5238dd 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java @@ -866,6 +866,7 @@ public class PeopleImpl implements People return authorityService.isAdminAuthority(authorityName); } + @Deprecated @Override public void requestPasswordReset(String userId, String client) { @@ -895,6 +896,7 @@ public class PeopleImpl implements People }); } + @Deprecated @Override public void resetPassword(String personId, final PasswordReset passwordReset) { diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java index 114098121f..2fb74875b4 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java @@ -163,6 +163,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById org.alfresco alfresco-community-repo - 11.73-SNAPSHOT + 11.77-SNAPSHOT @@ -805,7 +805,7 @@ org.aspectj aspectjrt - 1.9.6 + 1.9.7 commons-net diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java index d7f1fe3629..b8781b2486 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java @@ -32,11 +32,13 @@ import org.alfresco.repo.client.config.ClientAppNotFoundException; import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails; /** + * @deprecated from 7.1.0 * Reset password service. * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public interface ResetPasswordService { /** diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java index 2cc19b813c..530002af89 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java @@ -74,11 +74,14 @@ import java.util.Locale; import java.util.Map; /** + * @deprecated from 7.1.0 + * * * Reset password implementation based on workflow. * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public class ResetPasswordServiceImpl implements ResetPasswordService { private static final Log LOGGER = LogFactory.getLog(ResetPasswordServiceImpl.class); diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java index 8028d07526..fce6f7e59a 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java @@ -30,9 +30,12 @@ import org.alfresco.repo.security.authentication.ResetPasswordService; import org.alfresco.repo.workflow.activiti.BaseJavaDelegate; /** + * @deprecated from 7.1.0 + * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public abstract class AbstractResetPasswordDelegate extends BaseJavaDelegate { protected ResetPasswordService resetPasswordService; diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java index 0369e2bb16..23522a0044 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java @@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; /** + * @deprecated from 7.1.0 + * * This {@link JavaDelegate activiti delegate} is executed when a user resets his/her password. * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public class PerformResetPasswordDelegate extends AbstractResetPasswordDelegate { @Override diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java index 97e9aaeff2..7d063e7950 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java @@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; /** + * @deprecated from 7.1.0 + * * This {@link JavaDelegate activiti delegate} is executed when a user is finished resetting his/her password. * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public class SendResetPasswordConfirmationEmailDelegate extends AbstractResetPasswordDelegate { private static final String EMAIL_SUBJECT_KEY = "reset-password-confirmation.email.subject"; diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java index 5948f10e50..9eca17cdc8 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java @@ -29,12 +29,15 @@ package org.alfresco.repo.security.authentication.activiti; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.JavaDelegate; -/** +/** + * @deprecated from 7.1.0 + * * This {@link JavaDelegate activiti delegate} is executed when a user request password reset. * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public class SendResetPasswordEmailDelegate extends AbstractResetPasswordDelegate { private static final String EMAIL_SUBJECT_KEY = "reset-password-request.email.subject"; diff --git a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java index c2795b06f0..c44017ab38 100644 --- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java +++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java @@ -29,9 +29,12 @@ package org.alfresco.repo.workflow; import org.alfresco.service.namespace.QName; /** + * @deprecated from 7.1.0 + * * @author Jamal Kaabi-Mofrad * @since 5.2.1 */ +@Deprecated public interface WorkflowModelResetPassword { // namespace diff --git a/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java index 14caaae676..8234ad14d6 100644 --- a/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java +++ b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java @@ -322,7 +322,7 @@ public class CombinedConfig { combinedTransformers.remove(indexToRemove); // this may also require the current index i to be changed so we don't skip one. - if (i <= indexToRemove) + if (i >= indexToRemove) { i--; }