Compare commits

...

66 Commits

Author SHA1 Message Date
tathagta15
aaee9ec0a9 file:${project.basedir}/license 2025-07-18 06:25:23 +00:00
tathagta15
3b7e63d1bb file:${project.basedir}/../license 2025-07-18 06:12:03 +00:00
tathagta15
de9578e117 classpath://alfresco 2025-07-18 05:26:26 +00:00
tathagta15
3074703ba4 file:${project.rootDirectory}/amps/ags/license 2025-07-17 08:44:54 +00:00
tathagta15
4584516fb4 file:${project.basedir}/license 2025-07-17 08:41:51 +00:00
tathagta15
6abe9fc522 changed path 2025-07-17 08:25:30 +00:00
tathagta15
c28a9f69a2 provided path 2025-07-17 08:08:14 +00:00
tathagta15
40ea1a17b4 provided hardcoded path 2025-07-17 07:57:06 +00:00
tathagta15
bae42fb518 removed file 2025-07-17 07:05:12 +00:00
tathagta15
c868e6879a fixed licenseResolver path 2025-07-17 06:44:32 +00:00
tathagta15
6188cbe354 changed path 2025-07-17 06:25:49 +00:00
tathagta15
a80cbdbf40 changed path format 2025-07-17 06:12:23 +00:00
tathagta15
9a138f6768 fixed paths 2025-07-17 05:54:05 +00:00
tathagta15
e4c1ce675a fixed license paths 2025-07-17 05:18:21 +00:00
tathagta15
021423ec67 fixed paths 2025-07-16 19:39:08 +00:00
tathagta15
ac0004991c updated path 2025-07-16 19:20:06 +00:00
tathagta15
8e30709240 updated license path 2025-07-16 19:18:06 +00:00
tathagta15
028c8b78cb updated descriptionTemplate path 2025-07-16 18:44:17 +00:00
tathagta15
62d39d1594 added license name 2025-07-16 18:24:20 +00:00
tathagta15
2fcfae5aad fixed the license path 2025-07-16 18:00:08 +00:00
tathagta15
02c7dd982f removed license name 2025-07-16 17:40:57 +00:00
tathagta15
6f9416bc45 checks for the ags repo with wrong header 2025-07-16 17:15:01 +00:00
tathagta15
7bbbcaa910 added changes 2025-07-16 10:47:16 +00:00
alfresco-build
2c2b51f47e [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-16 09:44:36 +00:00
alfresco-build
1e37b3308d [maven-release-plugin][skip ci] prepare release 25.3.0.1 2025-07-16 09:44:34 +00:00
jakubkochman
84a36d68d4 PRODSEC-10304 bumped spring.version to 6.2.8 (#3458) 2025-07-16 10:57:01 +02:00
bsayan2
40d475abf9 MNT-25150 NodePermissionAssessor.getOwner checks for owner aspect first (#3462) 2025-07-16 13:53:23 +05:30
Kacper Magdziarz
5d3f1f2402 Updating master branch to 25.3.0 after 25.2.0 ACS release [skip ci] 2025-07-16 09:47:47 +02:00
alfresco-build
2cd29d87ec [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-15 10:07:38 +00:00
alfresco-build
8f1631fb55 [maven-release-plugin][skip ci] prepare release 25.2.0.64 2025-07-15 10:07:35 +00:00
Piotr Żurek
5f6dced886 ACS-9809 Prepare for the GA release (#3476) 2025-07-15 11:09:43 +02:00
Sara
25fdc9ccc7 ACS-9822 Bump IE/SS to 2.0.16 (#3472) 2025-07-15 10:47:58 +02:00
alfresco-build
b6456cde34 [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-14 15:40:19 +00:00
alfresco-build
27b80d8adb [maven-release-plugin][skip ci] prepare release 25.2.0.63 2025-07-14 15:40:17 +00:00
Sara
536e12ff76 ACS-9809 Bump api-explorer to 25.2.0 and aos-module to 3.3.0 (#3471) 2025-07-14 15:48:05 +01:00
alfresco-build
96ab699ea8 [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-14 08:32:29 +00:00
alfresco-build
9630d4cb02 [maven-release-plugin][skip ci] prepare release 25.2.0.62 2025-07-14 08:32:26 +00:00
Arindam Roy
fe9175d959 [ACS-9820] Bump ATS to 4.2.0 (#3464) 2025-07-14 13:16:42 +05:30
alfresco-build
277d10133d [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-13 00:09:28 +00:00
alfresco-build
3fb964a460 [maven-release-plugin][skip ci] prepare release 25.2.0.61 2025-07-13 00:09:26 +00:00
Alfresco CI User
d630dcb7af [force] Force release for 2025-07-13. 2025-07-13 00:05:36 +00:00
alfresco-build
7a673966aa [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-06 00:09:19 +00:00
alfresco-build
65d2863b9d [maven-release-plugin][skip ci] prepare release 25.2.0.60 2025-07-06 00:09:16 +00:00
Alfresco CI User
56ef484ae0 [force] Force release for 2025-07-06. 2025-07-06 00:05:32 +00:00
alfresco-build
d619d5365e [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-04 11:14:42 +00:00
alfresco-build
7096276b02 [maven-release-plugin][skip ci] prepare release 25.2.0.59 2025-07-04 11:14:40 +00:00
bsayan2
c9a46e1a8a ACS-9788 test case to verify node content search (#3443) 2025-07-04 16:00:10 +05:30
alfresco-build
98f9175a13 [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-04 05:31:50 +00:00
alfresco-build
4e89b0a033 [maven-release-plugin][skip ci] prepare release 25.2.0.58 2025-07-04 05:31:48 +00:00
tathagta15
c6c0779984 [ACS-9821] Bump IE to 2.0.16-A2 (#3451) 2025-07-04 10:15:36 +05:30
alfresco-build
554b26e7e7 [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-03 18:46:41 +00:00
alfresco-build
93d704d44c [maven-release-plugin][skip ci] prepare release 25.2.0.57 2025-07-03 18:46:39 +00:00
Gerard Olenski
0916efad7c ACS-9819 Bump ATS (#3452) 2025-07-03 19:57:59 +02:00
alfresco-build
6169ec0095 [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-02 13:26:35 +00:00
alfresco-build
75ace2a268 [maven-release-plugin][skip ci] prepare release 25.2.0.56 2025-07-02 13:26:33 +00:00
Piotr Żurek
f489c4193b ACS-9808 Prepare for the Alpha release (#3447) 2025-07-02 14:41:13 +02:00
alfresco-build
71c3addf2d [maven-release-plugin][skip ci] prepare for next development iteration 2025-07-01 17:12:39 +00:00
alfresco-build
cc43f9338e [maven-release-plugin][skip ci] prepare release 25.2.0.55 2025-07-01 17:12:37 +00:00
jakubkochman
45ad5045b1 PRODSEC-10332 updated commons-fileupload2-jakarta to address cve (#3405) 2025-07-01 18:23:54 +02:00
alfresco-build
773f99453e [maven-release-plugin][skip ci] prepare for next development iteration 2025-06-29 00:08:25 +00:00
alfresco-build
538d269f66 [maven-release-plugin][skip ci] prepare release 25.2.0.54 2025-06-29 00:08:23 +00:00
Alfresco CI User
1dbf1c1314 [force] Force release for 2025-06-29. 2025-06-29 00:05:19 +00:00
alfresco-build
3969cd8f14 [maven-release-plugin][skip ci] prepare for next development iteration 2025-06-27 11:39:16 +00:00
alfresco-build
eaa11fcb34 [maven-release-plugin][skip ci] prepare release 25.2.0.53 2025-06-27 11:39:14 +00:00
jakubkochman
cd5c2227e2 PRODSEC-10332 updated commons-fileupload2-jakarta to address cve (#3403) 2025-06-27 12:54:27 +02:00
alfresco-build
757b26b1b8 [maven-release-plugin][skip ci] prepare for next development iteration 2025-06-26 13:26:27 +00:00
41 changed files with 197 additions and 68 deletions

View File

@@ -16,6 +16,10 @@ jobs:
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
with:
python-version: "3.9"
- name: Update copyright years
run: |
chmod +x scripts/hooks/update_year_in_license.sh
./scripts/hooks/update_year_in_license.sh
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
continue-on-error: true
with:

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>
@@ -61,36 +61,26 @@
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>first</id>
<id>check-headers</id>
<goals>
<goal>update-file-header</goal>
<goal>check-file-header</goal>
</goals>
<phase>none</phase>
<phase>validate</phase>
<configuration>
<licenseName>alfresco_community</licenseName>
<verbose>${license.verbose}</verbose>
<addSvnKeyWords>false</addSvnKeyWords>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<!-- header configuration -->
<organizationName>Alfresco Software Limited</organizationName>
<descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
<descriptionTemplate>${project.basedir}/license/description.ftl</descriptionTemplate>
<canUpdateCopyright>true</canUpdateCopyright>
<canUpdateDescription>true</canUpdateDescription>
<!-- license configuration -->
<licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
<!-- dry run options -->
<dryRun>${license.update.dryrun}</dryRun>
<licenseResolver>file:${project.basedir}/license</licenseResolver>
<failOnMissingHeader>true</failOnMissingHeader>
<failOnNotUptodateHeader>${license.failOnNotUptodateHeader}</failOnNotUptodateHeader>
<!-- default root -->
<roots>
<root>src</root>
<root>src</root>
</roots>
<!-- exclusions -->
<excludes>
<exclude>**/package-info.java</exclude>
<exclude>**/*.properties</exclude>
@@ -100,10 +90,16 @@
<exclude>**/*.txt</exclude>
<exclude>**/*.html</exclude>
</excludes>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-license-headers</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.15
SOLR6_TAG=2.0.16
POSTGRES_TAG=16.6
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* Copyright (C) 2005 - 2024 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
@@ -48,6 +48,7 @@ public class ExtendedFileFolderServiceImpl extends FileFolderServiceImpl
public FileInfo create(NodeRef parentNodeRef, String name, QName typeQName)
{
return create(parentNodeRef, name, typeQName, null);
}
@Override

View File

@@ -4,7 +4,7 @@
# Version label
version.major=25
version.minor=2
version.minor=3
version.revision=0
version.label=

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -33,4 +33,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface AlfrescoPublicApi
{}

View File

@@ -26,6 +26,7 @@ public class HttpClientException extends AlfrescoRuntimeException
public HttpClientException(String msgId)
{
super(msgId);
}
public HttpClientException(String msgId, Throwable cause)

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -9,6 +9,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
</project>

View File

@@ -1,6 +1,5 @@
# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
FROM alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux9@sha256:9622418e142fb4fe1c5320666ad61ea292bc5c98f3dd0b550b6add33d18f659f
FROM alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux9@sha256:00d89fb84bda7bb37c17b0117adb2cfe4f7cbddcd6c1e42b0a67ea8dbb41a734
# Set default docker_context.
ARG resource_path=target

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.15
SOLR6_TAG=2.0.16
POSTGRES_TAG=16.6
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<organization>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -0,0 +1,95 @@
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2025 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.search;
import static org.testng.Assert.*;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.Test;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.model.RestNodeModel;
import org.alfresco.utility.RetryOperation;
import org.alfresco.utility.Utility;
import org.alfresco.utility.model.ContentModel;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
public class NodeContentTest extends RestTest
{
@TestRail(section = {TestGroup.REST_API,
TestGroup.SEARCH}, executionType = ExecutionType.SANITY, description = "Check basic functionality of GET queries/sites")
@Test(groups = {TestGroup.REST_API, TestGroup.RATINGS, TestGroup.CORE})
public void testNodeContent() throws Exception
{
UserModel adminUser = dataContent.getAdminUser();
final String fileName = "nodecontent.pdf";
final String term = "babekyrtso";
FileModel fileModel = FileModel.getFileModelBasedOnTestDataFile(fileName);
restClient.authenticateUser(adminUser)
.configureRequestSpec()
.addMultiPart("filedata", fileModel.toFile());
RestNodeModel node = restClient.authenticateUser(adminUser).withCoreAPI().usingNode(ContentModel.my()).createNode();
restClient.assertStatusCodeIs(HttpStatus.CREATED);
SearchRequest query = new SearchRequest();
RestRequestQueryModel queryModel = new RestRequestQueryModel();
queryModel.setLanguage("afts");
queryModel.setQuery(term);
query.setQuery(queryModel);
RetryOperation op = () -> {
List<SearchNodeModel> entries = restClient.authenticateUser(adminUser)
.withSearchAPI()
.search(query).getEntries();
assertFalse(CollectionUtils.isEmpty(entries), "Search results should not be empty");
boolean fileFound = entries.stream()
.map(SearchNodeModel::getModel)
.anyMatch(e -> fileName.equals(e.getName()));
assertTrue(fileFound, "Search results should contain the file: " + fileName);
restClient.assertStatusCodeIs(HttpStatus.OK);
};
Utility.sleep(300, 100000, op);
restClient.authenticateUser(adminUser)
.withCoreAPI()
.usingNode(ContentModel.my())
.deleteNode(node);
restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT);
}
}

View File

@@ -15,6 +15,7 @@
<package name="org.alfresco.rest.people.*"/>
<package name="org.alfresco.rest.queries.*"/>
<package name="org.alfresco.rest.ratings.*"/>
<package name="org.alfresco.rest.search.*"/>
</packages>
</test>
</suite>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<properties>

22
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">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name>
@@ -24,7 +24,7 @@
<properties>
<acs.version.major>25</acs.version.major>
<acs.version.minor>2</acs.version.minor>
<acs.version.minor>3</acs.version.minor>
<acs.version.revision>0</acs.version.revision>
<acs.version.label />
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -51,19 +51,19 @@
<dependency.alfresco-server-root.version>7.0.2</dependency.alfresco-server-root.version>
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
<dependency.activiti.version>5.23.0</dependency.activiti.version>
<dependency.alfresco-transform-core.version>5.1.8-A.2</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.1.8-A.2</dependency.alfresco-transform-service.version>
<dependency.alfresco-transform-core.version>5.2.0</dependency.alfresco-transform-core.version>
<dependency.alfresco-transform-service.version>4.2.0</dependency.alfresco-transform-service.version>
<dependency.alfresco-greenmail.version>7.1</dependency.alfresco-greenmail.version>
<dependency.acs-event-model.version>1.0.2</dependency.acs-event-model.version>
<dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
<dependency.spring.version>6.2.2</dependency.spring.version>
<dependency.spring.version>6.2.8</dependency.spring.version>
<dependency.spring-security.version>6.3.9</dependency.spring-security.version>
<dependency.antlr.version>3.5.3</dependency.antlr.version>
<dependency.jackson.version>2.17.2</dependency.jackson.version>
<dependency.cxf.version>4.1.0</dependency.cxf.version>
<dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
<dependency.webscripts.version>10.0</dependency.webscripts.version>
<dependency.webscripts.version>10.2</dependency.webscripts.version>
<dependency.bouncycastle.version>1.79</dependency.bouncycastle.version>
<dependency.mockito-core.version>5.14.1</dependency.mockito-core.version>
<dependency.assertj.version>3.27.3</dependency.assertj.version>
@@ -115,8 +115,8 @@
<dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
<dependency.json-smart.version>2.5.2</dependency.json-smart.version>
<alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
<alfresco.aos-module.version>3.3.0-A1</alfresco.aos-module.version>
<alfresco.api-explorer.version>25.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.aos-module.version>3.3.0</alfresco.aos-module.version>
<alfresco.api-explorer.version>25.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
<alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
@@ -154,7 +154,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-community-repo</url>
<tag>25.2.0.52</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>
@@ -444,8 +444,8 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta</artifactId>
<version>2.0.0-M1</version>
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
<version>2.0.0-M4</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -30,7 +30,7 @@ import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.core.FileItemInput;
import org.apache.commons.fileupload2.core.FileItemInputIterator;
import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.Status;

View File

@@ -31,7 +31,7 @@ import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.fileupload2.core.FileItemInput;
import org.apache.commons.fileupload2.core.FileItemInputIterator;
import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.Status;

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>25.2.0.52</version>
<version>25.3.0.2-SNAPSHOT</version>
</parent>
<dependencies>
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta</artifactId>
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -115,15 +115,15 @@ public class NodePermissionAssessor
Set<QName> nodeAspects = nodeService.getAspects(node.getNodeRef());
String userName = null;
if (nodeAspects.contains(ContentModel.ASPECT_AUDITABLE))
{
userName = node.getAuditableProperties().getAuditCreator();
}
else if (nodeAspects.contains(ContentModel.ASPECT_OWNABLE))
if (nodeAspects.contains(ContentModel.ASPECT_OWNABLE))
{
Serializable owner = nodeService.getProperty(node.getNodeRef(), ContentModel.PROP_OWNER);
userName = DefaultTypeConverter.INSTANCE.convert(String.class, owner);
}
else if (nodeAspects.contains(ContentModel.ASPECT_AUDITABLE))
{
userName = node.getAuditableProperties().getAuditCreator();
}
return userName;
}

View File

@@ -3,7 +3,7 @@
repository.name=Main Repository
# Schema number
version.schema=20100
version.schema=20200
# Directory configuration

View File

@@ -0,0 +1,31 @@
#!/bin/bash
set -euo pipefail
CURRENT_YEAR=$(date +%Y)
# Collect staged .java files that are newly added (A) or modified (M)
FILES=$( (git diff --name-only --diff-filter=AM; git diff --cached --name-only --diff-filter=AM) | grep -E '\.java$' | sort -u )
for file in $FILES; do
# Skip if file doesn't exist (e.g., deleted in another branch)
[ -f "$file" ] || continue
# Check if the file contains a copyright line
if grep -qE "Copyright \(C\) [0-9]{4}(\s*-\s*[0-9]{4})? Alfresco Software Limited\.?" "$file"; then
# Replace the year or year range with updated range
sed -i.bak -E \
"s/(Copyright \(C\) )([0-9]{4})(\s*-\s*[0-9]{4})?( Alfresco Software Limited\.?)/\1\2 - $CURRENT_YEAR\4/g" \
"$file"
# Only stage the file if changes were actually made
if ! cmp -s "$file" "${file}.bak"; then
rm "${file}.bak"
git add "$file"
echo "✅ Updated $file"
else
rm "${file}.bak"
fi
fi
done
exit 0