Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Alfresco/alfresco-community-repo …
Browse files Browse the repository at this point in the history 
…into fix/APPS-3154-fixForNumberOfFileFieldInResponse

# Conflicts:
#	repository/src/main/java/org/alfresco/repo/node/sizedetails/NodeSizeDetailsServiceImpl.java
  • Loading branch information
mohit-singh4 committed Jan 9, 2025
2 parents a2aea43 + 82f7b5a commit eff0247
Show file tree
Hide file tree
Showing 1,404 changed files with 3,189 additions and 3,216 deletions.
2 changes: 1 addition & 1 deletion amps/ags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>25.1.0.21-SNAPSHOT</version>
<version>25.1.0.22-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion amps/ags/rm-automation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>25.1.0.21-SNAPSHOT</version>
<version>25.1.0.22-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>25.1.0.21-SNAPSHOT</version>
<version>25.1.0.22-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions ...-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -59,4 +59,4 @@ public class RMRestProperties extends RestProperties

@Value ("${docker.host}")
private String dockerHost;
}
}
4 changes: 2 additions & 2 deletions .../rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -177,4 +177,4 @@ public RestHtmlResponse processHtmlResponse(RestRequest simpleRequest)
{
return restWrapper.processHtmlResponse(simpleRequest);
}
}
}
4 changes: 2 additions & 2 deletions ...rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -265,4 +265,4 @@ public RetentionScheduleAPI getRetentionScheduleAPI(UserModel userModel)
{
return getGSCoreAPI(userModel).usingRetentionScheduleAPI();
}
}
}
4 changes: 2 additions & 2 deletions ...-community-rest-api/src/main/java/org/alfresco/rest/core/search/SearchRequestBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -91,4 +91,4 @@ public SearchRequestBuilder setFieldsBuilder(List<String> fields)
return this;
}

}
}
4 changes: 2 additions & 2 deletions ...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -118,4 +118,4 @@ public static String extractErrorMessageFromHttpResponse(HttpResponse httpRespon
}
return null;
}
}
}
8 changes: 4 additions & 4 deletions ...ion/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -124,7 +124,7 @@ protected List<String> getPropertyValues(JSONObject result, String propertyName)

/**
* Helper method to extract the property value for the given nodeRef and property name
*
*
* @param result
* @param nodeRef
* @param propertyName
Expand Down Expand Up @@ -152,7 +152,7 @@ protected String getPropertyValue(JSONObject result, String nodeRef, String prop

return propertyValue;
}

/**
* Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value.
*
Expand Down Expand Up @@ -832,4 +832,4 @@ public static String getFilePlanPath()
{
return FILE_PLAN_PATH;
}
}
}
4 changes: 2 additions & 2 deletions ...on/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -46,4 +46,4 @@ public String getEventName()
{
return eventName;
}
}
}
4 changes: 2 additions & 2 deletions ...mmunity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -86,4 +86,4 @@ public class AuditEntry extends TestModel
@JsonProperty (required = true)
private String timestamp;

}
}
4 changes: 2 additions & 2 deletions ...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -59,4 +59,4 @@ public enum AuditEvents
this.event = event;
this.eventDisplayName = displayName;
}
}
}
4 changes: 2 additions & 2 deletions ...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -58,4 +58,4 @@ public class IdNamePair

@JsonProperty (required = true)
private String nodeType;
}
}
4 changes: 2 additions & 2 deletions ...n-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -48,4 +48,4 @@
public class Owner extends TestModel
{

}
}
4 changes: 2 additions & 2 deletions ...on-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -59,4 +59,4 @@ public class Path extends TestModel

@JsonProperty (required = true)
private List<IdNamePair> elements;
}
}
4 changes: 2 additions & 2 deletions ...nity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -50,4 +50,4 @@ public class ReviewPeriod

@JsonProperty (required = true)
private String expression;
}
}
4 changes: 2 additions & 2 deletions ...rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -60,4 +60,4 @@ public String getDefinition()
{
return definition;
}
}
}
4 changes: 2 additions & 2 deletions ...munity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -96,4 +96,4 @@ public class FilePlan extends TestModel

@JsonProperty
private Path path;
}
}
4 changes: 2 additions & 2 deletions ...t-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -79,4 +79,4 @@ public class FilePlanProperties extends TestModel

@JsonProperty (PROPERTIES_DESCRIPTION)
private String description;
}
}
4 changes: 2 additions & 2 deletions .../java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -37,4 +37,4 @@ public class FilePlanComponentAlias
public static final String FILE_PLAN_ALIAS = "-filePlan-";
public static final String TRANSFERS_ALIAS = "-transfers-";
public static final String UNFILED_RECORDS_CONTAINER_ALIAS = "-unfiled-";
}
}
4 changes: 2 additions & 2 deletions ...ava/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -65,4 +65,4 @@ private FilePlanComponentAspects()

// WORM Lock aspect
public static final String ASPECT_WORM_LOCK = "rme:wormLock";
}
}
4 changes: 2 additions & 2 deletions ...java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -135,4 +135,4 @@ public class FilePlanComponentFields
public static final String PROPERTIES_STORE = "cm:storeName";
/** WORM Unlock Date */
public static final String PROPERTIES_WORM_UNLOCK_DATE = "rme:wormUnlockDate";
}
}
4 changes: 2 additions & 2 deletions ...n/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -45,4 +45,4 @@ public class FilePlanComponentType
public static final String FOLDER_TYPE = "cm:folder";
public static final String CONTENT_TYPE = "cm:content";
public static final String NON_ELECTRONIC_RECORD_TYPE = "rma:nonElectronicDocument";
}
}
4 changes: 2 additions & 2 deletions ...nity-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/BulkBodyCancel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -38,4 +38,4 @@
public class BulkBodyCancel
{
private String reason;
}
}
4 changes: 2 additions & 2 deletions ...tion-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/Hold.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
Expand Down Expand Up @@ -80,4 +80,4 @@ public int hashCode()
{
return Objects.hash(id, name, description, reason);
}
}
}
Loading

0 comments on commit eff0247

Please sign in to comment.