inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/ACS-1383_StorageClasses

Browse Source
This commit is contained in:
DenisGabriela
2021-06-28 15:41:39 +03:00
parent 68a0441772 58017396c3
commit d4e76d9f0f
37 changed files with 62 additions and 31 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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>

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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
amps/ags/rm-community/rm-community-repo/.env
View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.5.0 TRANSFORMERS_TAG=2.5.0
SOLR6_TAG=2.0.1 SOLR6_TAG=2.0.2-RC1
POSTGRES_TAG=13.1 POSTGRES_TAG=13.1
ACTIVEMQ_TAG=5.16.1 ACTIVEMQ_TAG=5.16.1

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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

5
data-model/src/main/java/org/alfresco/util/ConfigScheduler.java
View File

@@ -60,14 +60,17 @@ public abstract class ConfigScheduler<Data>
// Synchronized has little effect in normal operation, but on laptops that are suspended, there can be a number // 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 // of Threads calling execute concurrently without it, resulting in errors in the log. Theoretically possible in
// production but not very likely. // 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(); JobDataMap dataMap = context.getJobDetail().getJobDataMap();
ConfigScheduler configScheduler = (ConfigScheduler)dataMap.get(CONFIG_SCHEDULER); ConfigScheduler configScheduler = (ConfigScheduler)dataMap.get(CONFIG_SCHEDULER);
synchronized (configScheduler)
{
boolean successReadingConfig = configScheduler.readConfigAndReplace(true); boolean successReadingConfig = configScheduler.readConfigAndReplace(true);
configScheduler.changeScheduleOnStateChange(successReadingConfig); configScheduler.changeScheduleOnStateChange(successReadingConfig);
} }
} }
}
public static final String CONFIG_SCHEDULER = "configScheduler"; public static final String CONFIG_SCHEDULER = "configScheduler";

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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
packaging/tests/environment/.env
View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.5.0 TRANSFORMERS_TAG=2.5.0
SOLR6_TAG=2.0.1 SOLR6_TAG=2.0.2-RC1
POSTGRES_TAG=13.1 POSTGRES_TAG=13.1
ACTIVEMQ_TAG=5.16.1 ACTIVEMQ_TAG=5.16.1

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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
packaging/tests/tas-cmis/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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

2
packaging/tests/tas-restapi/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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<developers> <developers>

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>11.73-SNAPSHOT</version> <version>11.77-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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
pom.xml
View File

@@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId> <artifactId>alfresco-community-repo</artifactId>
<version>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name> <name>Alfresco Community Repo Parent</name>

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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

4
remote-api/src/main/java/org/alfresco/rest/api/People.java
View File

@@ -92,6 +92,8 @@ public interface People
CollectionWithPagingInfo<Person> getPeople(Parameters parameters); CollectionWithPagingInfo<Person> 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}). * 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 * 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); void requestPasswordReset(String userId, String client);
/** /**
* @deprecated from 7.1.0
*
* Performs password reset * Performs password reset
* *
* @param passwordReset the password reset details * @param passwordReset the password reset details

2
remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
View File

@@ -866,6 +866,7 @@ public class PeopleImpl implements People
return authorityService.isAdminAuthority(authorityName); return authorityService.isAdminAuthority(authorityName);
} }
@Deprecated
@Override @Override
public void requestPasswordReset(String userId, String client) public void requestPasswordReset(String userId, String client)
{ {
@@ -895,6 +896,7 @@ public class PeopleImpl implements People
}); });
} }
@Deprecated
@Override @Override
public void resetPassword(String personId, final PasswordReset passwordReset) public void resetPassword(String personId, final PasswordReset passwordReset)
{ {

2
remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
View File

@@ -163,6 +163,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
return people.getPeople(params); return people.getPeople(params);
} }
@Deprecated
@Operation("request-password-reset") @Operation("request-password-reset")
@WebApiDescription(title = "Request Password Reset", description = "Request password reset", @WebApiDescription(title = "Request Password Reset", description = "Request password reset",
successStatus = HttpServletResponse.SC_ACCEPTED) successStatus = HttpServletResponse.SC_ACCEPTED)
@@ -172,6 +173,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
people.requestPasswordReset(personId, client.getClient()); people.requestPasswordReset(personId, client.getClient());
} }
@Deprecated
@Operation("reset-password") @Operation("reset-password")
@WebApiDescription(title = "Reset Password", description = "Performs password reset", successStatus = HttpServletResponse.SC_ACCEPTED) @WebApiDescription(title = "Reset Password", description = "Performs password reset", successStatus = HttpServletResponse.SC_ACCEPTED)
@WebApiNoAuth @WebApiNoAuth

4
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>11.73-SNAPSHOT</version> <version>11.77-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
@@ -805,7 +805,7 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
<version>1.9.6</version> <version>1.9.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>

2
repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
View File

@@ -32,11 +32,13 @@ import org.alfresco.repo.client.config.ClientAppNotFoundException;
import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails; import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails;
/** /**
* @deprecated from 7.1.0
* Reset password service. * Reset password service.
* *
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public interface ResetPasswordService public interface ResetPasswordService
{ {
/** /**

3
repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
View File

@@ -74,11 +74,14 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
/** /**
* @deprecated from 7.1.0
* *
* Reset password implementation based on workflow. * Reset password implementation based on workflow.
* *
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public class ResetPasswordServiceImpl implements ResetPasswordService public class ResetPasswordServiceImpl implements ResetPasswordService
{ {
private static final Log LOGGER = LogFactory.getLog(ResetPasswordServiceImpl.class); private static final Log LOGGER = LogFactory.getLog(ResetPasswordServiceImpl.class);

3
repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
View File

@@ -30,9 +30,12 @@ import org.alfresco.repo.security.authentication.ResetPasswordService;
import org.alfresco.repo.workflow.activiti.BaseJavaDelegate; import org.alfresco.repo.workflow.activiti.BaseJavaDelegate;
/** /**
* @deprecated from 7.1.0
*
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public abstract class AbstractResetPasswordDelegate extends BaseJavaDelegate public abstract class AbstractResetPasswordDelegate extends BaseJavaDelegate
{ {
protected ResetPasswordService resetPasswordService; protected ResetPasswordService resetPasswordService;

3
repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
View File

@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.JavaDelegate; 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. * This {@link JavaDelegate activiti delegate} is executed when a user resets his/her password.
* *
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public class PerformResetPasswordDelegate extends AbstractResetPasswordDelegate public class PerformResetPasswordDelegate extends AbstractResetPasswordDelegate
{ {
@Override @Override

3
repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
View File

@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.JavaDelegate; 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. * This {@link JavaDelegate activiti delegate} is executed when a user is finished resetting his/her password.
* *
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public class SendResetPasswordConfirmationEmailDelegate extends AbstractResetPasswordDelegate public class SendResetPasswordConfirmationEmailDelegate extends AbstractResetPasswordDelegate
{ {
private static final String EMAIL_SUBJECT_KEY = "reset-password-confirmation.email.subject"; private static final String EMAIL_SUBJECT_KEY = "reset-password-confirmation.email.subject";

3
repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
View File

@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.JavaDelegate; import org.activiti.engine.delegate.JavaDelegate;
/** /**
* @deprecated from 7.1.0
*
* This {@link JavaDelegate activiti delegate} is executed when a user request password reset. * This {@link JavaDelegate activiti delegate} is executed when a user request password reset.
* *
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public class SendResetPasswordEmailDelegate extends AbstractResetPasswordDelegate public class SendResetPasswordEmailDelegate extends AbstractResetPasswordDelegate
{ {
private static final String EMAIL_SUBJECT_KEY = "reset-password-request.email.subject"; private static final String EMAIL_SUBJECT_KEY = "reset-password-request.email.subject";

3
repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
View File

@@ -29,9 +29,12 @@ package org.alfresco.repo.workflow;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
/** /**
* @deprecated from 7.1.0
*
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
* @since 5.2.1 * @since 5.2.1
*/ */
@Deprecated
public interface WorkflowModelResetPassword public interface WorkflowModelResetPassword
{ {
// namespace // namespace

2
repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
View File

@@ -322,7 +322,7 @@ public class CombinedConfig
{ {
combinedTransformers.remove(indexToRemove); combinedTransformers.remove(indexToRemove);
// this may also require the current index i to be changed so we don't skip one. // this may also require the current index i to be changed so we don't skip one.
if (i <= indexToRemove) if (i >= indexToRemove)
{ {
i--; i--;
} }