From cce8ef50effe5d19c17fcfa8e4861e3f3236c76a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 22:52:29 +0000 Subject: [PATCH 001/148] Bump jakarta.xml.soap:jakarta.xml.soap-api from 2.0.1 to 3.0.2 Bumps [jakarta.xml.soap:jakarta.xml.soap-api](https://github.com/jakartaee/saaj-api) from 2.0.1 to 3.0.2. - [Release notes](https://github.com/jakartaee/saaj-api/releases) - [Commits](https://github.com/jakartaee/saaj-api/compare/2.0.1...3.0.2) --- updated-dependencies: - dependency-name: jakarta.xml.soap:jakarta.xml.soap-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8058a4af1..c3e62eca7a 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 4.0.0 4.0.3 3.0.1 - 2.0.1 + 3.0.2 2.1.1 2.0.1 3.0.0 From bf5032675f9bad04ac39fe45d8478cf704467a9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 22:55:03 +0000 Subject: [PATCH 002/148] Bump com.fasterxml.woodstox:woodstox-core from 6.5.1 to 7.0.0 Bumps [com.fasterxml.woodstox:woodstox-core](https://github.com/FasterXML/woodstox) from 6.5.1 to 7.0.0. - [Commits](https://github.com/FasterXML/woodstox/compare/woodstox-core-6.5.1...woodstox-core-7.0.0) --- updated-dependencies: - dependency-name: com.fasterxml.woodstox:woodstox-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- data-model/pom.xml | 2 +- repository/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data-model/pom.xml b/data-model/pom.xml index b5e884dc48..35fb3e6b09 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -132,7 +132,7 @@ com.fasterxml.woodstox woodstox-core - 6.5.1 + 7.0.0 diff --git a/repository/pom.xml b/repository/pom.xml index 7a0ac1881c..49480416a2 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -358,7 +358,7 @@ com.fasterxml.woodstox woodstox-core - 6.5.1 + 7.0.0 From ba61253c940463af7a4ea545cf7f9977e1692fe7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 01:06:14 +0000 Subject: [PATCH 003/148] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4870b158ad..14b13d13ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,7 @@ jobs: run: zip readable_output.zip results.json - name: Upload Artifact if: success() || failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Veracode Pipeline-Scan Results (Human Readable) path: readable_output.zip From fde025ad88343a5d87bec70497b005c700db5e8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:28:11 +0000 Subject: [PATCH 004/148] Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0 Bumps [jakarta.servlet:jakarta.servlet-api](https://github.com/eclipse-ee4j/servlet-api) from 6.0.0 to 6.1.0. - [Commits](https://github.com/eclipse-ee4j/servlet-api/commits) --- updated-dependencies: - dependency-name: jakarta.servlet:jakarta.servlet-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f625659952..d9c464de7a 100644 --- a/pom.xml +++ b/pom.xml @@ -797,7 +797,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 provided From 801b526b4aca9e36765c6ff689cd2611b1c80462 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:43:15 +0000 Subject: [PATCH 005/148] Bump joda-time:joda-time from 2.12.5 to 2.12.7 Bumps [joda-time:joda-time](https://github.com/JodaOrg/joda-time) from 2.12.5 to 2.12.7. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.12.5...v2.12.7) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f625659952..2b3dfd5a62 100644 --- a/pom.xml +++ b/pom.xml @@ -790,7 +790,7 @@ joda-time joda-time - 2.12.5 + 2.12.7 From 740bce8c8027b53a2641c501ad0d94f5a72ef725 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:44:00 +0000 Subject: [PATCH 006/148] Bump com.drewnoakes:metadata-extractor from 2.18.0 to 2.19.0 Bumps [com.drewnoakes:metadata-extractor](https://github.com/drewnoakes/metadata-extractor) from 2.18.0 to 2.19.0. - [Release notes](https://github.com/drewnoakes/metadata-extractor/releases) - [Commits](https://github.com/drewnoakes/metadata-extractor/compare/2.18.0...2.19.0) --- updated-dependencies: - dependency-name: com.drewnoakes:metadata-extractor dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f625659952..186f9e30d1 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ com.drewnoakes metadata-extractor - 2.18.0 + 2.19.0 From 9f1956b6326fd87b9f866223f93e00fb72fb29b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:51:51 +0000 Subject: [PATCH 007/148] Bump org.json:json from 20231013 to 20240303 Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20231013 to 20240303. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d9aa0a6d8..38fa3b5e02 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.78.1 5.12.0 3.26.3 - 20231013 + 20240303 2.12.0 2.16.1 2.10.1 From 22c94284ecb76dbf9443c075bc7b39aecfa95b7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:47:24 +0000 Subject: [PATCH 008/148] Bump com.github.docker-java:docker-java from 3.3.6 to 3.4.0 Bumps [com.github.docker-java:docker-java](https://github.com/docker-java/docker-java) from 3.3.6 to 3.4.0. - [Release notes](https://github.com/docker-java/docker-java/releases) - [Changelog](https://github.com/docker-java/docker-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/docker-java/docker-java/compare/3.3.6...3.4.0) --- updated-dependencies: - dependency-name: com.github.docker-java:docker-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 39810d09be..819a55ae8b 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 @@ -98,7 +98,7 @@ com.github.docker-java docker-java - 3.3.6 + 3.4.0 org.bouncycastle From dcc6f23548cfc7f1ccdd1977893a23137ebf4ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:42:49 +0000 Subject: [PATCH 009/148] Bump commons-codec:commons-codec from 1.17.0 to 1.17.1 Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.17.0 to 1.17.1. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.17.0...rel/commons-codec-1.17.1) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ade49d29e4..45be93f7a7 100644 --- a/pom.xml +++ b/pom.xml @@ -411,7 +411,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 commons-lang From 01c347673d90e95913413eeaaed39daed1b107fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 08:24:02 +0000 Subject: [PATCH 010/148] Bump dependency.jackson.version from 2.15.2 to 2.17.2 Bumps `dependency.jackson.version` from 2.15.2 to 2.17.2. Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.15.2...jackson-core-2.17.2) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-joda` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-datatype-joda/compare/jackson-datatype-joda-2.15.2...jackson-datatype-joda-2.17.2) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.15.2...jackson-dataformats-text-2.17.2) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.module:jackson-module-jaxb-annotations` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.15.2...jackson-modules-base-2.17.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-joda dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f48538e6a..bee4fb45d8 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 6.0.19 6.3.1 3.5.3 - 2.15.2 + 2.17.2 4.0.5 1.0.0-jakarta-1 9.0 From d72b8c411a68029197c0f11bcfe5710e44778d0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:36:30 +0000 Subject: [PATCH 011/148] Bump org.mybatis:mybatis from 3.5.13 to 3.5.16 Bumps [org.mybatis:mybatis](https://github.com/mybatis/mybatis-3) from 3.5.13 to 3.5.16. - [Release notes](https://github.com/mybatis/mybatis-3/releases) - [Commits](https://github.com/mybatis/mybatis-3/compare/mybatis-3.5.13...mybatis-3.5.16) --- updated-dependencies: - dependency-name: org.mybatis:mybatis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index edef72bdea..e248e75c30 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -397,7 +397,7 @@ org.mybatis mybatis - 3.5.13 + 3.5.16 org.mybatis From d33dc8e1d44b70e651422514f28603258346fe3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:37:49 +0000 Subject: [PATCH 012/148] Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.3.0 to 3.5.0 Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.3.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.3.0...enforcer-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4979079e34..6160c635e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1090,7 +1090,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.5.0 enforce-banned-dependencies From be0ea5b24784aad57249d1b3d3626a2753b3aa6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:37:57 +0000 Subject: [PATCH 013/148] Bump org.codehaus.mojo:license-maven-plugin from 2.0.1 to 2.4.0 Bumps [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 2.0.1 to 2.4.0. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/2.0.1...2.4.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4979079e34..5998a9567b 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 23.2.0 2.2.0 - 2.0.1 + 2.4.0 42.6.0 8.0.30 From 738a77301af30311f56b40c1fbfd938108889bb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:37:59 +0000 Subject: [PATCH 014/148] Bump org.apache.maven.plugins:maven-war-plugin from 3.3.2 to 3.4.0 Bumps [org.apache.maven.plugins:maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.3.2 to 3.4.0. - [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.3.2...maven-war-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-war-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4979079e34..6320096c2e 100644 --- a/pom.xml +++ b/pom.xml @@ -1020,7 +1020,7 @@ maven-war-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins From d098508e532202989682105b6af4a2ea946ae8ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:46:07 +0000 Subject: [PATCH 015/148] Bump org.eclipse.parsson:parsson from 1.1.6 to 1.1.7 Bumps [org.eclipse.parsson:parsson](https://github.com/eclipse-ee4j/parsson) from 1.1.6 to 1.1.7. - [Release notes](https://github.com/eclipse-ee4j/parsson/releases) - [Commits](https://github.com/eclipse-ee4j/parsson/compare/1.1.6...1.1.7) --- updated-dependencies: - dependency-name: org.eclipse.parsson:parsson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afb283668d..6b849b1d13 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 3.1.0 1.2.0 2.1.3 - 1.1.6 + 1.1.7 2.9.0 2.5.1 4.1.0 From ce39a66934cbddc9c63ac4b00d2c080fc192eb62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 23:03:14 +0000 Subject: [PATCH 016/148] Bump org.awaitility:awaitility from 4.2.1 to 4.2.2 Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.1...awaitility-4.2.2) --- updated-dependencies: - dependency-name: org.awaitility:awaitility dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8049b6891..01b90a0dc8 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 4.1.110.Final 5.18.3 1.26.2 - 4.2.1 + 4.2.2 4.1.3 1.0.71 3.1.1 From 0a46ec0ab25081e6d7dfe822a87b021d0dc0b10e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 22:14:19 +0000 Subject: [PATCH 017/148] Bump org.slf4j:slf4j-api from 2.0.13 to 2.0.16 Bumps org.slf4j:slf4j-api from 2.0.13 to 2.0.16. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4069d8dd13..5aeb850170 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 5.2.5 3.1-HTTPCLIENT-1265 2.12.2 - 2.0.13 + 2.0.16 2.23.1 3.0.22 2.9.2 From b9e76970f9533ccf85ecbf49bec78cc56019f3fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:44:12 +0000 Subject: [PATCH 018/148] Bump com.google.guava:guava from 33.2.1-jre to 33.3.0-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ffcf8606c..8f490035cd 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 2.12.0 2.16.1 2.11.0 - 33.2.1-jre + 33.3.0-jre 4.5.14 4.4.16 5.2.1 From 4cb220de660fe1d892aa34b9489bb8986e912c6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:33:49 +0100 Subject: [PATCH 019/148] Bump org.postgresql:postgresql from 42.7.3 to 42.7.4 (#2869) Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c40051930..1565e8c6ac 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 2.2.0 2.4.0 - 42.7.3 + 42.7.4 8.0.30 8 2.7.4 From d4883af0d03550de7ccd0a2599d73d5f7dc49518 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:34:06 +0100 Subject: [PATCH 020/148] Bump org.mockito:mockito-core from 5.12.0 to 5.13.0 (#2884) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.12.0...v5.13.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1565e8c6ac..75e69472a0 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 1.0.0-jakarta-1 9.0 1.78.1 - 5.12.0 + 5.13.0 3.26.3 20240303 2.12.0 From 8dcc19cc63f663b52ee8b5e67ae0ec62ba3b7172 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:34:55 +0100 Subject: [PATCH 021/148] Bump org.yaml:snakeyaml from 2.2 to 2.3 (#2892) Bumps [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 2.2 to 2.3. - [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.3..snakeyaml-2.2) --- updated-dependencies: - dependency-name: org.yaml:snakeyaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75e69472a0..8097f963d7 100644 --- a/pom.xml +++ b/pom.xml @@ -573,7 +573,7 @@ org.yaml snakeyaml - 2.2 + 2.3 com.fasterxml.jackson.core From 1dc07205828c495f0e2985249cb56f88311c2474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:35:10 +0100 Subject: [PATCH 022/148] Bump org.codehaus.mojo:buildnumber-maven-plugin from 3.2.0 to 3.2.1 (#2895) Bumps [org.codehaus.mojo:buildnumber-maven-plugin](https://github.com/mojohaus/buildnumber-maven-plugin) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/mojohaus/buildnumber-maven-plugin/releases) - [Commits](https://github.com/mojohaus/buildnumber-maven-plugin/compare/3.2.0...3.2.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:buildnumber-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packaging/war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0c4694c4c8..55c40d061c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -140,7 +140,7 @@ org.codehaus.mojo buildnumber-maven-plugin - 3.2.0 + 3.2.1 validate From f1d92034304c3d100211e781731665b73def8ebc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:35:29 +0100 Subject: [PATCH 023/148] Bump org.eclipse.jetty:jetty-webapp from 11.0.22 to 11.0.24 (#2896) Bumps org.eclipse.jetty:jetty-webapp from 11.0.22 to 11.0.24. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- remote-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1d53f771c6..2eb073a593 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -137,7 +137,7 @@ org.eclipse.jetty jetty-webapp - 11.0.22 + 11.0.24 test From 945fe52df944cf66741f2fc672299af033b835b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:35:44 +0100 Subject: [PATCH 024/148] Bump io.netty:netty-bom from 4.1.110.Final to 4.1.113.Final (#2899) Bumps [io.netty:netty-bom](https://github.com/netty/netty) from 4.1.110.Final to 4.1.113.Final. - [Commits](https://github.com/netty/netty/compare/netty-4.1.110.Final...netty-4.1.113.Final) --- updated-dependencies: - dependency-name: io.netty:netty-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8097f963d7..83257d42a8 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 5.2.5 3.5.0.Final 4.6.0 - 4.1.110.Final + 4.1.113.Final 5.18.3 1.26.2 4.2.2 From 54d122ccc1a4db737e51e5c72d183e0e4bcbbe53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:44:21 +0100 Subject: [PATCH 025/148] Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 (#2888) Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packaging/tests/tas-restapi/pom.xml | 2 +- repository/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index bfaf5bf989..1357402b9e 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -17,7 +17,7 @@ UTF-8 master 4.5.6 - 3.14.0 + 3.17.0 8.3.3 17 diff --git a/repository/pom.xml b/repository/pom.xml index 88d57be014..d31519e094 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -94,7 +94,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.17.0 commons-codec From fe5a1d8436ce94115b942f05c24b9917b85881a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:48:02 +0100 Subject: [PATCH 026/148] Bump org.apache.santuario:xmlsec from 3.0.3 to 4.0.2 (#2468) Bumps org.apache.santuario:xmlsec from 3.0.3 to 4.0.2. --- updated-dependencies: - dependency-name: org.apache.santuario:xmlsec dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- remote-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2eb073a593..fa71c1c0ac 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -45,7 +45,7 @@ org.apache.santuario xmlsec - 3.0.3 + 4.0.2 From ed706aa5d32544231151b2f2f3a9a5d8ce59829b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:35:27 +0000 Subject: [PATCH 027/148] [maven-release-plugin][skip ci] prepare release 23.4.0.9 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index ac447d0d01..4a9cef1564 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2c76755c10..054fcbf931 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 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 af54347d31..7e91e1f786 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 94ae73b734..d42c0cda80 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 6fa62a2ce8..ce1d594454 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 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 148033e867..f37d6a1a01 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/amps/pom.xml b/amps/pom.xml index b39dbf0d03..6f6909692f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index d598f95196..5bcb565948 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/core/pom.xml b/core/pom.xml index 8c09e7e63b..c74217c5a0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/data-model/pom.xml b/data-model/pom.xml index c0a377ac7f..4fbfbead75 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/mmt/pom.xml b/mmt/pom.xml index 2a8fa687ab..7eeae8bc18 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 281036569c..aef3e042b7 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0e9e9b2a39..32d3c944cd 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/pom.xml b/packaging/pom.xml index 2ef99abd44..2163d71aa9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 24a51a3d3a..7bafc35a62 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 92ac9099ff..8c488e0f3a 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9cb636a24b..5cd0cf6de1 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 762cc05fd9..12b6114131 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 1357402b9e..59cc3b3b99 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7d289d5e26..7ecea2b7b9 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 - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 55c40d061c..d6ad502994 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/pom.xml b/pom.xml index 83257d42a8..2d70929c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.9 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index fa71c1c0ac..051b017b00 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 diff --git a/repository/pom.xml b/repository/pom.xml index d31519e094..4d17cf4a9a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9-SNAPSHOT + 23.4.0.9 From 168aae1a3db3217af37ecdf28ba584251f53ffb4 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:35:29 +0000 Subject: [PATCH 028/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 4a9cef1564..2638294241 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 054fcbf931..72c2a4d9ab 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 - 23.4.0.9 + 23.4.0.10-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 7e91e1f786..4db74ff378 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d42c0cda80..74a453a9d7 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index ce1d594454..9bd2f41917 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 - 23.4.0.9 + 23.4.0.10-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 f37d6a1a01..d807af20a4 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 6f6909692f..a16617054b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5bcb565948..06c49d3e71 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c74217c5a0..b9070cb412 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 4fbfbead75..5c954af44f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 7eeae8bc18..ba431c130f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index aef3e042b7..6975f0e985 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 32d3c944cd..bab29af49b 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 2163d71aa9..589d7f61b5 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7bafc35a62..92a53ea309 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8c488e0f3a..685bdacf78 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5cd0cf6de1..55aa7876f0 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 12b6114131..aec7206efb 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 59cc3b3b99..7e7fb60f5c 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7ecea2b7b9..c5e97848ed 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 - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d6ad502994..eed58125ed 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2d70929c4e..a7e2edf7de 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.9 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 051b017b00..75f9a73b07 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 4d17cf4a9a..d9ae68c444 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.9 + 23.4.0.10-SNAPSHOT From ef878fe20f2eae435afb9094e9da68c03a4dd556 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:43:19 +0100 Subject: [PATCH 029/148] Bump org.apache.httpcomponents.client5:httpclient5 from 5.2.1 to 5.3.1 (#2416) Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.2.1 to 5.3.1. - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.3.1/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.2.1...rel/v5.3.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7e2edf7de..91e9a56e66 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 33.3.0-jre 4.5.14 4.4.16 - 5.2.1 + 5.3.1 5.2.5 3.1-HTTPCLIENT-1265 2.12.2 From 87f31c5a3ae67d5a4794b02c8eb86e5cc35a1e7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:43:29 +0100 Subject: [PATCH 030/148] Bump jakarta.annotation:jakarta.annotation-api from 2.1.1 to 3.0.0 (#2574) Bumps [jakarta.annotation:jakarta.annotation-api](https://github.com/jakartaee/common-annotations-api) from 2.1.1 to 3.0.0. - [Commits](https://github.com/jakartaee/common-annotations-api/compare/2.1.1...3.0.0) --- updated-dependencies: - dependency-name: jakarta.annotation:jakarta.annotation-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91e9a56e66..b0bbe6988f 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 4.0.5 3.0.1 3.0.2 - 2.1.1 + 3.0.0 2.0.1 3.0.0 2.0.1 From a18861a4f674cdb870038feff7834d13e43fa4db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:26:07 +0100 Subject: [PATCH 031/148] Bump dependency.webscripts.version from 9.0 to 9.2 (#2569) Bumps `dependency.webscripts.version` from 9.0 to 9.2. Updates `org.alfresco.surf:spring-surf-core-configservice` from 9.0 to 9.2 Updates `org.alfresco.surf:spring-webscripts` from 9.0 to 9.2 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-9.0...spring-surf-webscripts-parent-9.2) Updates `org.alfresco.surf:spring-webscripts-api` from 9.0 to 9.2 --- updated-dependencies: - dependency-name: org.alfresco.surf:spring-surf-core-configservice dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Page --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b0bbe6988f..75c3d28552 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 2.17.2 4.0.5 1.0.0-jakarta-1 + 9.2 9.0 1.78.1 5.13.0 From 8a731dce40a8844441ab1ba4ac1437a16b7fef44 Mon Sep 17 00:00:00 2001 From: Manish Kumar <110275771+code4uuuu@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:21:41 +0530 Subject: [PATCH 032/148] Revert "[MNT-23264] script execution error (#2900)" (#2912) This reverts commit 58bad96724be3c9bdde58f940e82c1353313ef07. --- .../repo/action/executer/ScriptActionExecuter.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java index 1a231d61de..b8458fa60d 100644 --- a/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java +++ b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java @@ -46,8 +46,6 @@ import org.alfresco.service.cmr.repository.ScriptLocation; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.util.UrlUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Action to execute a JavaScript. The script has access to the default model. @@ -58,10 +56,8 @@ import org.slf4j.LoggerFactory; */ public class ScriptActionExecuter extends ActionExecuterAbstractBase { - private static final Logger LOGGER = LoggerFactory.getLogger(ScriptActionExecuter.class); public static final String NAME = "script"; public static final String PARAM_SCRIPTREF = "script-ref"; - private static final String SYSTEM_USER = "System"; private ServiceRegistry serviceRegistry; private SysAdminParams sysAdminParams; @@ -156,11 +152,6 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase { // get the references we need to build the default scripting data-model String userName = this.serviceRegistry.getAuthenticationService().getCurrentUserName(); - if (SYSTEM_USER.equals(userName)) - { - LOGGER.info("Skipping Script Execution for the System user."); - return; - } NodeRef personRef = this.personService.getPerson(userName); NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER); From 22b6131f930bd65b50bc48f050ae880b3fb94550 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:04:53 +0100 Subject: [PATCH 033/148] Bump dependency.log4j.version from 2.23.1 to 2.24.0 (#2904) Bumps `dependency.log4j.version` from 2.23.1 to 2.24.0. Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.23.1 to 2.24.0 Updates `org.apache.logging.log4j:log4j-api` from 2.23.1 to 2.24.0 Updates `org.apache.logging.log4j:log4j-core` from 2.23.1 to 2.24.0 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75c3d28552..1b76b2f743 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 - 2.23.1 + 2.24.0 3.0.22 2.9.2 7.7.10 From 8abf1c3d36eebb1fef59156bb8666cf5cc417209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:05:40 +0100 Subject: [PATCH 034/148] Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 (#2863) Bumps org.apache.commons:commons-compress from 1.26.2 to 1.27.1. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b76b2f743..395515fe62 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 4.6.0 4.1.113.Final 5.18.3 - 1.26.2 + 1.27.1 4.2.2 4.1.3 1.0.71 From 1ba62b2a4c93948961daddd59bbeaf1d9d802e2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:05:58 +0100 Subject: [PATCH 035/148] Bump org.mybatis:mybatis-spring from 3.0.3 to 3.0.4 (#2851) Bumps [org.mybatis:mybatis-spring](https://github.com/mybatis/spring) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/mybatis/spring/releases) - [Commits](https://github.com/mybatis/spring/compare/mybatis-spring-3.0.3...mybatis-spring-3.0.4) --- updated-dependencies: - dependency-name: org.mybatis:mybatis-spring dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index d9ae68c444..02c9540f2d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -402,7 +402,7 @@ org.mybatis mybatis-spring - 3.0.3 + 3.0.4 From 5555ee68719a9e009c3bd06a60b8bc7bfd076266 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:06:25 +0100 Subject: [PATCH 036/148] Bump com.networknt:json-schema-validator from 1.5.0 to 1.5.1 (#2829) Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](https://github.com/networknt/json-schema-validator/compare/1.5.0...1.5.1) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 395515fe62..1ffffa9c32 100644 --- a/pom.xml +++ b/pom.xml @@ -701,7 +701,7 @@ com.networknt json-schema-validator - 1.5.0 + 1.5.1 From d4a8ef24424e121482d13b7e454908355cf69c8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:06:46 +0100 Subject: [PATCH 037/148] Bump dependency.poi.version from 5.2.5 to 5.3.0 (#2825) Bumps `dependency.poi.version` from 5.2.5 to 5.3.0. Updates `org.apache.poi:poi` from 5.2.5 to 5.3.0 Updates `org.apache.poi:poi-ooxml` from 5.2.5 to 5.3.0 Updates `org.apache.poi:poi-scratchpad` from 5.2.5 to 5.3.0 --- updated-dependencies: - dependency-name: org.apache.poi:poi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.poi:poi-ooxml dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.poi:poi-scratchpad dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ffffa9c32..9695345937 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.0.22 2.9.2 7.7.10 - 5.2.5 + 5.3.0 3.5.0.Final 4.6.0 4.1.113.Final From 5a0aadb425ef65fa971ea74d4050195c7ae90be4 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 15 Sep 2024 00:04:24 +0000 Subject: [PATCH 038/148] [force] Force release for 2024-09-15. From 40036caae48398eef38c3b2aaea25098ee8b25c5 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:08:42 +0000 Subject: [PATCH 039/148] [maven-release-plugin][skip ci] prepare release 23.4.0.10 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2638294241..13cdf24afb 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 72c2a4d9ab..9af571cf0e 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 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 4db74ff378..8800f326f6 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 74a453a9d7..e59d5ff4da 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9bd2f41917..062b652919 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 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 d807af20a4..1ac3bcfeb0 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/amps/pom.xml b/amps/pom.xml index a16617054b..fe5ec9e54a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 06c49d3e71..f9cf15a557 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/core/pom.xml b/core/pom.xml index b9070cb412..67f038384e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/data-model/pom.xml b/data-model/pom.xml index 5c954af44f..a7c47e87c5 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/mmt/pom.xml b/mmt/pom.xml index ba431c130f..72e38bb823 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6975f0e985..e92111bc6f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index bab29af49b..1e29cf9b22 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/pom.xml b/packaging/pom.xml index 589d7f61b5..8b539ff0ac 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 92a53ea309..5e5501c353 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 685bdacf78..67830568ca 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 55aa7876f0..54f8b8c213 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index aec7206efb..4934863ace 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7e7fb60f5c..4ad72a0cf2 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c5e97848ed..8484b088df 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 - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index eed58125ed..cf837a95e1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/pom.xml b/pom.xml index 9695345937..040a15101a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.10 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 75f9a73b07..542eb863c4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 diff --git a/repository/pom.xml b/repository/pom.xml index 02c9540f2d..f8cef3c678 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10-SNAPSHOT + 23.4.0.10 From 91adfe22d74bd5d993f20d20e9411d631447164e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:08:45 +0000 Subject: [PATCH 040/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 13cdf24afb..c662c52f39 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9af571cf0e..10ddb917b4 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 - 23.4.0.10 + 23.4.0.11-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 8800f326f6..dfd247217b 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e59d5ff4da..f956b8ea89 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 062b652919..b936b48874 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 - 23.4.0.10 + 23.4.0.11-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 1ac3bcfeb0..6d2ca8e852 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index fe5ec9e54a..030eff2010 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f9cf15a557..9be9832385 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 67f038384e..7dc2c8aa98 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a7c47e87c5..be5df2e704 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 72e38bb823..2c4dbbe36b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e92111bc6f..7a477971cc 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 1e29cf9b22..f9463820fe 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 8b539ff0ac..c91eeab423 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 5e5501c353..c17b514d6a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 67830568ca..7e37bb0e8f 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 54f8b8c213..a0a08e3107 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4934863ace..f5d709a0f8 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 4ad72a0cf2..ec63ccf8cc 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 8484b088df..71cd81d32a 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 - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index cf837a95e1..d2cdfb6e60 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/pom.xml b/pom.xml index 040a15101a..c8fca97a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.10 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 542eb863c4..73e6ff772f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index f8cef3c678..b040f4b9da 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.10 + 23.4.0.11-SNAPSHOT From 6c0b29ec3d3c2a4992f5328d68a0a0cd49ea450c Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 16 Sep 2024 10:18:25 +0100 Subject: [PATCH 041/148] Revert "Bump org.apache.httpcomponents.client5:httpclient5 from 5.2.1 to 5.3.1 (#2416)" This reverts commit ef878fe20f2eae435afb9094e9da68c03a4dd556. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8fca97a9f..be3ff41fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 33.3.0-jre 4.5.14 4.4.16 - 5.3.1 + 5.2.1 5.2.5 3.1-HTTPCLIENT-1265 2.12.2 From 57d8f4bab78643ba79345906d3ef893187835e91 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:11:44 +0000 Subject: [PATCH 042/148] [maven-release-plugin][skip ci] prepare release 23.4.0.11 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index c662c52f39..79597558a6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 10ddb917b4..9d19959d1e 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 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 dfd247217b..a945a74db2 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index f956b8ea89..1c4e6b293e 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b936b48874..c606c80896 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 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 6d2ca8e852..1c9ce3d584 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/amps/pom.xml b/amps/pom.xml index 030eff2010..264e3100ce 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9be9832385..45814115db 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/core/pom.xml b/core/pom.xml index 7dc2c8aa98..a1d0ad9fdd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/data-model/pom.xml b/data-model/pom.xml index be5df2e704..5f2227ef1a 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/mmt/pom.xml b/mmt/pom.xml index 2c4dbbe36b..40f406870d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7a477971cc..07e56dff2d 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index f9463820fe..083d8ce0e8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/pom.xml b/packaging/pom.xml index c91eeab423..692cdfcaf5 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c17b514d6a..56441d08f8 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7e37bb0e8f..44f74d9903 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a0a08e3107..87a0c38541 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f5d709a0f8..e6b8d69c04 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index ec63ccf8cc..b67d428bb5 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 71cd81d32a..c63e0aead8 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 - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d2cdfb6e60..1414c402a8 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/pom.xml b/pom.xml index be3ff41fcb..20a921e571 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.11 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 73e6ff772f..602f34968b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 diff --git a/repository/pom.xml b/repository/pom.xml index b040f4b9da..673dec9fab 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11-SNAPSHOT + 23.4.0.11 From 7491ba5156960632f6a1c818d682fa03f013c2f0 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:11:46 +0000 Subject: [PATCH 043/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 79597558a6..782abe85c2 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9d19959d1e..b3f161c1af 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 - 23.4.0.11 + 23.4.0.12-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 a945a74db2..40a3053eb7 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1c4e6b293e..52377adffe 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index c606c80896..484a2ae617 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 - 23.4.0.11 + 23.4.0.12-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 1c9ce3d584..91e1a6a02b 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 264e3100ce..70bd3a5049 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 45814115db..d0aedb96b1 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index a1d0ad9fdd..e4ea035454 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 5f2227ef1a..1424814ad2 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 40f406870d..7239201c13 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 07e56dff2d..7dca013d88 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 083d8ce0e8..a6bfa52743 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 692cdfcaf5..d7c547aaf0 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 56441d08f8..c4ae7057f5 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 44f74d9903..97f52260f8 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 87a0c38541..5daf53c991 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index e6b8d69c04..ceeda13c23 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b67d428bb5..5ebebc2db0 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c63e0aead8..76d9384e56 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 - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 1414c402a8..2855dcfd69 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/pom.xml b/pom.xml index 20a921e571..ebf5a42270 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.11 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 602f34968b..bea5bb581c 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 673dec9fab..045b2f8272 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.11 + 23.4.0.12-SNAPSHOT From b4c18c9902f0fb1357b822cb294e5f32eb89d2b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:45:24 +0200 Subject: [PATCH 044/148] Bump dependency.spring.version from 6.0.19 to 6.1.13 (#2909) * Bump dependency.spring.version from 6.0.19 to 6.1.13 Bumps `dependency.spring.version` from 6.0.19 to 6.1.13. Updates `org.springframework:spring-aop` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-beans` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-context` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-context-support` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-core` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-expression` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-jdbc` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-jms` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-test` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-orm` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-tx` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-web` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) Updates `org.springframework:spring-webmvc` from 6.0.19 to 6.1.13 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.0.19...v6.1.13) --- updated-dependencies: - dependency-name: org.springframework:spring-aop dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-expression dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-jdbc dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-jms dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-orm dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-tx dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Remove deprecated usage of notNull(Object) * ACS-8413: Fixing SPeL for List property. * Revert "[MNT-23264] script execution error (#2900)" (#2912) This reverts commit 58bad96724be3c9bdde58f940e82c1353313ef07. * ACS-8413: Changing keycloak setup in docker-compose. * ACS-8413: Revert: Changing keycloak setup in docker-compose. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Domenico Sibilio Co-authored-by: mpichura Co-authored-by: Manish Kumar <110275771+code4uuuu@users.noreply.github.com> --- pom.xml | 2 +- .../main/resources/alfresco/web-scripts-application-context.xml | 2 +- .../src/main/java/org/alfresco/repo/lock/LockServiceImpl.java | 2 +- scripts/ci/docker-compose/docker-compose.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ebf5a42270..7c5c02ca9f 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 0.0.27 1.9.22.1 - 6.0.19 + 6.1.13 6.3.1 3.5.3 2.17.2 diff --git a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml index f255f96162..c220f74010 100644 --- a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml +++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml @@ -250,7 +250,7 @@ - + diff --git a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java index df0d2ea0b9..41b670c545 100644 --- a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java @@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService, } // Never return a null LockState - Assert.notNull(lockState); + Assert.notNull(lockState, "The lockState should not be null"); return lockState; } diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index bf96f0d391..29604ba4bc 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -68,4 +68,4 @@ services: volumes: - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json ports: - - 8999:8080 \ No newline at end of file + - 8999:8080 From 5b31b22840f9a675a09c96b8a3951634ce522d61 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:23:33 +0000 Subject: [PATCH 045/148] [maven-release-plugin][skip ci] prepare release 23.4.0.12 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 782abe85c2..c4b5ec5d2a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b3f161c1af..e2e1938a5a 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 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 40a3053eb7..5bfc9b9693 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 52377adffe..adffc54a4d 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 484a2ae617..37f269dec2 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 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 91e1a6a02b..27770fd18b 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/amps/pom.xml b/amps/pom.xml index 70bd3a5049..b4534705b2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index d0aedb96b1..70aec1cdc3 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/core/pom.xml b/core/pom.xml index e4ea035454..b79f416e9a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/data-model/pom.xml b/data-model/pom.xml index 1424814ad2..f1c179274a 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/mmt/pom.xml b/mmt/pom.xml index 7239201c13..02af73a6a8 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7dca013d88..9304208f57 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a6bfa52743..0cc1262383 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/pom.xml b/packaging/pom.xml index d7c547aaf0..1bbff4460a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c4ae7057f5..7d1fa07795 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 97f52260f8..c7d376862a 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5daf53c991..57d621deb8 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ceeda13c23..24d1c8f414 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5ebebc2db0..175ea17ae8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 76d9384e56..b8d22cee0d 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 - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2855dcfd69..958500c09a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/pom.xml b/pom.xml index 7c5c02ca9f..644c9b24ed 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.12 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index bea5bb581c..3e2a088eb6 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 diff --git a/repository/pom.xml b/repository/pom.xml index 045b2f8272..a45fc48a95 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12-SNAPSHOT + 23.4.0.12 From 1766ac749d0adcf31e5731628d875ef4f575a921 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:23:36 +0000 Subject: [PATCH 046/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index c4b5ec5d2a..82bea72bcc 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e2e1938a5a..690c99b1a3 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 - 23.4.0.12 + 23.4.0.13-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 5bfc9b9693..ee735dd456 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index adffc54a4d..db58e523de 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 37f269dec2..4988d4e27f 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 - 23.4.0.12 + 23.4.0.13-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 27770fd18b..08510cecf0 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index b4534705b2..4c00d2c62a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 70aec1cdc3..78accd4fce 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index b79f416e9a..03ca229275 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index f1c179274a..4b2b258fcf 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 02af73a6a8..0549b03b3c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 9304208f57..b385c12cc3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0cc1262383..bdcfeec54a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 1bbff4460a..5f243529c5 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7d1fa07795..4b81a8618e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index c7d376862a..7ceb3ad5c1 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 57d621deb8..b6339dcbc1 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 24d1c8f414..58e69cb9a4 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 175ea17ae8..2e453cb9f9 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b8d22cee0d..9248468d6a 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 - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 958500c09a..00663a7e1f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/pom.xml b/pom.xml index 644c9b24ed..4ea4183243 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.12 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3e2a088eb6..13c78dc1d7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index a45fc48a95..8a0f76cb87 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.12 + 23.4.0.13-SNAPSHOT From 5399fed53b475dcd0b3393fa9123b50fad801369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:27:40 +0200 Subject: [PATCH 047/148] Bump org.apache.httpcomponents.core5:httpcore5 from 5.2.5 to 5.3 (#2911) Bumps [org.apache.httpcomponents.core5:httpcore5](https://github.com/apache/httpcomponents-core) from 5.2.5 to 5.3. - [Changelog](https://github.com/apache/httpcomponents-core/blob/master/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-core/compare/rel/v5.2.5...rel/v5.3) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.core5:httpcore5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ea4183243..8007ae62de 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 4.5.14 4.4.16 5.2.1 - 5.2.5 + 5.3 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 From f346992500091d12ead03eea76866fb102bb89bd Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:06:26 +0000 Subject: [PATCH 048/148] [maven-release-plugin][skip ci] prepare release 23.4.0.13 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 82bea72bcc..a5cb84b9ef 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 690c99b1a3..9a2d478fd3 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 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 ee735dd456..b403320910 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index db58e523de..aeed1ed22b 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4988d4e27f..35677d720c 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 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 08510cecf0..dfbc82c91d 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/amps/pom.xml b/amps/pom.xml index 4c00d2c62a..633224cf8e 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 78accd4fce..513cf79509 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/core/pom.xml b/core/pom.xml index 03ca229275..fefaca5746 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/data-model/pom.xml b/data-model/pom.xml index 4b2b258fcf..3b94096bd0 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/mmt/pom.xml b/mmt/pom.xml index 0549b03b3c..774f6c345f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index b385c12cc3..eaa44646a6 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index bdcfeec54a..0ac8928055 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/pom.xml b/packaging/pom.xml index 5f243529c5..836d0f5cd1 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4b81a8618e..bc1c16995c 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7ceb3ad5c1..5cd844445d 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b6339dcbc1..ca3c107b77 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 58e69cb9a4..0936a5ec15 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 2e453cb9f9..e223e22a22 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9248468d6a..8c6d59f2b1 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 - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 00663a7e1f..38fffac5fe 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/pom.xml b/pom.xml index 8007ae62de..723bc54adb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.13 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 13c78dc1d7..c47beba89f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 diff --git a/repository/pom.xml b/repository/pom.xml index 8a0f76cb87..1253e4a3b5 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13-SNAPSHOT + 23.4.0.13 From 8d72d662a0715dbcd6a33eab0dd84ffe11e54e56 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:06:28 +0000 Subject: [PATCH 049/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index a5cb84b9ef..34f020be63 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9a2d478fd3..a6dbc2dd04 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 - 23.4.0.13 + 23.4.0.14-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 b403320910..11905faa59 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index aeed1ed22b..438f5de2c4 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 35677d720c..d45e24b3f3 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 - 23.4.0.13 + 23.4.0.14-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 dfbc82c91d..bb692c1c7f 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 633224cf8e..e950d82ce2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 513cf79509..1938709289 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index fefaca5746..4a281e2f2a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 3b94096bd0..aac54f6bf3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 774f6c345f..2e8fccb258 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index eaa44646a6..cab3d92ccd 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0ac8928055..62dfdfd982 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 836d0f5cd1..44e0543b77 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bc1c16995c..6d4e6b537e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 5cd844445d..1d82c2b945 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index ca3c107b77..aec64e0519 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0936a5ec15..7992945076 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e223e22a22..0ab7739b5a 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 8c6d59f2b1..bdf718e2fb 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 - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 38fffac5fe..e92a1b08a0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/pom.xml b/pom.xml index 723bc54adb..ba476b9231 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.13 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c47beba89f..66fdd576e7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 1253e4a3b5..ba6af817de 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.13 + 23.4.0.14-SNAPSHOT From 1e16f74292ae02c4c8a86a2e34823b82ae31ed8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:26:12 +0200 Subject: [PATCH 050/148] Bump org.apache.maven.plugins:maven-failsafe-plugin from 2.22.2 to 3.5.0 (#2885) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.2...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba476b9231..b0458f7e6f 100644 --- a/pom.xml +++ b/pom.xml @@ -1013,7 +1013,7 @@ maven-failsafe-plugin - 2.22.2 + 3.5.0 maven-jar-plugin From ee1d33cb41d4b2ade25c1a014b3c4571c8a9273d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:27:24 +0200 Subject: [PATCH 051/148] Bump org.apache.maven.plugins:maven-dependency-plugin (#2868) Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.1...maven-dependency-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0458f7e6f..37481d0525 100644 --- a/pom.xml +++ b/pom.xml @@ -1036,7 +1036,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.0 maven-assembly-plugin From cb333d1c20ea123e0c0b0655fd55fc829ee5959b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:03:43 +0000 Subject: [PATCH 052/148] [maven-release-plugin][skip ci] prepare release 23.4.0.14 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 34f020be63..b528bea1c2 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index a6dbc2dd04..d9037d8623 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 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 11905faa59..cf5133fa29 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 438f5de2c4..769c70f3dc 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d45e24b3f3..ce825de178 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 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 bb692c1c7f..faa3297f14 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/amps/pom.xml b/amps/pom.xml index e950d82ce2..5e5f2fff02 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1938709289..ce67f21f23 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/core/pom.xml b/core/pom.xml index 4a281e2f2a..c267916c1b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/data-model/pom.xml b/data-model/pom.xml index aac54f6bf3..4ffc29a94a 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/mmt/pom.xml b/mmt/pom.xml index 2e8fccb258..912dce380f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index cab3d92ccd..2b8729e2df 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 62dfdfd982..ae380662d3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/pom.xml b/packaging/pom.xml index 44e0543b77..fdf8e76c82 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 6d4e6b537e..cc35e048a6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 1d82c2b945..8337fb46fb 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index aec64e0519..8c832138f1 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7992945076..b489e2db22 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 0ab7739b5a..91446622ef 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index bdf718e2fb..7ddd50ffb0 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 - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e92a1b08a0..66203ec549 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/pom.xml b/pom.xml index 37481d0525..f4063ff6bd 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.14 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 66fdd576e7..fb8cdb28bf 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 diff --git a/repository/pom.xml b/repository/pom.xml index ba6af817de..22d4a5f96d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14-SNAPSHOT + 23.4.0.14 From 98a978a4d11525bc65a1b1a3c250b4b1c08ea2ad Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:03:45 +0000 Subject: [PATCH 053/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index b528bea1c2..ec7069b161 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d9037d8623..45a204f88d 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 - 23.4.0.14 + 23.4.0.15-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 cf5133fa29..a15e8f4b3d 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 769c70f3dc..0f2735752a 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index ce825de178..97b922c773 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 - 23.4.0.14 + 23.4.0.15-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 faa3297f14..4dbe00ad9b 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 5e5f2fff02..1ba5878549 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ce67f21f23..f1a381b20e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c267916c1b..73c0b1c757 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 4ffc29a94a..60367feea2 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 912dce380f..ff84c5018a 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 2b8729e2df..1be619f67d 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ae380662d3..8cc7e5f535 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index fdf8e76c82..3da84beded 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index cc35e048a6..57e3287bce 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8337fb46fb..504592f23a 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 8c832138f1..da283adb90 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b489e2db22..5c686a1008 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 91446622ef..220106e405 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7ddd50ffb0..7737558ca1 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 - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 66203ec549..bb0ace3b4d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/pom.xml b/pom.xml index f4063ff6bd..bc3da28730 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.14 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index fb8cdb28bf..3a2f68f56d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 22d4a5f96d..1192b2127c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.14 + 23.4.0.15-SNAPSHOT From 3896979b6c5c123abc9f4dfd5bd3993c38d59ece Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:08:45 +0200 Subject: [PATCH 054/148] Bump dependency.webscripts.version from 9.0 to 9.2 (#2910) Bumps `dependency.webscripts.version` from 9.0 to 9.2. Updates `org.alfresco.surf:spring-surf-core-configservice` from 9.0 to 9.2 Updates `org.alfresco.surf:spring-webscripts` from 9.0 to 9.2 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-9.0...spring-surf-webscripts-parent-9.2) Updates `org.alfresco.surf:spring-webscripts-api` from 9.0 to 9.2 --- updated-dependencies: - dependency-name: org.alfresco.surf:spring-surf-core-configservice dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc3da28730..d207a95793 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 4.0.5 1.0.0-jakarta-1 9.2 - 9.0 + 9.2 1.78.1 5.13.0 3.26.3 From 8059ccad53ce228618b1d3288bb18b0d1eba1676 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:42:13 +0200 Subject: [PATCH 055/148] Bump org.owasp.encoder:encoder from 1.2.3 to 1.3.1 (#2865) Bumps [org.owasp.encoder:encoder](https://github.com/owasp/owasp-java-encoder) from 1.2.3 to 1.3.1. - [Release notes](https://github.com/owasp/owasp-java-encoder/releases) - [Commits](https://github.com/owasp/owasp-java-encoder/compare/v1.2.3...v1.3.1) --- updated-dependencies: - dependency-name: org.owasp.encoder:encoder dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packaging/war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index bb0ace3b4d..87ca685db2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -113,7 +113,7 @@ org.owasp.encoder encoder - 1.2.3 + 1.3.1 From 6238485d2b86dd94f4e9ec48f63d26f78ee6bade Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:43:55 +0000 Subject: [PATCH 056/148] [maven-release-plugin][skip ci] prepare release 23.4.0.15 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index ec7069b161..4a3cd6c75e 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 45a204f88d..31a1035263 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 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 a15e8f4b3d..93a193f5f9 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 0f2735752a..e356d22613 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 97b922c773..c5465642be 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 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 4dbe00ad9b..f4332e975a 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/amps/pom.xml b/amps/pom.xml index 1ba5878549..daa0bd4fc9 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f1a381b20e..2624df1da9 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/core/pom.xml b/core/pom.xml index 73c0b1c757..282552447c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/data-model/pom.xml b/data-model/pom.xml index 60367feea2..9019618d6c 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/mmt/pom.xml b/mmt/pom.xml index ff84c5018a..035e7bac48 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 1be619f67d..651bfbc2c3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8cc7e5f535..7740f24727 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/pom.xml b/packaging/pom.xml index 3da84beded..d410130e0a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 57e3287bce..f43c893722 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 504592f23a..98c09f04ca 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index da283adb90..f0b34e33e1 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 5c686a1008..71683f6fcb 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 220106e405..7260787d8b 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7737558ca1..9dbf3fcec9 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 - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 87ca685db2..d8d540d125 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/pom.xml b/pom.xml index d207a95793..d8811a4731 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.15 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3a2f68f56d..bacbc23767 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 diff --git a/repository/pom.xml b/repository/pom.xml index 1192b2127c..f37a87543a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15-SNAPSHOT + 23.4.0.15 From 7550799a269a823010c8292a1a7e3bd5d551e3ab Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:43:57 +0000 Subject: [PATCH 057/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 4a3cd6c75e..73d87aa6aa 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 31a1035263..e79d77ed67 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 - 23.4.0.15 + 23.4.0.16-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 93a193f5f9..a2cd31fd74 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e356d22613..1aa23e906e 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index c5465642be..5b6573cd34 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 - 23.4.0.15 + 23.4.0.16-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 f4332e975a..3131d089f1 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index daa0bd4fc9..38f08d74db 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2624df1da9..45bb6ca985 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 282552447c..ed0f04c48e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9019618d6c..5934adaf58 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 035e7bac48..9b3456c3d6 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 651bfbc2c3..f7511cc699 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 7740f24727..92f48ff6e4 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d410130e0a..d88f7145f1 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f43c893722..0106c11bce 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 98c09f04ca..f2ca96217f 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f0b34e33e1..59ee7c6b23 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 71683f6fcb..a28da4ad95 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7260787d8b..c4d447987d 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9dbf3fcec9..2f661b4102 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 - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d8d540d125..a400ffb8ca 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/pom.xml b/pom.xml index d8811a4731..81ee860c24 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.15 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index bacbc23767..a5de4b9182 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index f37a87543a..dfb6b9300f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.15 + 23.4.0.16-SNAPSHOT From ab1cce1fec33881b6df5d5f50f77854738cf8992 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:37:22 +0200 Subject: [PATCH 058/148] Bump joda-time:joda-time from 2.12.7 to 2.13.0 (#2917) Bumps [joda-time:joda-time](https://github.com/JodaOrg/joda-time) from 2.12.7 to 2.13.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/main/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.12.7...v2.13.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81ee860c24..1af1d056c8 100644 --- a/pom.xml +++ b/pom.xml @@ -791,7 +791,7 @@ joda-time joda-time - 2.12.7 + 2.13.0 From acb34b78610bfbe95d89225759bc004be33f1656 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:15:21 +0000 Subject: [PATCH 059/148] [maven-release-plugin][skip ci] prepare release 23.4.0.16 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 73d87aa6aa..9821752bae 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e79d77ed67..82baa1da93 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 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 a2cd31fd74..571e531039 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1aa23e906e..8d92a1365b 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5b6573cd34..9cc25d6d7e 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 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 3131d089f1..8271fc0ca3 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/amps/pom.xml b/amps/pom.xml index 38f08d74db..074a6f1ab6 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 45bb6ca985..f60a166ffe 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/core/pom.xml b/core/pom.xml index ed0f04c48e..02da4c032c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/data-model/pom.xml b/data-model/pom.xml index 5934adaf58..cd7d8aa3fe 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/mmt/pom.xml b/mmt/pom.xml index 9b3456c3d6..17c46f111a 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f7511cc699..af96a9c0e0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 92f48ff6e4..9da0c95457 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/pom.xml b/packaging/pom.xml index d88f7145f1..642d86c9af 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 0106c11bce..06e19c18be 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index f2ca96217f..fad766b363 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 59ee7c6b23..b723c6bb68 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a28da4ad95..1623d7a80e 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c4d447987d..c74bd09a46 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 2f661b4102..9d6217845b 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 - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a400ffb8ca..243703d3f9 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/pom.xml b/pom.xml index 1af1d056c8..a0d81afec3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.16 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a5de4b9182..4851a30bb3 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 diff --git a/repository/pom.xml b/repository/pom.xml index dfb6b9300f..94b22ab4bd 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16-SNAPSHOT + 23.4.0.16 From b1cf324289d1eeb47aaa28fe2e1b9f9766f12876 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:15:23 +0000 Subject: [PATCH 060/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 9821752bae..2306ce41a0 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 82baa1da93..8e35b4c1b4 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 - 23.4.0.16 + 23.4.0.17-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 571e531039..cf6b39e295 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8d92a1365b..74297d8e12 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9cc25d6d7e..33968c5501 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 - 23.4.0.16 + 23.4.0.17-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 8271fc0ca3..a5a03a8b36 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 074a6f1ab6..16cd74af63 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f60a166ffe..3d35cdbd6f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 02da4c032c..f92d40e981 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index cd7d8aa3fe..d9eecd5c40 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 17c46f111a..657f0ea9bd 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index af96a9c0e0..9cd6dd8d1d 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 9da0c95457..c0d0d9b461 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 642d86c9af..50f5843ee3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 06e19c18be..05475cb007 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index fad766b363..26474c2e91 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b723c6bb68..3321a11e12 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1623d7a80e..6717d82660 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c74bd09a46..137980cb61 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9d6217845b..3e8a603600 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 - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 243703d3f9..f00784f4ff 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/pom.xml b/pom.xml index a0d81afec3..8f022686f1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.16 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4851a30bb3..2000c1e0b4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 94b22ab4bd..7ef6d9b6ef 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.16 + 23.4.0.17-SNAPSHOT From ba323979ff627bedd1f4917946fe72b1699fc612 Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:13:40 +0200 Subject: [PATCH 061/148] Revert "Bump dependency.spring.version from 6.0.19 to 6.1.13 (#2909)" (#2919) This reverts commit b4c18c9902f0fb1357b822cb294e5f32eb89d2b0. --- pom.xml | 2 +- .../main/resources/alfresco/web-scripts-application-context.xml | 2 +- .../src/main/java/org/alfresco/repo/lock/LockServiceImpl.java | 2 +- scripts/ci/docker-compose/docker-compose.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8f022686f1..5bcefe51ee 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 0.0.27 1.9.22.1 - 6.1.13 + 6.0.19 6.3.1 3.5.3 2.17.2 diff --git a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml index c220f74010..f255f96162 100644 --- a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml +++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml @@ -250,7 +250,7 @@ - + diff --git a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java index 41b670c545..df0d2ea0b9 100644 --- a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java @@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService, } // Never return a null LockState - Assert.notNull(lockState, "The lockState should not be null"); + Assert.notNull(lockState); return lockState; } diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index 29604ba4bc..bf96f0d391 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -68,4 +68,4 @@ services: volumes: - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json ports: - - 8999:8080 + - 8999:8080 \ No newline at end of file From 6d0226916465c0a2f446a351b19c3027a9b6f569 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:50:29 +0000 Subject: [PATCH 062/148] [maven-release-plugin][skip ci] prepare release 23.4.0.17 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2306ce41a0..f3321d0e73 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 8e35b4c1b4..d6e8e6b571 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 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 cf6b39e295..aabba07555 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 74297d8e12..ef1d35af83 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 33968c5501..bb13573692 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 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 a5a03a8b36..0fbef43f4f 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/amps/pom.xml b/amps/pom.xml index 16cd74af63..994121abd9 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 3d35cdbd6f..ff6dd2711b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/core/pom.xml b/core/pom.xml index f92d40e981..78fb020416 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/data-model/pom.xml b/data-model/pom.xml index d9eecd5c40..d2aa702dfe 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/mmt/pom.xml b/mmt/pom.xml index 657f0ea9bd..7d834097e5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 9cd6dd8d1d..19e2992950 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c0d0d9b461..414a7b6023 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/pom.xml b/packaging/pom.xml index 50f5843ee3..016173b5cd 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 05475cb007..980f96e746 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 26474c2e91..53188c3654 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 3321a11e12..81d82a8ad0 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 6717d82660..8090816a5d 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 137980cb61..8e945a2d68 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 3e8a603600..6ad0a6c746 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 - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f00784f4ff..eba88b054a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/pom.xml b/pom.xml index 5bcefe51ee..a06f8f7a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.17 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2000c1e0b4..c03ab96461 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 diff --git a/repository/pom.xml b/repository/pom.xml index 7ef6d9b6ef..766abc0053 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17-SNAPSHOT + 23.4.0.17 From 7ce2349edc17b5bfbd52bc94f356a23bd66fa59a Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:50:32 +0000 Subject: [PATCH 063/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index f3321d0e73..22933aa2fb 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d6e8e6b571..fa58cc4845 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 - 23.4.0.17 + 23.4.0.18-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 aabba07555..4d0f4bcd31 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ef1d35af83..e261c948fb 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index bb13573692..5f30991976 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 - 23.4.0.17 + 23.4.0.18-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 0fbef43f4f..e9446c0769 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 994121abd9..9db4a4719d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ff6dd2711b..57095c7cb5 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 78fb020416..e931739d7f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index d2aa702dfe..ee34ebb944 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 7d834097e5..d6afa12ca2 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 19e2992950..af0a8e7b9f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 414a7b6023..8805eb56d9 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 016173b5cd..d50f5aa2a3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 980f96e746..71d90cd19a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 53188c3654..6c2cdb0b1c 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 81d82a8ad0..15def9278f 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 8090816a5d..c856870a76 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8e945a2d68..3e3a52ce00 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6ad0a6c746..61f33d0400 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 - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index eba88b054a..89030e5497 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/pom.xml b/pom.xml index a06f8f7a5f..16aa8e00e0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.17 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c03ab96461..8895816373 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 766abc0053..c93b37c872 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.17 + 23.4.0.18-SNAPSHOT From 84e1c90745ad46f821d5e49131526338069e221d Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:06:41 +0200 Subject: [PATCH 064/148] Revert "Bump dependency.log4j.version from 2.23.1 to 2.24.0 (#2904)" (#2920) This reverts commit 22b6131f930bd65b50bc48f050ae880b3fb94550. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16aa8e00e0..b983f2cfa3 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 - 2.24.0 + 2.23.1 3.0.22 2.9.2 7.7.10 From aa02febb3f64213c8485276e216aff37da0382e0 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:42:03 +0000 Subject: [PATCH 065/148] [maven-release-plugin][skip ci] prepare release 23.4.0.18 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 22933aa2fb..d6a0d1d530 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index fa58cc4845..f4eca3198e 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 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 4d0f4bcd31..509446f721 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e261c948fb..15c3ac15ab 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5f30991976..b686bebf8f 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 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 e9446c0769..dd4e18a29c 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/amps/pom.xml b/amps/pom.xml index 9db4a4719d..e8ff900a31 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 57095c7cb5..3383b7cde7 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/core/pom.xml b/core/pom.xml index e931739d7f..c618219a64 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/data-model/pom.xml b/data-model/pom.xml index ee34ebb944..a40b388db2 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/mmt/pom.xml b/mmt/pom.xml index d6afa12ca2..5b853357d1 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index af0a8e7b9f..ea34a8fd4a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8805eb56d9..b3d53f7a1a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/pom.xml b/packaging/pom.xml index d50f5aa2a3..b2bb7cab22 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 71d90cd19a..bdfed2f848 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6c2cdb0b1c..84120fb122 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 15def9278f..a690302e3f 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index c856870a76..795a034d83 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3e3a52ce00..9a2dbb6186 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 61f33d0400..85a9a9c7cf 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 - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 89030e5497..2e2f2d4925 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/pom.xml b/pom.xml index b983f2cfa3..df1f2dd52e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.18 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8895816373..d60edb5d69 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 diff --git a/repository/pom.xml b/repository/pom.xml index c93b37c872..afabfa103a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18-SNAPSHOT + 23.4.0.18 From dea78f5d3083103f12595a5ef47de208a3619b55 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:42:05 +0000 Subject: [PATCH 066/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index d6a0d1d530..7ff56c43a4 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f4eca3198e..c8666b4ef6 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 - 23.4.0.18 + 23.4.0.19-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 509446f721..79b633fd78 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 15c3ac15ab..816ac5ca3c 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b686bebf8f..8418c88600 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 - 23.4.0.18 + 23.4.0.19-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 dd4e18a29c..3606848bba 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index e8ff900a31..37013ac9f7 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 3383b7cde7..fe3ac83998 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c618219a64..500eee93fa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a40b388db2..102da31952 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 5b853357d1..a2347ff45c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ea34a8fd4a..948a7cbaf3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index b3d53f7a1a..708f497a89 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index b2bb7cab22..577ba8e1f4 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bdfed2f848..d0822f855d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 84120fb122..eadb8d4e92 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a690302e3f..dac55588c2 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 795a034d83..82c6737286 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9a2dbb6186..3d4dc5a5a4 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 85a9a9c7cf..94f5d899e0 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 - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2e2f2d4925..52d5426af3 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/pom.xml b/pom.xml index df1f2dd52e..cd5da690ac 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.18 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d60edb5d69..069c305ac1 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index afabfa103a..5cb640b030 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.18 + 23.4.0.19-SNAPSHOT From 0fd088fc597c38608feb8f9dffb56fcf01f9fb7a Mon Sep 17 00:00:00 2001 From: Eva Vasques Date: Wed, 18 Sep 2024 15:46:53 +0100 Subject: [PATCH 067/148] MNT-24441 Transaction Retries From A Behavior Can Fail During REST API Calls (#2921) * Reset the buffered request at the beginning of the transaction --- .../webscripts/AbstractResourceWebScript.java | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java index 32c0180c9c..360ca7b9fa 100644 --- a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java +++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java @@ -110,22 +110,10 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements @Override public Object execute() throws Throwable { - try - { - final Params params = paramsExtractor.extractParams(resource.getMetaData(), req); - return AbstractResourceWebScript.this.execute(resource, params, res, isReadOnly); - } - catch (Exception e) - { - if (req instanceof BufferedRequest) - { - // Reset the request in case of a transaction retry - ((BufferedRequest) req).reset(); - } - - // re-throw original exception for retry - throw e; - } + // Reset the request so that it can be read again in case of retry + resetRequest(req); + final Params params = paramsExtractor.extractParams(resource.getMetaData(), req); + return AbstractResourceWebScript.this.execute(resource, params, res, isReadOnly); } }; @@ -238,6 +226,15 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements } } + protected void resetRequest(WebScriptRequest req) + { + if (req instanceof BufferedRequest) + { + BufferedRequest bufferedRequest = (BufferedRequest) req; + bufferedRequest.reset(); + } + } + protected RetryingTransactionHelper getTransactionHelper(String api) { RetryingTransactionHelper transHelper = transactionService.getRetryingTransactionHelper(); From da96fd52ca7ef40dc3e662392b729b7ece42bc03 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:25:04 +0000 Subject: [PATCH 068/148] [maven-release-plugin][skip ci] prepare release 23.4.0.19 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 7ff56c43a4..a7b8a4ca19 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c8666b4ef6..c1f6cbbe63 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 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 79b633fd78..dd1d4e7513 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 816ac5ca3c..2aa8c4a408 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 8418c88600..942c659e4c 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 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 3606848bba..f6960455bb 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/amps/pom.xml b/amps/pom.xml index 37013ac9f7..7763611ed3 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index fe3ac83998..229c7cf8b5 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/core/pom.xml b/core/pom.xml index 500eee93fa..403f5f7189 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/data-model/pom.xml b/data-model/pom.xml index 102da31952..706430a5f4 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/mmt/pom.xml b/mmt/pom.xml index a2347ff45c..e18a90533b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 948a7cbaf3..80ef027b91 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 708f497a89..6dd3f6c8e2 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/pom.xml b/packaging/pom.xml index 577ba8e1f4..607cba4aaf 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d0822f855d..a7308b42b8 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index eadb8d4e92..7ad9cf851f 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index dac55588c2..e59eda530a 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 82c6737286..a843efdf6b 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3d4dc5a5a4..3ba19a9d49 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 94f5d899e0..cc95000361 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 - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 52d5426af3..d872cd74aa 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/pom.xml b/pom.xml index cd5da690ac..a5301b851f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.19 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 069c305ac1..cbc313f34c 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 diff --git a/repository/pom.xml b/repository/pom.xml index 5cb640b030..6a3732cb76 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19-SNAPSHOT + 23.4.0.19 From 57daaa24da20a4574ad20a3c9f8f964a7f8fc74c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:25:06 +0000 Subject: [PATCH 069/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index a7b8a4ca19..0aaff7874c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c1f6cbbe63..b9c89d6e2b 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 - 23.4.0.19 + 23.4.0.20-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 dd1d4e7513..af607023a2 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2aa8c4a408..bec8a70fcd 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 942c659e4c..dc218a5529 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 - 23.4.0.19 + 23.4.0.20-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 f6960455bb..45fc90b951 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 7763611ed3..7632e3c515 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 229c7cf8b5..59da4ae377 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 403f5f7189..70be2235e9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 706430a5f4..94d2dc3293 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e18a90533b..3769afccca 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 80ef027b91..e06bcbc4b5 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6dd3f6c8e2..c29face93f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 607cba4aaf..9b9e6dd9c7 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a7308b42b8..aeb70ca6dc 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7ad9cf851f..eb702ac49f 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e59eda530a..cc5e7d2bbb 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a843efdf6b..e2c4be241c 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3ba19a9d49..c7ee956a23 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index cc95000361..aa2a941657 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 - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d872cd74aa..abe080b68a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/pom.xml b/pom.xml index a5301b851f..23b192a3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT pom Alfresco Community Repo Parent @@ -152,7 +152,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.19 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index cbc313f34c..c13ff5b105 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 6a3732cb76..187452cc51 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.19 + 23.4.0.20-SNAPSHOT From d17c11b8ad7150e7008dba5cf4e4df6ec6836752 Mon Sep 17 00:00:00 2001 From: Tiago Salvado <9038083+tiagosalvado10@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:32:30 +0100 Subject: [PATCH 070/148] [MNT-24590] Bump spring-webscripts to 9.3 (#2922) * [MNT-24590] Bump spring-webscripts to 9.3 * Removed duplicated property: dependency.webscripts.version --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 23b192a3b7..935fc4dc89 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,7 @@ 2.17.2 4.0.5 1.0.0-jakarta-1 - 9.2 - 9.2 + 9.3 1.78.1 5.13.0 3.26.3 From 69583721da00cefeba6eaba1f4ce1dfa25c01ecd Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:09:40 +0000 Subject: [PATCH 071/148] [maven-release-plugin][skip ci] prepare release 23.4.0.20 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 0aaff7874c..8833e88d3a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b9c89d6e2b..19faec1afa 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 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 af607023a2..ba55f1a833 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index bec8a70fcd..29da57972c 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index dc218a5529..b57cd5e7ea 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 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 45fc90b951..dae2319a85 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/amps/pom.xml b/amps/pom.xml index 7632e3c515..8d4f779bb7 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 59da4ae377..3e5f30bd94 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/core/pom.xml b/core/pom.xml index 70be2235e9..0e228187e6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/data-model/pom.xml b/data-model/pom.xml index 94d2dc3293..37d6db9b2a 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/mmt/pom.xml b/mmt/pom.xml index 3769afccca..4403559d28 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e06bcbc4b5..3f8d64d058 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c29face93f..720a915ff2 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/pom.xml b/packaging/pom.xml index 9b9e6dd9c7..a0a0692420 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index aeb70ca6dc..cce14f7c22 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index eb702ac49f..477f26ac57 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index cc5e7d2bbb..a49d44ba5d 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index e2c4be241c..884daa6193 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c7ee956a23..410e86591f 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index aa2a941657..d15938b461 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 - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index abe080b68a..fbb8d6cda9 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/pom.xml b/pom.xml index 935fc4dc89..d987d08c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.20 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c13ff5b105..ddf1ef9d13 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 diff --git a/repository/pom.xml b/repository/pom.xml index 187452cc51..78d0bd1803 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20-SNAPSHOT + 23.4.0.20 From b7642b58131eecdcd41eff68ec0537ed0def80e5 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:09:42 +0000 Subject: [PATCH 072/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 8833e88d3a..a84c559a10 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 19faec1afa..c1560f4c4a 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 - 23.4.0.20 + 23.4.0.21-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 ba55f1a833..8e80859477 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 29da57972c..68d0257ba4 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b57cd5e7ea..7381f3b075 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 - 23.4.0.20 + 23.4.0.21-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 dae2319a85..44a74f7485 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8d4f779bb7..6cc231afa5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 3e5f30bd94..eb19f9b13a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0e228187e6..763749613d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 37d6db9b2a..b4b87e9688 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 4403559d28..e180ebe0e9 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 3f8d64d058..a3fbd1eb90 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 720a915ff2..780c7a95a7 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index a0a0692420..18080ad2cb 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index cce14f7c22..c49aa39d99 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 477f26ac57..38c102bb4b 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a49d44ba5d..2a75f892bc 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 884daa6193..efbf6d6fc3 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 410e86591f..1191e115f8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d15938b461..705696c25e 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 - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index fbb8d6cda9..ae30ce8114 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/pom.xml b/pom.xml index d987d08c8d..f5bcca86e4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.20 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ddf1ef9d13..e25c24869b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 78d0bd1803..1fa315f063 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.20 + 23.4.0.21-SNAPSHOT From 1c1c9704a1a1721838307aa340a11b899bcde7f2 Mon Sep 17 00:00:00 2001 From: Tiago Salvado <9038083+tiagosalvado10@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:28:52 +0100 Subject: [PATCH 073/148] [MNT-24555] Set download node name on node creation (#2901) * [MNT-24555] Set download node name on node creation * [MNT-24555] PMD scan changes --- .../cmr/dictionary/CustomModelService.java | 11 +++++++++ .../rest/api/impl/CustomModelsImpl.java | 3 +-- .../dictionary/CustomModelServiceImpl.java | 8 ++++++- .../repo/download/DownloadServiceImpl.java | 24 ++++++++++++++++--- .../service/cmr/download/DownloadService.java | 23 +++++++++++++++--- .../alfresco/download-services-context.xml | 1 + .../DownloadServiceIntegrationTest.java | 23 ++++++++++++++++++ 7 files changed, 84 insertions(+), 9 deletions(-) diff --git a/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java index c0a63df4f5..c5cd90d96e 100644 --- a/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java +++ b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java @@ -238,6 +238,17 @@ public interface CustomModelService */ public NodeRef createDownloadNode(String modelName, boolean withAssociatedForm); + /** + * Creates a downloadable archive file containing the custom model file and + * if specified, its associated Share extension module file. + * + * @param modelName the model name to be exported + * @param withAssociatedForm whether Share extension module file should be + * included or not + * @return reference to the node which will contain the archive file + */ + NodeRef createDownloadNode(String modelName, boolean withAssociatedForm, String downloadNodeName); + /** * Compiles the {@link M2Model}. * diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java index 5231eac589..8368eb68b1 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java @@ -712,8 +712,7 @@ public class CustomModelsImpl implements CustomModels boolean withForm = Boolean.valueOf(propName); try { - NodeRef nodeRef = customModelService.createDownloadNode(modelName, withForm); - nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, modelName + DownloadsImpl.DEFAULT_ARCHIVE_EXTENSION); + NodeRef nodeRef = customModelService.createDownloadNode(modelName, withForm, modelName + DownloadsImpl.DEFAULT_ARCHIVE_EXTENSION); return new CustomModelDownload(nodeRef); } catch (Exception ex) diff --git a/repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java b/repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java index 58bd7d6b39..f5f5c70194 100644 --- a/repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/dictionary/CustomModelServiceImpl.java @@ -1077,6 +1077,12 @@ public class CustomModelServiceImpl implements CustomModelService @Override public NodeRef createDownloadNode(final String modelFileName, boolean withAssociatedForm) + { + return createDownloadNode(modelFileName, withAssociatedForm, null); + } + + @Override + public NodeRef createDownloadNode(final String modelFileName, boolean withAssociatedForm, String downloadNodeName) { List nodesToBeDownloaded = new ArrayList<>(2); @@ -1137,7 +1143,7 @@ public class CustomModelServiceImpl implements CustomModelService try { - NodeRef archiveNodeRef = downloadService.createDownload(nodesToBeDownloaded.toArray(new NodeRef[nodesToBeDownloaded.size()]), false); + NodeRef archiveNodeRef = downloadService.createDownload(nodesToBeDownloaded.toArray(new NodeRef[0]), false, downloadNodeName); if (logger.isDebugEnabled()) { diff --git a/repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java b/repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java index f14d702585..fc2d1b7b82 100644 --- a/repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/download/DownloadServiceImpl.java @@ -28,12 +28,14 @@ package org.alfresco.repo.download; import java.util.Date; import java.util.List; +import org.alfresco.model.ContentModel; import org.alfresco.repo.download.cannedquery.DownloadEntity; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.download.DownloadService; import org.alfresco.service.cmr.download.DownloadStatus; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.util.ParameterCheck; /** @@ -50,6 +52,7 @@ public class DownloadServiceImpl implements DownloadService { private ActionServiceHelper actionServiceHelper; private DownloadStorage downloadStorage; private RetryingTransactionHelper transactionHelper; + private NodeService nodeService; // Dependency setters public void setActionServiceHelper(ActionServiceHelper actionServiceHelper) @@ -66,9 +69,19 @@ public class DownloadServiceImpl implements DownloadService { { this.downloadStorage = downloadStorage; } - - @Override + + public void setNodeService(NodeService nodeService) + { + this.nodeService = nodeService; + } + + @Override public NodeRef createDownload(final NodeRef[] requestedNodes, final boolean recursive) { + return createDownload(requestedNodes, recursive, null); + } + + @Override + public NodeRef createDownload(final NodeRef[] requestedNodes, final boolean recursive, String downloadNodeName) { ParameterCheck.mandatory("nodeRefs", requestedNodes); if (requestedNodes.length < 1) { @@ -91,7 +104,12 @@ public class DownloadServiceImpl implements DownloadService { { downloadStorage.addNodeToDownload(downloadNode, node); } - + + if (downloadNodeName != null) + { + nodeService.setProperty(downloadNode, ContentModel.PROP_NAME, downloadNodeName); + } + return downloadNode; } }, false, true); diff --git a/repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java index 04f1a1ffae..8e637d3a61 100644 --- a/repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java +++ b/repository/src/main/java/org/alfresco/service/cmr/download/DownloadService.java @@ -40,7 +40,7 @@ import org.alfresco.service.cmr.repository.NodeRef; public interface DownloadService { /** - * Start the creation of a downlaodable archive file containing the content + * Start the creation of a downloadable archive file containing the content * from the given nodeRefs. * * Implementations are expected to do this asynchronously, with clients @@ -50,10 +50,27 @@ public interface DownloadService * extended in the future, to support additional archive types. * * @param nodeRefs NodeRefs of content to be added to the archive file - * @param recusirsive Recurse into container nodes + * @param recursive Recurse into container nodes * @return Reference to node which will eventually contain the archive file */ - public NodeRef createDownload(NodeRef[] nodeRefs, boolean recusirsive); + NodeRef createDownload(NodeRef[] nodeRefs, boolean recursive); + + /** + * Start the creation of a downloadable archive file containing the content + * from the given nodeRefs. + * + * Implementations are expected to do this asynchronously, with clients + * using the returned NodeRef to check on progress. + + * Initially, only zip files will be supported, however this could be + * extended in the future, to support additional archive types. + * + * @param nodeRefs NodeRefs of content to be added to the archive file + * @param recursive Recurse into container nodes + * @param downloadNodeName Download node name + * @return Reference to node which will eventually contain the archive file + */ + NodeRef createDownload(NodeRef[] nodeRefs, boolean recursive, String downloadNodeName); /** * Get the status of the of the download identified by downloadNode. diff --git a/repository/src/main/resources/alfresco/download-services-context.xml b/repository/src/main/resources/alfresco/download-services-context.xml index 451db5b4a0..f39e7d12dd 100644 --- a/repository/src/main/resources/alfresco/download-services-context.xml +++ b/repository/src/main/resources/alfresco/download-services-context.xml @@ -115,6 +115,7 @@ + diff --git a/repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java index ecd70f275a..b3e49a095e 100644 --- a/repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java +++ b/repository/src/test/java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java @@ -349,6 +349,29 @@ public class DownloadServiceIntegrationTest validateEntries(entryNames, allEntries, true); } + @Test public void createDownloadWithName() throws IOException, InterruptedException + { + // Initiate the download + final NodeRef downloadNode = DOWNLOAD_SERVICE.createDownload(new NodeRef[] {rootFile}, false, "test.zip"); + Assert.assertNotNull(downloadNode); + + testNodes.addNodeRef(downloadNode); + + // Validate that the download node has been persisted correctly. + TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback() + { + + @Override + public Object execute() throws Throwable + { + Map properties = NODE_SERVICE.getProperties(downloadNode); + Assert.assertEquals(Boolean.FALSE, properties.get(DownloadModel.PROP_RECURSIVE)); + Assert.assertEquals("test.zip",properties.get(ContentModel.PROP_NAME)); + return null; + } + }); + } + private void validateEntries(final Set entryNames, final Set expectedEntries, boolean onlyExpected) { Set copy = new TreeSet(entryNames); From 6e203304248426de6f559402679b26a8660c31e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:48:04 +0200 Subject: [PATCH 074/148] Bump org.springframework.security:spring-security-bom (#2864) Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.3.1 to 6.3.3. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/6.3.1...6.3.3) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5bcca86e4..e38a2ac667 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.9.22.1 6.0.19 - 6.3.1 + 6.3.3 3.5.3 2.17.2 4.0.5 From 5bc0c3975b5aafec6b95156d560d4b31c76e42fd Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:24:56 +0000 Subject: [PATCH 075/148] [maven-release-plugin][skip ci] prepare release 23.4.0.21 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index a84c559a10..b5a26594f8 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c1560f4c4a..b54385dfda 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 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 8e80859477..a7262a2b99 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 68d0257ba4..025c82cc81 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 7381f3b075..1391473fd9 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 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 44a74f7485..32e74446a5 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/amps/pom.xml b/amps/pom.xml index 6cc231afa5..0cf408738b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index eb19f9b13a..6594f5c510 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/core/pom.xml b/core/pom.xml index 763749613d..3327499681 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/data-model/pom.xml b/data-model/pom.xml index b4b87e9688..3d7a8bebbf 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/mmt/pom.xml b/mmt/pom.xml index e180ebe0e9..69d40486d1 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a3fbd1eb90..659b6dc906 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 780c7a95a7..bd1bc50716 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/pom.xml b/packaging/pom.xml index 18080ad2cb..81f75f6e5d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c49aa39d99..dedfb5726f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 38c102bb4b..01c0ce09a5 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 2a75f892bc..c6f0068377 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index efbf6d6fc3..4f83a5a613 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 1191e115f8..9f5170f515 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 705696c25e..40cffcaca2 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 - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ae30ce8114..6e3f7fe76b 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/pom.xml b/pom.xml index e38a2ac667..f346fe868b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.21 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index e25c24869b..3d8d524a14 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 diff --git a/repository/pom.xml b/repository/pom.xml index 1fa315f063..ec02dbb68e 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21-SNAPSHOT + 23.4.0.21 From a10ab896df3bbb1b25a1d25e72aa570e57492260 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:24:58 +0000 Subject: [PATCH 076/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index b5a26594f8..c7c78107d8 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b54385dfda..0b49e574c3 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 - 23.4.0.21 + 23.4.0.22-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 a7262a2b99..5386d48f20 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 025c82cc81..1e21f6b73e 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1391473fd9..8a19ceab95 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 - 23.4.0.21 + 23.4.0.22-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 32e74446a5..86ebb800e5 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 0cf408738b..67322b19c9 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 6594f5c510..106d1a2b81 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 3327499681..136c67b916 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 3d7a8bebbf..75edc7092f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 69d40486d1..e6150f5e67 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 659b6dc906..8a3cfdb0ba 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index bd1bc50716..aa24892a0c 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 81f75f6e5d..aa50960be2 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index dedfb5726f..4197154ba7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 01c0ce09a5..8dd18691fd 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c6f0068377..c9051d2dda 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4f83a5a613..d8ffbffc15 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9f5170f515..5a5deffc35 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 40cffcaca2..5f64a74104 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 - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6e3f7fe76b..19a021fc11 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/pom.xml b/pom.xml index f346fe868b..f1990e234e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.21 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3d8d524a14..9118f4bae4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index ec02dbb68e..1fc68c4871 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.21 + 23.4.0.22-SNAPSHOT From 70a90c387062cc6aeb435f817c8142d388c3ecea Mon Sep 17 00:00:00 2001 From: Suneet Gupta <89080268+suneet-gupta@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:03:37 +0530 Subject: [PATCH 077/148] [MNT-23264] Added fix for running job as system user (#2926) * [MNT-23264] Added fix for running job as system user * [MNT-23264] Added fix for running job as system user * [MNT-23264] Added fix for running job as system user * [MNT-23264] Added fix for running job as system user * [MNT-23264] Added fix for running job as system user --- .../repo/action/executer/ScriptActionExecuter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java index b8458fa60d..1ffc18f0fa 100644 --- a/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java +++ b/repository/src/main/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java @@ -152,9 +152,11 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase { // get the references we need to build the default scripting data-model String userName = this.serviceRegistry.getAuthenticationService().getCurrentUserName(); - NodeRef personRef = this.personService.getPerson(userName); - NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER); - + + // When a script is executed as a system user, there will no person or home space for providing to the scripting framework. + NodeRef personRef = this.personService.getPersonOrNull(userName); + NodeRef homeSpaceRef = personRef == null ? null : (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER); + // the default scripting model provides access to well known objects and searching // facilities - it also provides basic create/update/delete/copy/move services Map model = this.serviceRegistry.getScriptService().buildDefaultModel( @@ -198,6 +200,7 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase /** * @see org.alfresco.repo.action.ParameterizedItemAbstractBase#addParameterDefinitions(java.util.List) */ + @Override protected void addParameterDefinitions(List paramList) { if (scriptLocation == null) From 5b0c31154eb2c445082997c609b8feb49d2a1375 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:39:31 +0000 Subject: [PATCH 078/148] [maven-release-plugin][skip ci] prepare release 23.4.0.22 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index c7c78107d8..972dc4946f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 0b49e574c3..c3d79f5199 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 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 5386d48f20..910df0890b 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1e21f6b73e..1fecea1645 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 8a19ceab95..a276a4d988 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 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 86ebb800e5..4d608c88af 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/amps/pom.xml b/amps/pom.xml index 67322b19c9..b259fc6312 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 106d1a2b81..1ad10d7dc7 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/core/pom.xml b/core/pom.xml index 136c67b916..d530273787 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/data-model/pom.xml b/data-model/pom.xml index 75edc7092f..604e364a6f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/mmt/pom.xml b/mmt/pom.xml index e6150f5e67..d84fd67a72 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8a3cfdb0ba..c4805aaf6d 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index aa24892a0c..36aaeddfc3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/pom.xml b/packaging/pom.xml index aa50960be2..515d7ac90d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4197154ba7..17580bcf8b 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8dd18691fd..c405b01663 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c9051d2dda..b60d4ebc63 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d8ffbffc15..a2be6673fe 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5a5deffc35..3209ebce22 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5f64a74104..abad0ba087 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 - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 19a021fc11..3c8a8de8f7 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/pom.xml b/pom.xml index f1990e234e..e3812acd57 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.22 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9118f4bae4..6ba6c1f2df 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 diff --git a/repository/pom.xml b/repository/pom.xml index 1fc68c4871..62a4d6a5b6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22-SNAPSHOT + 23.4.0.22 From f5f11065060c26df30f273db8c4135e490364dd1 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:39:33 +0000 Subject: [PATCH 079/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 972dc4946f..9d25161a64 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c3d79f5199..ae303259ee 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 - 23.4.0.22 + 23.4.0.23-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 910df0890b..fb90d147d9 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1fecea1645..c514e41f96 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a276a4d988..202a9d57e8 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 - 23.4.0.22 + 23.4.0.23-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 4d608c88af..df83383941 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index b259fc6312..2dd463a447 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1ad10d7dc7..7ad5335504 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d530273787..c925c8472d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 604e364a6f..283caa4b7e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index d84fd67a72..77b5595ca2 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c4805aaf6d..51c22e6299 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 36aaeddfc3..ea598b4a62 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 515d7ac90d..254ceefc3b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 17580bcf8b..1ab4220c9e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index c405b01663..9e51bd4f35 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b60d4ebc63..45fbb57f2f 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a2be6673fe..f640f6ce14 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3209ebce22..bce4bc1f41 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index abad0ba087..1d04ce33bb 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 - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 3c8a8de8f7..2589546ebe 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/pom.xml b/pom.xml index e3812acd57..b1e685f0b6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.22 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 6ba6c1f2df..2559112633 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 62a4d6a5b6..22dbe87ee9 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.22 + 23.4.0.23-SNAPSHOT From a6e915371fe183373225553b590a91499bdf8a21 Mon Sep 17 00:00:00 2001 From: Tiago Salvado <9038083+tiagosalvado10@users.noreply.github.com> Date: Thu, 19 Sep 2024 19:22:30 +0100 Subject: [PATCH 080/148] [MNT-24282] Obtain site manager authority as system and keep site manager permissions when inheritance flag is disabled (#2914) * [MNT-24282] Obtain site manager authority as system * [MNT-24282] Add unit test * [MNT-24282] Do not remove site manager permissions from local set when inheritance flag is disabled * [MNT-24282] PMD scan changes --- .../org/alfresco/rest/api/impl/NodesImpl.java | 47 +++++--- .../alfresco/rest/api/tests/NodeApiTest.java | 101 +++++++++++++++++- 2 files changed, 132 insertions(+), 16 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java index e7fd991eea..db1d3c6670 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -2401,6 +2401,8 @@ public class NodesImpl implements Nodes NodePermissions nodePerms = nodeInfo.getPermissions(); if (nodePerms != null) { + String siteManagerAuthority = getSiteManagerAuthority(nodeRef); + // Cannot set inherited permissions, only direct (locally set) permissions can be set if ((nodePerms.getInherited() != null) && (nodePerms.getInherited().size() > 0)) { @@ -2411,7 +2413,7 @@ public class NodesImpl implements Nodes if (nodePerms.getIsInheritanceEnabled() != null) { // If inheritance flag is being disabled, the site manager needs to have permission - setSiteManagerPermission(nodeRef, nodePerms); + setSiteManagerPermission(nodeRef, nodePerms, siteManagerAuthority); if (nodePerms.getIsInheritanceEnabled() != permissionService.getInheritParentPermissions(nodeRef)) { @@ -2510,8 +2512,19 @@ public class NodesImpl implements Nodes } // remove any remaining direct perms + boolean isInheritanceEnabled = permissionService.getInheritParentPermissions(nodeRef); for (AccessPermission accessPerm : directPerms) { + // prevents deletion of site manager permissions when inheritance is disabled + boolean isSiteManagerAuthority = siteManagerAuthority != null && siteManagerAuthority.equals(accessPerm.getAuthority()); + if (!isInheritanceEnabled && isSiteManagerAuthority) + { + if (logger.isDebugEnabled()) + { + logger.debug("Site manager permissions will be kept since inheritance flag is disabled: " + nodeRef.getId()); + } + continue; + } permissionService.deletePermission(nodeRef, accessPerm.getAuthority(), accessPerm.getPermission()); } } @@ -2776,25 +2789,29 @@ public class NodesImpl implements Nodes return updateExistingFile(null, nodeRef, fileName, contentInfo, stream, parameters, versionMajor, versionComment); } - private void setSiteManagerPermission(NodeRef nodeRef, NodePermissions nodePerms) + private String getSiteManagerAuthority(NodeRef nodeRef) { + return AuthenticationUtil.runAsSystem(() -> { + SiteInfo containingSite = siteService.getSite(nodeRef); + + if (containingSite != null) + { + String thisSiteGroupPrefix = siteService.getSiteGroup(containingSite.getShortName()); + return thisSiteGroupPrefix + "_" + SiteModel.SITE_MANAGER; + } + + return null; + }); + } + + private void setSiteManagerPermission(NodeRef nodeRef, NodePermissions nodePerms, String siteManagerAuthority) { - if (nodeRef != null && nodePerms != null) + if (nodeRef != null && nodePerms != null && nodePerms.getIsInheritanceEnabled() != null && siteManagerAuthority != null) { try { - if (nodePerms.getIsInheritanceEnabled() != null && !nodePerms.getIsInheritanceEnabled()) + if (!nodePerms.getIsInheritanceEnabled()) { - SiteInfo containingSite = siteService.getSite(nodeRef); - - if (containingSite != null) - { - String thisSiteGroupPrefix = siteService.getSiteGroup(containingSite.getShortName()); - final String siteManagerAuthority = thisSiteGroupPrefix + "_" + SiteModel.SITE_MANAGER; - AuthenticationUtil.runAsSystem(() -> { - permissionService.setPermission(nodeRef, siteManagerAuthority, SiteModel.SITE_MANAGER, true); - return null; - }); - } + permissionService.setPermission(nodeRef, siteManagerAuthority, SiteModel.SITE_MANAGER, true); } } catch (Exception e) diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java index 3b08d5c062..4a2d9359c4 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -35,6 +35,7 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.IOException; import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.Arrays; @@ -62,6 +63,7 @@ import org.alfresco.rest.api.model.ClassDefinition; import org.alfresco.rest.api.model.ConstraintDefinition; import org.alfresco.rest.api.model.LockInfo; import org.alfresco.rest.api.model.NodePermissions; +import org.alfresco.rest.api.model.NodePermissions.NodePermission; import org.alfresco.rest.api.model.NodeTarget; import org.alfresco.rest.api.model.PropertyDefinition; import org.alfresco.rest.api.model.Site; @@ -6368,7 +6370,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest * Tests if site manager permissions are kept after inheritance flag is disabled */ @Test - public void testSiteManagerPermission() throws Exception + public void testSiteManagerPermission_MNT23379() throws Exception { // Change to User1 context setRequestContext(user1); @@ -6394,6 +6396,10 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest Node nodeUpdate = new Node(); NodePermissions nodePerms = new NodePermissions(); nodePerms.setIsInheritanceEnabled(false); + NodePermission permission = new NodePermission("GROUP_site_" + site1Id + "_SiteConsumer", SiteRole.SiteConsumer.toString(), AccessStatus.ALLOWED.toString()); + List locallySet = new ArrayList<>(); + locallySet.add(permission); + nodePerms.setLocallySet(locallySet); nodeUpdate.setPermissions(nodePerms); put(URL_NODES, content1_Id, toJsonAsStringNonNull(nodeUpdate), null, 200); @@ -6409,6 +6415,76 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest deleteSite(site1Id, true, 204); } + /** + * Test if inheritance flag is correctly set on a node placed inside a site + */ + @Test + public void testSiteNodeInheritance_MNT24282() throws Exception + { + // Change to User1 context + setRequestContext(user1); + + // user1 creates a site + String site1Title = "site-testSiteInheritanceFlag_DocLib-" + RUNID; + String site1Id = createSite(site1Title, SiteVisibility.PUBLIC).getId(); + String site1DocLibNodeId = getSiteContainerNodeId(site1Id, "documentLibrary"); + + // user1 adds user2 as a site consumer to the created site + addSiteMember(site1Id, user2, SiteRole.SiteConsumer); + + // user1 creates folder hierarchy: folderA/folderB/folderC + Folder folderA = createFolder(site1DocLibNodeId, "folderA"); + Folder folderB = createFolder(folderA.getId(), "folderB"); + Folder folderC = createFolder(folderB.getId(), "folderC"); + + // user1 disables inheritance flag on folder B + disableSiteNodeInheritanceAsShare(site1Id, folderB.getId()); + + // user1 disables inheritance flag on folder C + disableSiteNodeInheritanceAsShare(site1Id, folderC.getId()); + + // user1 gives SiteManager permissions to user2 in folderC + Node nodeC = new Node(); + NodePermissions permsC = new NodePermissions(); + List locallySet = new ArrayList<>(); + locallySet.add(new NodePermission(user2, SiteRole.SiteManager.toString(), AccessStatus.ALLOWED.toString())); + permsC.setLocallySet(locallySet); + nodeC.setPermissions(permsC); + put(URL_NODES, folderC.getId(), toJsonAsStringNonNull(nodeC), null, 200); + + // Change to User2 context + setRequestContext(user2); + + // user2 creates folderD inside folderC + Folder folderD = createFolder(folderC.getId(), "folderD"); + + // user2 disables inheritance flag on folder D + disableSiteNodeInheritanceAsShare(site1Id, folderD.getId()); + + // user2 enables inheritance flag on folder D + setSiteNodeInheritance(site1Id, folderD.getId(), true, false); + + // user2 disables inheritance flag on folder D + disableSiteNodeInheritanceAsShare(site1Id, folderD.getId()); + + // user2 should be able to re-enable and disable the inheritance flag without causing a permission denied error + setSiteNodeInheritance(site1Id, folderD.getId(), true, false); + setSiteNodeInheritance(site1Id, folderD.getId(), false, false); + + // user2 checks if has access to the folder + Map params = new HashMap<>(); + params.put("include", "permissions"); + HttpResponse response = getSingle(NodesEntityResource.class, folderD.getId(), params, 200); + Document node = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class); + assertNotNull(node); + assertEquals(node.getId(), folderD.getId()); + assertFalse("Folder D inheritance flag should be false", node.getPermissions().getIsInheritanceEnabled()); + + // cleanup + setRequestContext(user1); + deleteSite(site1Id, true, 204); + } + @Test public void testRuleAspectAfterUpdate() throws Exception { @@ -6445,5 +6521,28 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest // Cleanup delete(URL_NODES, folderId, 204); } + + private void disableSiteNodeInheritanceAsShare(String siteId, String nodeId) throws IOException + { + setSiteNodeInheritance(siteId, nodeId, false, true); + } + + private void setSiteNodeInheritance(String siteId, String nodeId, boolean inheritanceFlag, boolean addSiteManager) throws IOException + { + Node node = new Node(); + NodePermissions perms = new NodePermissions(); + perms.setIsInheritanceEnabled(inheritanceFlag); + if (!inheritanceFlag && addSiteManager) { + List locallySet = new ArrayList<>(); + locallySet.add(new NodePermission("GROUP_site_" + siteId + "_SiteManager", SiteRole.SiteManager.toString(), AccessStatus.ALLOWED.toString())); + perms.setLocallySet(locallySet); + } + node.setPermissions(perms); + try { + put(URL_NODES, nodeId, toJsonAsStringNonNull(node), null, 200); + } catch (Exception e) { + throw new IOException("Failed to update permissions: " + e.getMessage(), e); + } + } } From 8b3bd59d73cb47375388127e3df49b37d8384ec1 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 19:00:01 +0000 Subject: [PATCH 081/148] [maven-release-plugin][skip ci] prepare release 23.4.0.23 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 9d25161a64..35caa1ac50 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ae303259ee..49c2736068 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 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 fb90d147d9..45d598566f 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index c514e41f96..7a01920141 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 202a9d57e8..cbab3570d9 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 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 df83383941..14ba38973c 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/amps/pom.xml b/amps/pom.xml index 2dd463a447..0e6e23c301 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 7ad5335504..f173e49b32 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/core/pom.xml b/core/pom.xml index c925c8472d..e5d3c1f8e3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/data-model/pom.xml b/data-model/pom.xml index 283caa4b7e..34b0b4122c 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/mmt/pom.xml b/mmt/pom.xml index 77b5595ca2..e6dc4dd782 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 51c22e6299..4c1c73db3e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ea598b4a62..065afe55d5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/pom.xml b/packaging/pom.xml index 254ceefc3b..8bf6238bc8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 1ab4220c9e..30238538d4 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 9e51bd4f35..262eb85703 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 45fbb57f2f..1c07c941ff 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f640f6ce14..3c6538fa04 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index bce4bc1f41..a9e92e7ca2 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1d04ce33bb..d8bf9ed6ce 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 - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2589546ebe..ce10973454 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/pom.xml b/pom.xml index b1e685f0b6..aa79cf497e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.23 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2559112633..46afe1d843 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 diff --git a/repository/pom.xml b/repository/pom.xml index 22dbe87ee9..99565c1318 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23-SNAPSHOT + 23.4.0.23 From c8bfc18f83a28e4848bd6fe39a974bafda169d55 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 19 Sep 2024 19:00:03 +0000 Subject: [PATCH 082/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 35caa1ac50..8c914d0014 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 49c2736068..85971ffca4 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 - 23.4.0.23 + 23.4.0.24-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 45d598566f..9f2b62fa4a 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 7a01920141..46d49e08c1 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index cbab3570d9..373a7612ab 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 - 23.4.0.23 + 23.4.0.24-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 14ba38973c..a6a903a2dd 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 0e6e23c301..c741f16e24 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f173e49b32..36532f8607 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index e5d3c1f8e3..a27a9cb4b5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 34b0b4122c..0fd999ccf4 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e6dc4dd782..82660958dd 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4c1c73db3e..2c683192be 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 065afe55d5..f85cab8942 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 8bf6238bc8..46216dd805 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 30238538d4..4f970b0fd7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 262eb85703..10e28d34c9 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1c07c941ff..c94d704a14 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3c6538fa04..2f16e1f480 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a9e92e7ca2..f1c2225a6b 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d8bf9ed6ce..217864169b 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 - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ce10973454..a09152f5f2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/pom.xml b/pom.xml index aa79cf497e..6479563c42 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.23 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 46afe1d843..cf42e5c650 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 99565c1318..80affbcec0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.23 + 23.4.0.24-SNAPSHOT From 3f2a143343db83bb9d07ba3ff926077bcdfb899a Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 22 Sep 2024 00:04:27 +0000 Subject: [PATCH 083/148] [force] Force release for 2024-09-22. From 7df82813589492730331012cfabde3825065e999 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 22 Sep 2024 00:08:48 +0000 Subject: [PATCH 084/148] [maven-release-plugin][skip ci] prepare release 23.4.0.24 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 8c914d0014..749f36d580 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 85971ffca4..4f362487e4 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 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 9f2b62fa4a..f2e52958bd 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 46d49e08c1..bf10392b9e 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 373a7612ab..fb1438ac0a 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 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 a6a903a2dd..ed42b925e2 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/amps/pom.xml b/amps/pom.xml index c741f16e24..55edca3268 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 36532f8607..10a081c04f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/core/pom.xml b/core/pom.xml index a27a9cb4b5..a2e3dddd81 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0fd999ccf4..b66e2bf817 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/mmt/pom.xml b/mmt/pom.xml index 82660958dd..033c24796c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 2c683192be..7632251ae9 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index f85cab8942..2587e26a3f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/pom.xml b/packaging/pom.xml index 46216dd805..0d8d82696d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4f970b0fd7..c6eeb33950 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 10e28d34c9..10874c9831 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c94d704a14..e6bdb553f6 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 2f16e1f480..e000593798 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index f1c2225a6b..89b40430f1 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 217864169b..30966ebde5 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 - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a09152f5f2..c58690c903 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/pom.xml b/pom.xml index 6479563c42..82caf4e9ec 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.24 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index cf42e5c650..b2941bd0ec 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 diff --git a/repository/pom.xml b/repository/pom.xml index 80affbcec0..1e81f95d6b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24-SNAPSHOT + 23.4.0.24 From 02254b2ac43e127e4db2254741307bca59bec921 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 22 Sep 2024 00:08:50 +0000 Subject: [PATCH 085/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 749f36d580..5e94231831 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4f362487e4..3e95f64392 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 - 23.4.0.24 + 23.4.0.25-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 f2e52958bd..9f50cb681d 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index bf10392b9e..4c597850af 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index fb1438ac0a..b606b64330 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 - 23.4.0.24 + 23.4.0.25-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 ed42b925e2..7669a3a6f0 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 55edca3268..c761f46786 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 10a081c04f..5ada9c2d1e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index a2e3dddd81..8c5beaa1a3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index b66e2bf817..e5d721f545 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 033c24796c..413fcab591 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7632251ae9..e3cc8a727f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2587e26a3f..2126348a70 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 0d8d82696d..a3d5e83d7b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c6eeb33950..424bccd756 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 10874c9831..373290368f 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e6bdb553f6..1d3be08190 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index e000593798..4dc4a53bef 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 89b40430f1..167928fad8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 30966ebde5..d90266f2af 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 - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c58690c903..5525907516 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/pom.xml b/pom.xml index 82caf4e9ec..264c13c0ab 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.24 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b2941bd0ec..dff1b6d679 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 1e81f95d6b..d36825c540 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.24 + 23.4.0.25-SNAPSHOT From 3d9b58ea7699d585a2aa4438c4c2ffc5fdcbec9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:06:14 +0000 Subject: [PATCH 086/148] Bump org.alfresco.tas:utility from 5.0.1 to 5.0.2 Bumps [org.alfresco.tas:utility](https://github.com/Alfresco/alfresco-tas-utility) from 5.0.1 to 5.0.2. - [Changelog](https://github.com/Alfresco/alfresco-tas-utility/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-utility/compare/utility-5.0.1...utility-5.0.2) --- updated-dependencies: - dependency-name: org.alfresco.tas:utility dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 264c13c0ab..c06b77dd72 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 8.0.30 8 2.7.4 - 5.0.1 + 5.0.2 5.5.0 2.0.0 1.21 From b00e11cb6fe312558439cfc8565cf4b8d1e7dca6 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Sep 2024 10:35:39 +0100 Subject: [PATCH 087/148] Add precommit for secret scanning, formatting and license header checking. (#2938) * Add precommit for secret scanning, formatting and license header checking. * Turn off bash debug logging. * Skip precommit checks that apply to all files. There are too many violations to run against all files. --- .github/workflows/ci.yml | 54 +- .pre-commit-config.yaml | 14 + .secrets.baseline | 1892 +++++++++++++++++++++ CONTRIBUTING.md | 46 + alfresco-formatter.xml | 401 +++++ pom.xml | 27 + scripts/hooks/check-format-and-headers.sh | 40 + 7 files changed, 2451 insertions(+), 23 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 .secrets.baseline create mode 100644 alfresco-formatter.xml create mode 100755 scripts/hooks/check-format-and-headers.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adc6852d89..653909408a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,16 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - id: changed-files + uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0 + with: + write-list-to-env: true + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v6.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Prepare maven cache and check compilation" @@ -63,7 +71,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -169,7 +177,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -249,7 +257,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} @@ -283,7 +291,7 @@ jobs: env: RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" + eval "args=($RP_OPTS)" mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" @@ -327,7 +335,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -398,7 +406,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -469,7 +477,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -500,7 +508,7 @@ jobs: env: RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" + eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" @@ -539,7 +547,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -570,7 +578,7 @@ jobs: env: RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" + eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" @@ -609,7 +617,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -640,7 +648,7 @@ jobs: env: RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" + eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" @@ -679,7 +687,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -710,7 +718,7 @@ jobs: env: RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" + eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" @@ -747,7 +755,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -847,7 +855,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -960,7 +968,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} @@ -1041,7 +1049,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Init" run: bash ./scripts/ci/init.sh @@ -1115,7 +1123,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} @@ -1161,7 +1169,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} @@ -1203,7 +1211,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} @@ -1293,7 +1301,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..3f28bf9f45 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,14 @@ +repos: + - repo: https://github.com/Yelp/detect-secrets + rev: v1.5.0 + hooks: + - id: detect-secrets + args: ["--baseline", ".secrets.baseline"] + - repo: local + hooks: + - id: check-format-and-headers + name: Check format and headers and fix if necessary + entry: ./scripts/hooks/check-format-and-headers.sh + language: script + files: ".*.java" + pass_filenames: false diff --git a/.secrets.baseline b/.secrets.baseline new file mode 100644 index 0000000000..640549658b --- /dev/null +++ b/.secrets.baseline @@ -0,0 +1,1892 @@ +{ + "version": "1.5.0", + "plugins_used": [ + { + "name": "ArtifactoryDetector" + }, + { + "name": "AWSKeyDetector" + }, + { + "name": "AzureStorageKeyDetector" + }, + { + "name": "Base64HighEntropyString", + "limit": 4.5 + }, + { + "name": "BasicAuthDetector" + }, + { + "name": "CloudantDetector" + }, + { + "name": "DiscordBotTokenDetector" + }, + { + "name": "GitHubTokenDetector" + }, + { + "name": "GitLabTokenDetector" + }, + { + "name": "HexHighEntropyString", + "limit": 3.0 + }, + { + "name": "IbmCloudIamDetector" + }, + { + "name": "IbmCosHmacDetector" + }, + { + "name": "IPPublicDetector" + }, + { + "name": "JwtTokenDetector" + }, + { + "name": "KeywordDetector", + "keyword_exclude": "" + }, + { + "name": "MailchimpDetector" + }, + { + "name": "NpmDetector" + }, + { + "name": "OpenAIDetector" + }, + { + "name": "PrivateKeyDetector" + }, + { + "name": "PypiTokenDetector" + }, + { + "name": "SendGridDetector" + }, + { + "name": "SlackDetector" + }, + { + "name": "SoftlayerDetector" + }, + { + "name": "SquareOAuthDetector" + }, + { + "name": "StripeDetector" + }, + { + "name": "TelegramBotTokenDetector" + }, + { + "name": "TwilioKeyDetector" + } + ], + "filters_used": [ + { + "path": "detect_secrets.filters.allowlist.is_line_allowlisted" + }, + { + "path": "detect_secrets.filters.common.is_baseline_file", + "filename": ".secrets.baseline" + }, + { + "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies", + "min_level": 2 + }, + { + "path": "detect_secrets.filters.heuristic.is_indirect_reference" + }, + { + "path": "detect_secrets.filters.heuristic.is_likely_id_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_lock_file" + }, + { + "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_potential_uuid" + }, + { + "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign" + }, + { + "path": "detect_secrets.filters.heuristic.is_sequential_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_swagger_file" + }, + { + "path": "detect_secrets.filters.heuristic.is_templated_secret" + } + ], + "results": { + ".github/workflows/ci.yml": [ + { + "type": "Secret Keyword", + "filename": ".github/workflows/ci.yml", + "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572", + "is_verified": false, + "line_number": 293 + }, + { + "type": "Secret Keyword", + "filename": ".github/workflows/ci.yml", + "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966", + "is_verified": false, + "line_number": 368 + }, + { + "type": "Secret Keyword", + "filename": ".github/workflows/ci.yml", + "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39", + "is_verified": false, + "line_number": 901 + } + ], + ".github/workflows/master_release.yml": [ + { + "type": "Secret Keyword", + "filename": ".github/workflows/master_release.yml", + "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0", + "is_verified": false, + "line_number": 24, + "is_secret": false + } + ], + "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/TestData.java": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/TestData.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 57, + "is_secret": false + } + ], + "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java", + "hashed_secret": "e3557f3b0f2189660980d213f75d1a7828d56af1", + "is_verified": false, + "line_number": 83, + "is_secret": false + } + ], + "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 21, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 87, + "is_secret": false + } + ], + "amps/ags/rm-community/rm-community-repo/docker-compose.yml": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-community/rm-community-repo/docker-compose.yml", + "hashed_secret": "953bf453cebf3913edbe172ec292c4ff81d27415", + "is_verified": false, + "line_number": 13 + }, + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-community/rm-community-repo/docker-compose.yml", + "hashed_secret": "22b56e39272fd3bcd467c8e902c9dae5490b2277", + "is_verified": false, + "line_number": 22 + }, + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-community/rm-community-repo/docker-compose.yml", + "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a", + "is_verified": false, + "line_number": 76 + } + ], + "amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMPermissionModel.java", + "hashed_secret": "b1f53ef1d62bcc8dc4701e495a7472b380c45afc", + "is_verified": false, + "line_number": 121, + "is_secret": false + } + ], + "amps/ags/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties": [ + { + "type": "Secret Keyword", + "filename": "amps/ags/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties", + "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4", + "is_verified": false, + "line_number": 70, + "is_secret": false + } + ], + "core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java": [ + { + "type": "Secret Keyword", + "filename": "core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java", + "hashed_secret": "a718763bca0f328b0e7ce2a98d9e79fc271bf827", + "is_verified": false, + "line_number": 35, + "is_secret": false + } + ], + "core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java": [ + { + "type": "Secret Keyword", + "filename": "core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java", + "hashed_secret": "5d3c708390e5f51413e414393d4ad2a6d0e59a45", + "is_verified": false, + "line_number": 126, + "is_secret": false + } + ], + "core/src/test/resources/keystore-tests/empty-alias-metadata.properties": [ + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/empty-alias-metadata.properties", + "hashed_secret": "99a3024c77ef51c031038ab2c696f85e93ca9e62", + "is_verified": false, + "line_number": 2, + "is_secret": false + } + ], + "core/src/test/resources/keystore-tests/ks1-metadata.properties": [ + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/ks1-metadata.properties", + "hashed_secret": "99a3024c77ef51c031038ab2c696f85e93ca9e62", + "is_verified": false, + "line_number": 2, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/ks1-metadata.properties", + "hashed_secret": "41315a3765e4803f355d0582fed38a3a510d9692", + "is_verified": false, + "line_number": 3, + "is_secret": false + } + ], + "core/src/test/resources/keystore-tests/wrong-alias-metadata.properties": [ + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-alias-metadata.properties", + "hashed_secret": "99a3024c77ef51c031038ab2c696f85e93ca9e62", + "is_verified": false, + "line_number": 2, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-alias-metadata.properties", + "hashed_secret": "41315a3765e4803f355d0582fed38a3a510d9692", + "is_verified": false, + "line_number": 3, + "is_secret": false + } + ], + "core/src/test/resources/keystore-tests/wrong-key-password-metadata.properties": [ + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-key-password-metadata.properties", + "hashed_secret": "99a3024c77ef51c031038ab2c696f85e93ca9e62", + "is_verified": false, + "line_number": 2, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-key-password-metadata.properties", + "hashed_secret": "8d4170611a0278170def15c9a7c6b16706cd23ea", + "is_verified": false, + "line_number": 3, + "is_secret": false + } + ], + "core/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties": [ + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties", + "hashed_secret": "6809ffccad03b80fa1fbc32c17e7e054805ec30b", + "is_verified": false, + "line_number": 2, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "core/src/test/resources/keystore-tests/wrong-keystore-password-metadata.properties", + "hashed_secret": "41315a3765e4803f355d0582fed38a3a510d9692", + "is_verified": false, + "line_number": 3, + "is_secret": false + } + ], + "packaging/distribution/src/main/resources/keystore/metadata-keystore/keystore-passwords.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/distribution/src/main/resources/keystore/metadata-keystore/keystore-passwords.properties", + "hashed_secret": "f039ca7aa02b913940a6a97f01251f257178068f", + "is_verified": false, + "line_number": 6, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/distribution/src/main/resources/keystore/metadata-keystore/keystore-passwords.properties", + "hashed_secret": "22ccad749b70baa70011eaab411efa0c4128ee86", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "packaging/tests/environment/docker-compose-minimal+transforms.yml": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal+transforms.yml", + "hashed_secret": "9e3d103f7aa5f4f778cf752087dfceeba15d4fef", + "is_verified": false, + "line_number": 13 + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal+transforms.yml", + "hashed_secret": "92cda941553ea9ba9b39716c79a46b08a740613c", + "is_verified": false, + "line_number": 23 + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal+transforms.yml", + "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a", + "is_verified": false, + "line_number": 76 + } + ], + "packaging/tests/environment/docker-compose-minimal.yml": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal.yml", + "hashed_secret": "9e3d103f7aa5f4f778cf752087dfceeba15d4fef", + "is_verified": false, + "line_number": 13 + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal.yml", + "hashed_secret": "92cda941553ea9ba9b39716c79a46b08a740613c", + "is_verified": false, + "line_number": 23 + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/environment/docker-compose-minimal.yml", + "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a", + "is_verified": false, + "line_number": 79 + } + ], + "packaging/tests/scripts/wait-for-alfresco-start.sh": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/scripts/wait-for-alfresco-start.sh", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 15, + "is_secret": false + } + ], + "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java": [ + { + "type": "JSON Web Token", + "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java", + "hashed_secret": "a28cecdb5056cf30135809b921e38a84deb6c345", + "is_verified": false, + "line_number": 102, + "is_secret": false + }, + { + "type": "JSON Web Token", + "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java", + "hashed_secret": "5e39d8e2991ef9705998de26b33f11be0f3cdcde", + "is_verified": false, + "line_number": 103, + "is_secret": false + } + ], + "packaging/tests/tas-cmis/src/main/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-cmis/src/main/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 8, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-cmis/src/main/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 76, + "is_secret": false + } + ], + "packaging/tests/tas-cmis/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-cmis/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 8, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-cmis/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 84, + "is_secret": false + } + ], + "packaging/tests/tas-email/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-email/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 8, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-email/src/test/resources/default.properties", + "hashed_secret": "43b7ed74f99cf021109506832a48aa75435b817d", + "is_verified": false, + "line_number": 35, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-email/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 97, + "is_secret": false + } + ], + "packaging/tests/tas-integration/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-integration/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 8, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-integration/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 118, + "is_secret": false + } + ], + "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java": [ + { + "type": "JSON Web Token", + "filename": "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java", + "hashed_secret": "a28cecdb5056cf30135809b921e38a84deb6c345", + "is_verified": false, + "line_number": 79, + "is_secret": false + }, + { + "type": "JSON Web Token", + "filename": "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java", + "hashed_secret": "5e39d8e2991ef9705998de26b33f11be0f3cdcde", + "is_verified": false, + "line_number": 80, + "is_secret": false + } + ], + "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSitePersonMembershipRequestModelsCollection.java": [ + { + "type": "Base64 High Entropy String", + "filename": "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSitePersonMembershipRequestModelsCollection.java", + "hashed_secret": "8b30a14989d7b8093ac29462fe29423d836625b4", + "is_verified": false, + "line_number": 39, + "is_secret": false + } + ], + "packaging/tests/tas-restapi/src/main/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-restapi/src/main/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 21, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-restapi/src/main/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 87, + "is_secret": false + } + ], + "packaging/tests/tas-restapi/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-restapi/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 21, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-restapi/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 87, + "is_secret": false + } + ], + "packaging/tests/tas-webdav/src/test/resources/default.properties": [ + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-webdav/src/test/resources/default.properties", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 8, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "packaging/tests/tas-webdav/src/test/resources/default.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 73, + "is_secret": false + } + ], + "packaging/war/src/main/webapp/META-INF/context.xml": [ + { + "type": "Secret Keyword", + "filename": "packaging/war/src/main/webapp/META-INF/context.xml", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 4, + "is_secret": false + } + ], + "packaging/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js": [ + { + "type": "Hex High Entropy String", + "filename": "packaging/war/src/main/webapp/scripts/yui-3.3.0-dependencies.js", + "hashed_secret": "c53c35a5b0f18b4e9061b386eeacc58e3dfcd24b", + "is_verified": false, + "line_number": 38, + "is_secret": false + } + ], + "remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java", + "hashed_secret": "889d2688743fdce6115117a5ba7dbc5f33e0ce03", + "is_verified": false, + "line_number": 38, + "is_secret": false + } + ], + "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java", + "hashed_secret": "43d52295ed5cb7e2b772f2b8be9695ddde971c49", + "is_verified": false, + "line_number": 62, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java", + "hashed_secret": "1bd5147ff91b8b1220d2f1ffde850ebabbc5ec8c", + "is_verified": false, + "line_number": 63, + "is_secret": false + } + ], + "remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties", + "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4", + "is_verified": false, + "line_number": 2, + "is_secret": false + } + ], + "remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 25, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java", + "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55", + "is_verified": false, + "line_number": 74, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java", + "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55", + "is_verified": false, + "line_number": 95, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java", + "hashed_secret": "4ffa743f28fc949c19e65ab045d7906d0609a2c2", + "is_verified": false, + "line_number": 269, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java", + "hashed_secret": "76ed0a056aa77060de25754586440cff390791d0", + "is_verified": false, + "line_number": 63, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 109, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 106, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 120, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 418, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 182, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java", + "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4", + "is_verified": false, + "line_number": 592, + "is_secret": false + }, + { + "type": "Hex High Entropy String", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java", + "hashed_secret": "53dad674827218e94c8fe9c1984c8dd9db512a17", + "is_verified": false, + "line_number": 728, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java", + "hashed_secret": "be66cf01c56d963de61462f37a43df2305367216", + "is_verified": false, + "line_number": 1429, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java", + "hashed_secret": "283d47a9338ed1100b5fe2a5aff2d1f7c799bfd0", + "is_verified": false, + "line_number": 1430, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java", + "hashed_secret": "425a715491af2bbec1eef2def6fa8d79c3050401", + "is_verified": false, + "line_number": 1452, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/TestRemovePermissions.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestRemovePermissions.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 57, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 54, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserData.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserData.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 42, + "is_secret": false + } + ], + "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java": [ + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "43d52295ed5cb7e2b772f2b8be9695ddde971c49", + "is_verified": false, + "line_number": 50, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "1bd5147ff91b8b1220d2f1ffde850ebabbc5ec8c", + "is_verified": false, + "line_number": 51, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "5d3c708390e5f51413e414393d4ad2a6d0e59a45", + "is_verified": false, + "line_number": 52, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4", + "is_verified": false, + "line_number": 53, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "3324f82c5b370b84973c54f8ab9a582328146694", + "is_verified": false, + "line_number": 56, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "remote-api/src/test/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilterTest.java", + "hashed_secret": "02bc8dee91680edf3de772b31247d23a45b3bf5a", + "is_verified": false, + "line_number": 57, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java", + "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506", + "is_verified": false, + "line_number": 60, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java", + "hashed_secret": "fc99e6a90240c45f46ed33a4d96a3dbecef41c60", + "is_verified": false, + "line_number": 61, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java", + "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506", + "is_verified": false, + "line_number": 52, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java", + "hashed_secret": "87a754b00f7ee047d496808125d6259104e9382a", + "is_verified": false, + "line_number": 60, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java", + "hashed_secret": "59ca42c026e181a60e4bf26c980a65b4ef457e16", + "is_verified": false, + "line_number": 90, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java", + "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd", + "is_verified": false, + "line_number": 204, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java", + "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd", + "is_verified": false, + "line_number": 204, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java", + "hashed_secret": "e25df0eeed8d8eb4e198c3464c7bf747bc26eff8", + "is_verified": false, + "line_number": 92, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java", + "hashed_secret": "304de25a3d73b68ad408ca3843356b5cf67f6f14", + "is_verified": false, + "line_number": 93, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java", + "hashed_secret": "9ae9f2be7702b726809545808a8a9ba2e5a38410", + "is_verified": false, + "line_number": 130, + "is_secret": false + } + ], + "repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java", + "hashed_secret": "65e636b62dec4469612f16d52ff6df67f9da39e5", + "is_verified": false, + "line_number": 47, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java", + "hashed_secret": "4562cd9b8a9ece1f797784a2256a0812778680e1", + "is_verified": false, + "line_number": 63, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/content-service.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/content-service.properties", + "hashed_secret": "4737a3ab81d198fe7e81e91ce484ace21e13fdf4", + "is_verified": false, + "line_number": 24, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages.properties", + "hashed_secret": "5c4bc97ee5d0ac344829dbcef02d7302feb098a8", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_cs.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_cs.properties", + "hashed_secret": "3840ac3163c4ae3c44592e153e8aa9c005eb4976", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_da.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_da.properties", + "hashed_secret": "7795d909f846130a4b0ca2ceb11a45595a926dd7", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_de.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_de.properties", + "hashed_secret": "6ac2476e6b3264476c266b8b62e58463876eec93", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_es.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_es.properties", + "hashed_secret": "95c4a994da53f9d8c72f0090abd7dd4ee27e6a97", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_fi.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_fi.properties", + "hashed_secret": "92651e851d1a520088933d6b71c6706fc9b7fffe", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_fr.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_fr.properties", + "hashed_secret": "bb642b8d5071dbbf3779269cba14e721dc262bf7", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_it.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_it.properties", + "hashed_secret": "add35a788b003ae03ac5d8295f85ba295bc72ffd", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_nb.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_nb.properties", + "hashed_secret": "eb7fbdaf36ad281fde77f529f34af1d978f1bffe", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_nl.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_nl.properties", + "hashed_secret": "b64c2b68f7d1657c41a91ebf1fcf3fc31b05f6bd", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_pl.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_pl.properties", + "hashed_secret": "9d2c0d9b6442c31608b506bc56d6bd3fb7e6b7f6", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/reset-password-messages_pt_BR.properties", + "hashed_secret": "c46c3f680d905635a6921b359958008cb01a88ca", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service.properties", + "hashed_secret": "a945c7b85d492603ff45bc8b5ffebb3f93e801f8", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_cs.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_cs.properties", + "hashed_secret": "9f7107d692855f31ac45258147f51061f58912fd", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_da.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_da.properties", + "hashed_secret": "1908bd06e765ab2a7eccb65eb75e969b6b1cd7d0", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_de.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_de.properties", + "hashed_secret": "6532379d6c1e79379b9cf6525931289f989277b0", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_es.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_es.properties", + "hashed_secret": "af1daa244f81315fd558c04acef3abcc7d2a2f33", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_fi.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_fi.properties", + "hashed_secret": "a09629af4a7dc396527e2564da7ab83432c2442c", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_fr.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_fr.properties", + "hashed_secret": "5a540b7894111df6f7e4415f7f268cb3f1021d6f", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_it.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_it.properties", + "hashed_secret": "a337872fcdd32797bce4edfff734dc46cfc43ff9", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_nb.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_nb.properties", + "hashed_secret": "12a34c67bcf44c9ab1468b2f8ee7829a2df4568a", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_nl.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_nl.properties", + "hashed_secret": "e3bbf7fadd78a31531a446935bc03b73211c9fd0", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_pl.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_pl.properties", + "hashed_secret": "9618b3812f9d4b1adbdcd428b79bf2e8049f4cfd", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_pt_BR.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_pt_BR.properties", + "hashed_secret": "6eda6f1f1c71323a31fa2320efa8007d3265b0d4", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/messages/transfer-service_sv.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/messages/transfer-service_sv.properties", + "hashed_secret": "edcb85415622decdad5e58098a287f24478eb0db", + "is_verified": false, + "line_number": 48, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/repository.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/repository.properties", + "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b", + "is_verified": false, + "line_number": 245, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/repository.properties", + "hashed_secret": "1459a56410378e4d3ab470eff570e5eae1742762", + "is_verified": false, + "line_number": 312, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/repository.properties", + "hashed_secret": "84551ae5442affc9f1a2d3b4c86ae8b24860149d", + "is_verified": false, + "line_number": 770, + "is_secret": false + } + ], + "repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/alfresco/subsystems/Authentication/ldap/ldap-authentication.properties", + "hashed_secret": "ca9d2dd42543cea510c0b9c2bce22272f4fb264a", + "is_verified": false, + "line_number": 187, + "is_secret": false + } + ], + "repository/src/main/resources/org/alfresco/encryption/keystore-parameters.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/main/resources/org/alfresco/encryption/keystore-parameters.properties", + "hashed_secret": "f039ca7aa02b913940a6a97f01251f257178068f", + "is_verified": false, + "line_number": 1, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 88, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java", + "hashed_secret": "c464af817287343305cbd6493c593885695df531", + "is_verified": false, + "line_number": 92, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java", + "hashed_secret": "8ad8572a0b3fc4cb3afc1baaebc97a2cae58eb8c", + "is_verified": false, + "line_number": 93, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java", + "hashed_secret": "915692b4d7465b0084354173d552ac90145dc315", + "is_verified": false, + "line_number": 94, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java": [ + { + "type": "Base64 High Entropy String", + "filename": "repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java", + "hashed_secret": "8c85434f6f339a24b808810bd95629d0f5856355", + "is_verified": false, + "line_number": 1280, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/opencmis/CMISTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/opencmis/CMISTest.java", + "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684", + "is_verified": false, + "line_number": 4134, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 140, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 102, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 118, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 68, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 116, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/imap/LoadTester.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/imap/LoadTester.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 80, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java", + "hashed_secret": "678721c0433c8cf5c9069a0e70784cf1839e866b", + "is_verified": false, + "line_number": 58, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 109, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 112, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 103, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java", + "hashed_secret": "9f1bf21429a1074c37c6017bb76c3e3132bab061", + "is_verified": false, + "line_number": 65, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java", + "hashed_secret": "209b9067f058a1c526cd5db7057f52ed1bbd6583", + "is_verified": false, + "line_number": 70, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java", + "hashed_secret": "1af7165c744122c81be672d0deb9f04c02117c42", + "is_verified": false, + "line_number": 75, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java", + "hashed_secret": "9e10e28cb9c3e381c13d13fa97dd97148982cdaa", + "is_verified": false, + "line_number": 595, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 74, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java", + "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0", + "is_verified": false, + "line_number": 61, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java", + "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0", + "is_verified": false, + "line_number": 61, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java", + "hashed_secret": "ad8a621976e9a19cc78af501a84638a04fca9b83", + "is_verified": false, + "line_number": 65, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java", + "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0", + "is_verified": false, + "line_number": 70, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 127, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 1328, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 68, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java", + "hashed_secret": "607e729c2f77c4e821e68e26b4c1f5a4398624e9", + "is_verified": false, + "line_number": 2129, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java", + "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684", + "is_verified": false, + "line_number": 37, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java", + "hashed_secret": "4360136f24381dcec1d35d79fbf7dac4b54dfe97", + "is_verified": false, + "line_number": 301, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java": [ + { + "type": "Base64 High Entropy String", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java", + "hashed_secret": "c4b66dbe168ad1d2b19119494a0da063801bc3bb", + "is_verified": false, + "line_number": 83, + "is_secret": false + }, + { + "type": "JSON Web Token", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java", + "hashed_secret": "c5aad1895e1dcff195992938f1bcc9954d575ac9", + "is_verified": false, + "line_number": 92, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/LazyInstantiatingIdentityServiceFacadeUnitTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/LazyInstantiatingIdentityServiceFacadeUnitTest.java", + "hashed_secret": "12e59296b0d17c1ceb345a7adca98574c835ba24", + "is_verified": false, + "line_number": 45, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacadeUnitTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacadeUnitTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 46, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/tenant/MultiTNodeServiceInterceptorTest.java", + "hashed_secret": "a63d4b132a9a1d3430f9ae507825f572449e0d17", + "is_verified": false, + "line_number": 51, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 75, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 664, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 203, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java", + "hashed_secret": "ad782ecdac770fc6eb9a62e44f90873fb97fb26b", + "is_verified": false, + "line_number": 513, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 3687, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java", + "hashed_secret": "8be3c943b1609fffbfc51aad666d0a04adf83c9d", + "is_verified": false, + "line_number": 2682, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 3772, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 115, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java", + "hashed_secret": "5395ebfd174b0a5617e6f409dfbb3e064e3fdf0a", + "is_verified": false, + "line_number": 127, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 149, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/version/NodeServiceImplTest.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 86, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java", + "hashed_secret": "dee17075a8c96d9c57c15d56b1f64e5abc1caf0b", + "is_verified": false, + "line_number": 122, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 67, + "is_secret": false + } + ], + "repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java", + "hashed_secret": "f73e110427648014568f7144031a6d48060eab0a", + "is_verified": false, + "line_number": 55, + "is_secret": false + } + ], + "repository/src/test/resources/alfresco-global.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/resources/alfresco-global.properties", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 21, + "is_secret": false + } + ], + "repository/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml", + "hashed_secret": "99a3024c77ef51c031038ab2c696f85e93ca9e62", + "is_verified": false, + "line_number": 12, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/resources/alfresco/keystore-tests/encryption-test-context.xml", + "hashed_secret": "316d20a7e5744b8542e2a4b14b0a38084150c8ae", + "is_verified": false, + "line_number": 13, + "is_secret": false + } + ], + "repository/src/test/resources/alfresco/keystore/keystore-passwords.properties": [ + { + "type": "Secret Keyword", + "filename": "repository/src/test/resources/alfresco/keystore/keystore-passwords.properties", + "hashed_secret": "f039ca7aa02b913940a6a97f01251f257178068f", + "is_verified": false, + "line_number": 6, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "repository/src/test/resources/alfresco/keystore/keystore-passwords.properties", + "hashed_secret": "22ccad749b70baa70011eaab411efa0c4128ee86", + "is_verified": false, + "line_number": 10, + "is_secret": false + } + ], + "repository/src/test/resources/bulkimport/folder1/folder1.1/quick.vdx": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/test/resources/bulkimport/folder1/folder1.1/quick.vdx", + "hashed_secret": "37c332070388a4797ccf1fa64f7029a193ce0371", + "is_verified": false, + "line_number": 2, + "is_secret": false + } + ], + "repository/src/test/resources/imap/test-tnef-message.eml": [ + { + "type": "AWS Access Key", + "filename": "repository/src/test/resources/imap/test-tnef-message.eml", + "hashed_secret": "b3a5ad926ea30683aa0628700e681923b79a0537", + "is_verified": false, + "line_number": 159, + "is_secret": false + } + ], + "repository/src/test/resources/quick/quick.vdx": [ + { + "type": "Hex High Entropy String", + "filename": "repository/src/test/resources/quick/quick.vdx", + "hashed_secret": "37c332070388a4797ccf1fa64f7029a193ce0371", + "is_verified": false, + "line_number": 2, + "is_secret": false + } + ], + "repository/src/test/resources/realms/alfresco-realm.json": [ + { + "type": "Base64 High Entropy String", + "filename": "repository/src/test/resources/realms/alfresco-realm.json", + "hashed_secret": "3fd30b50f0bc29e976e17546c5d52d39fac358ee", + "is_verified": false, + "line_number": 1792, + "is_secret": false + }, + { + "type": "Base64 High Entropy String", + "filename": "repository/src/test/resources/realms/alfresco-realm.json", + "hashed_secret": "8f45a0ff50a62e6f42d8b968dd5a59c4e8b973aa", + "is_verified": false, + "line_number": 1843, + "is_secret": false + } + ], + "scripts/ci/docker-compose/docker-compose.yaml": [ + { + "type": "Secret Keyword", + "filename": "scripts/ci/docker-compose/docker-compose.yaml", + "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997", + "is_verified": false, + "line_number": 39, + "is_secret": false + }, + { + "type": "Secret Keyword", + "filename": "scripts/ci/docker-compose/docker-compose.yaml", + "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", + "is_verified": false, + "line_number": 43, + "is_secret": false + } + ] + }, + "generated_at": "2024-09-24T14:22:59Z" +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 740a9afe34..0f34a26c43 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,6 +3,52 @@ Thanks for your interest in contributing to this project! The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version. +The project uses [pre-commit](https://pre-commit.com/) to format code (with [Spotless](https://github.com/diffplug/spotless)), validate license headers and check for secrets (with [detect-secrets](https://github.com/Yelp/detect-secrets)). To install the pre-commit hooks then first install pre-commit and then run: +```shell +pre-commit install +``` +When you make a commit then these hooks will run and check the modified files. If it makes changes then you can review them and then `git commit` again to accept the changes. + +#### Code Quality +This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality. + +To check code-style violations you can use: +```bash +mvn spotless:check +``` +To reformat files you can use: +```bash +mvn spotless:apply +``` + +#### Secret Detection + +We are using [detect-secrets](https://github.com/Yelp/detect-secrets) to try to avoid accidentally publishing secret keys. +If you have pre-commit installed then this should run automatically when making a commit. Usually there should be no issues, +but if it finds a potential issue (e.g. a high entropy string) then you will see the following: + +```shell +Detect secrets...........................................................Failed +- hook id: detect-secrets +- exit code: 1 + +ERROR: Potential secrets about to be committed to git repo! + +Secret Type: Secret Keyword +Location: test.txt:1 +``` + +If this is a false positive and you actually want to commit the string then run these two commands: + +```shell +detect-secrets scan --baseline .secrets.baseline +detect-secrets audit .secrets.baseline +``` + +This will update the baseline file to include your new code and then allow you to review the detected secret and mark it as a false positive. +Once you are finished then you can add `.secrets.baseline` to the staged changes and you should be able to create a commit. + + Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](https://hub.alfresco.com/t5/alfresco-content-services-ecm/ct-p/ECM-software) where they can be referenced from multiple projects. You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com). diff --git a/alfresco-formatter.xml b/alfresco-formatter.xml new file mode 100644 index 0000000000..9d6b8943ac --- /dev/null +++ b/alfresco-formatter.xml @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 264c13c0ab..993c5db302 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,9 @@ 2.2.0 2.4.0 + 2.43.0 + + NO_AUTOMATED_FORMATTING 42.7.4 8.0.30 @@ -1146,6 +1149,26 @@ + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-plugin.version} + + + + ${spotless-include-list} + + + alfresco-formatter.xml + + + \#java|\#javax|\#jakarta,\#,\#org.alfresco,java|javax|jakarta,,org.alfresco + + + + + + @@ -1157,6 +1180,10 @@ org.apache.maven.plugins maven-enforcer-plugin + + com.diffplug.spotless + spotless-maven-plugin + diff --git a/scripts/hooks/check-format-and-headers.sh b/scripts/hooks/check-format-and-headers.sh new file mode 100755 index 0000000000..484e39c49c --- /dev/null +++ b/scripts/hooks/check-format-and-headers.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +set +x + +if [[ -z ${GITHUB_MODIFIED_FILES} ]] +then + modified_files=$(git diff --cached --name-only --diff-filter=ACMR) +else + modified_files=${GITHUB_MODIFIED_FILES} +fi + +include_list="" +for file in ${modified_files} +do + include_list="${include_list},${file}" +done +include_list=${include_list:1} + +mvn spotless:apply validate -DlicenseUpdateHeaders=true -Dspotless-include-list="${include_list}" > /dev/null || true + +all_nonconformant_files=$(git diff --name-only --diff-filter=ACMR) + +for file in ${all_nonconformant_files} +do + revert=1 + for modified_file in ${modified_files} + do + if [[ "${modified_file}" == "${file}" ]] + then + revert=0 + break + fi + done + if [[ ${revert} == 1 ]] + then + git checkout -- "${file}" + fi +done + +set -x From 6805ce85c8729ad62d3fc6835cf99669159f323a Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:25:26 +0000 Subject: [PATCH 088/148] [maven-release-plugin][skip ci] prepare release 23.4.0.25 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 5e94231831..3114c10ce2 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 3e95f64392..5e4c6d20eb 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 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 9f50cb681d..b525bf7420 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 4c597850af..b6152b1f34 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b606b64330..32f0481339 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 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 7669a3a6f0..cf4285a720 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/amps/pom.xml b/amps/pom.xml index c761f46786..cd7f250b6a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5ada9c2d1e..a05047aed6 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/core/pom.xml b/core/pom.xml index 8c5beaa1a3..3d23163704 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/data-model/pom.xml b/data-model/pom.xml index e5d721f545..26c629128f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/mmt/pom.xml b/mmt/pom.xml index 413fcab591..be08542b1f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e3cc8a727f..a1f37282b6 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2126348a70..e7a626f32f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/pom.xml b/packaging/pom.xml index a3d5e83d7b..41bdbbcf08 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 424bccd756..a34c3b56f3 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 373290368f..41c7e9fd7c 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1d3be08190..c871e2cd80 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4dc4a53bef..1ab9237671 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 167928fad8..1d1c325835 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d90266f2af..d3c956e891 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 - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 5525907516..8a9e46f924 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/pom.xml b/pom.xml index 993c5db302..9e7110a762 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.25 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index dff1b6d679..19a8808826 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 diff --git a/repository/pom.xml b/repository/pom.xml index d36825c540..15af26226f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25-SNAPSHOT + 23.4.0.25 From 67aa6ac5fc5f023c3b8729ed366ff912f8521cc4 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:25:28 +0000 Subject: [PATCH 089/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 3114c10ce2..399a9d6fa1 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 5e4c6d20eb..b4844238ba 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 - 23.4.0.25 + 23.4.0.26-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 b525bf7420..8455867090 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b6152b1f34..2c1232fefd 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 32f0481339..7e3f94125e 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 - 23.4.0.25 + 23.4.0.26-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 cf4285a720..6c3f7d004b 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index cd7f250b6a..2d0786d217 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index a05047aed6..192bdf9029 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 3d23163704..1778b33205 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 26c629128f..31212220fc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index be08542b1f..c0e3a9f1c7 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a1f37282b6..0389cc3124 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index e7a626f32f..cf994f966a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 41bdbbcf08..c9c9a72cf3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a34c3b56f3..f2a52f507e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 41c7e9fd7c..42a07ee175 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c871e2cd80..02b2f4f17b 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1ab9237671..dd64b91846 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 1d1c325835..a354be3521 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d3c956e891..c469ed90f7 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 - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8a9e46f924..a6cfab73dc 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9e7110a762..f2aa784c0e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.25 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 19a8808826..26a6e228f0 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 15af26226f..2158cd2bc0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.25 + 23.4.0.26-SNAPSHOT From 0b511e0b55ae4e75e40e42a38323e088199365b8 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Sep 2024 11:33:31 +0100 Subject: [PATCH 090/148] Unify checkout action. --- .github/workflows/ci.yml | 5 ++--- .secrets.baseline | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 653909408a..78e6b4a3f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,12 +42,11 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - id: changed-files uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0 with: diff --git a/.secrets.baseline b/.secrets.baseline index 640549658b..7375162a97 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -133,21 +133,21 @@ "filename": ".github/workflows/ci.yml", "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572", "is_verified": false, - "line_number": 293 + "line_number": 292 }, { "type": "Secret Keyword", "filename": ".github/workflows/ci.yml", "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966", "is_verified": false, - "line_number": 368 + "line_number": 367 }, { "type": "Secret Keyword", "filename": ".github/workflows/ci.yml", "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39", "is_verified": false, - "line_number": 901 + "line_number": 900 } ], ".github/workflows/master_release.yml": [ @@ -1888,5 +1888,5 @@ } ] }, - "generated_at": "2024-09-24T14:22:59Z" + "generated_at": "2024-09-25T10:33:16Z" } From 837fb0cccd30da1966a294e9da1682cfc5173dd8 Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:47:06 +0200 Subject: [PATCH 091/148] MNT-24346: Fix "0" return status code in Search API when Solr is unavailable. (#2939) * MNT-24346: Fix 0 status code in Search API when Solr is unavailable. * MNT-24346: Fixing PMD issues. * MNT-24346: Fixing formatting. * MNT-24346: Reverting accidental method name change. --- .../httpclient/HttpClientException.java | 5 +++++ .../solr/AbstractSolrQueryHTTPClient.java | 8 ++++++-- .../solr/AbstractSolrQueryHTTPClientTest.java | 20 ++++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/alfresco/httpclient/HttpClientException.java b/core/src/main/java/org/alfresco/httpclient/HttpClientException.java index 9dc0f38784..3d9b0cffb5 100644 --- a/core/src/main/java/org/alfresco/httpclient/HttpClientException.java +++ b/core/src/main/java/org/alfresco/httpclient/HttpClientException.java @@ -27,4 +27,9 @@ public class HttpClientException extends AlfrescoRuntimeException { super(msgId); } + + public HttpClientException(String msgId, Throwable cause) + { + super(msgId, cause); + } } diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java index ffeb90d543..e901917ebd 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java @@ -33,6 +33,7 @@ import java.util.List; import jakarta.servlet.http.HttpServletResponse; +import org.alfresco.httpclient.HttpClientException; import org.alfresco.repo.search.QueryParserException; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; @@ -139,8 +140,11 @@ public abstract class AbstractSolrQueryHTTPClient Reader reader = new BufferedReader(new InputStreamReader(post.getResponseBodyAsStream(), post.getResponseCharSet())); // TODO - replace with streaming-based solution e.g. SimpleJSON ContentHandler - JSONObject json = new JSONObject(new JSONTokener(reader)); - return json; + return new JSONObject(new JSONTokener(reader)); + } + catch (IOException e) + { + throw new HttpClientException("[%s] %s".formatted(this.getClass().getSimpleName(), e.getMessage()), e); } finally { diff --git a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java index 8fe0ba05f4..a2926ee02d 100644 --- a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java +++ b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java @@ -26,7 +26,10 @@ package org.alfresco.repo.search.impl.solr; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -35,7 +38,9 @@ import static org.mockito.MockitoAnnotations.openMocks; import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; +import java.io.IOException; +import org.alfresco.httpclient.HttpClientException; import org.alfresco.repo.search.QueryParserException; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; @@ -53,7 +58,7 @@ public class AbstractSolrQueryHTTPClientTest private static final String URL = "http://this/is/a/url"; /** The abstract class under test. */ - private AbstractSolrQueryHTTPClient abstractSolrQueryHTTPClient = spy(AbstractSolrQueryHTTPClient.class); + private final AbstractSolrQueryHTTPClient abstractSolrQueryHTTPClient = spy(AbstractSolrQueryHTTPClient.class); @Mock private HttpClient httpClient; @Mock @@ -147,6 +152,19 @@ public class AbstractSolrQueryHTTPClientTest assertEquals("Unexpected JSON response received.", "{}", response.toString()); } + @Test + public void testPostQuery_handlesIOException() throws Exception + { + String messageFromHttp = "Some IO Exception"; + when(httpClient.executeMethod(any())).thenThrow(new IOException(messageFromHttp)); + + HttpClientException expectedException = + assertThrows(HttpClientException.class, () -> abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body)); + + String exceptionMessage = expectedException.getMessage(); + assertTrue(exceptionMessage.endsWith("[%s] %s".formatted(abstractSolrQueryHTTPClient.getClass().getSimpleName(), messageFromHttp))); + } + /** Create an input stream containing the given string. */ private ByteArrayInputStream convertStringToInputStream(String message) { From 87bba8e381f046315d9a06e9ed80648485409776 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Sep 2024 14:16:27 +0100 Subject: [PATCH 092/148] Include AGS and TAS in pre-commit scan. --- scripts/hooks/check-format-and-headers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/hooks/check-format-and-headers.sh b/scripts/hooks/check-format-and-headers.sh index 484e39c49c..26286305d8 100755 --- a/scripts/hooks/check-format-and-headers.sh +++ b/scripts/hooks/check-format-and-headers.sh @@ -16,7 +16,7 @@ do done include_list=${include_list:1} -mvn spotless:apply validate -DlicenseUpdateHeaders=true -Dspotless-include-list="${include_list}" > /dev/null || true +mvn spotless:apply validate -DlicenseUpdateHeaders=true -Pags,all-tas-tests -Dspotless-include-list="${include_list}" > /dev/null || true all_nonconformant_files=$(git diff --name-only --diff-filter=ACMR) From 0f6950a72e5d549f42abd52d5e5b0d86f7728234 Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:27:06 +0200 Subject: [PATCH 093/148] MNT-24346 Fix "0" return status code when SORL unavailable (#2942) * MNT-24346: Fix 0 status code in Search API when Solr is unavailable. * MNT-24346: Fixing PMD issues. * MNT-24346: Fixing formatting. * MNT-24346: Reverting accidental method name change. * MNT-24346: Fixing spotless issues. * MNT-24346: Fixing spotless issues. * MNT-24346: Fixing spotless issues. * MNT-24346 Fix line endings. --------- Co-authored-by: Tom Page --- .../solr/AbstractSolrQueryHTTPClient.java | 26 +- .../solr/AbstractSolrQueryHTTPClientTest.java | 346 +++++++++--------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java index e901917ebd..25b5d632e0 100644 --- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java +++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClient.java @@ -2,23 +2,23 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 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 + * 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 . * #L% @@ -30,11 +30,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.util.List; - import jakarta.servlet.http.HttpServletResponse; -import org.alfresco.httpclient.HttpClientException; -import org.alfresco.repo.search.QueryParserException; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; @@ -48,13 +45,16 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; +import org.alfresco.httpclient.HttpClientException; +import org.alfresco.repo.search.QueryParserException; + public abstract class AbstractSolrQueryHTTPClient { /** Logger for the class. */ private static final Log LOGGER = LogFactory.getLog(AbstractSolrQueryHTTPClient.class); public static final int DEFAULT_SAVEPOST_BUFFER = 4096; - + // Constants copied from org.apache.solr.common.params.HighlightParams (solr-solrj:1.4.1) // These values have been moved to this Alfresco class to avoid using solr-solrj library as dependency public static final String HIGHLIGHT_PARAMS_HIGHLIGHT = "hl"; @@ -86,7 +86,7 @@ public abstract class AbstractSolrQueryHTTPClient /** List of SOLR Exceptions that should be returning HTTP 501 status code in Remote API. */ private static final List STATUS_CODE_501_EXCEPTIONS = List.of("java.lang.UnsupportedOperationException"); - + protected JSONObject postQuery(HttpClient httpClient, String url, JSONObject body) throws IOException, JSONException { PostMethod post = createNewPostMethod(url); @@ -99,7 +99,7 @@ public abstract class AbstractSolrQueryHTTPClient try { httpClient.executeMethod(post); - if(post.getStatusCode() == HttpStatus.SC_MOVED_PERMANENTLY || post.getStatusCode() == HttpStatus.SC_MOVED_TEMPORARILY) + if (post.getStatusCode() == HttpStatus.SC_MOVED_PERMANENTLY || post.getStatusCode() == HttpStatus.SC_MOVED_TEMPORARILY) { Header locationHeader = post.getResponseHeader("location"); if (locationHeader != null) diff --git a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java index a2926ee02d..8be37a4db3 100644 --- a/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java +++ b/repository/src/test/java/org/alfresco/repo/search/impl/solr/AbstractSolrQueryHTTPClientTest.java @@ -1,173 +1,173 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2023 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 . - * #L% - */ -package org.alfresco.repo.search.impl.solr; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.mockito.MockitoAnnotations.openMocks; - -import jakarta.servlet.http.HttpServletResponse; -import java.io.ByteArrayInputStream; -import java.io.IOException; - -import org.alfresco.httpclient.HttpClientException; -import org.alfresco.repo.search.QueryParserException; -import org.apache.commons.httpclient.Header; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.URI; -import org.apache.commons.httpclient.methods.PostMethod; -import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; - -/** Tests for the {@link AbstractSolrQueryHTTPClient}. */ -public class AbstractSolrQueryHTTPClientTest -{ - /** A URL for use in the tests. */ - private static final String URL = "http://this/is/a/url"; - - /** The abstract class under test. */ - private final AbstractSolrQueryHTTPClient abstractSolrQueryHTTPClient = spy(AbstractSolrQueryHTTPClient.class); - @Mock - private HttpClient httpClient; - @Mock - private JSONObject body; - @Mock - private PostMethod postMethod; - @Mock - private Header header; - - @Before - public void setUp() throws Exception - { - openMocks(this); - - doReturn(postMethod).when(abstractSolrQueryHTTPClient).createNewPostMethod(URL); - when(postMethod.getResponseCharSet()).thenReturn("UTF-8"); - } - - /** Check postQuery works as expected for the success case. */ - @Test - public void testPostQuery_success() throws Exception - { - when(body.toString()).thenReturn("Example body"); - when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_OK); - when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream("{}")); - - JSONObject response = abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); - - assertEquals("Unexpected JSON response received.", "{}", response.toString()); - } - - /** Check that the status code is usually passed through from Solr. */ - @Test - public void testPostQuery_failure() throws Exception - { - String failureMessage = "{\"error\": {\"trace\": \"ExceptionClass: Stacktrace\"}}"; - - when(body.toString()).thenReturn("Example body"); - when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_FOUND); - when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream(failureMessage)); - when(postMethod.getResponseBodyAsString()).thenReturn(failureMessage); - - try - { - abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); - fail("Expected a QueryParserException to be thrown."); - } - catch (QueryParserException e) - { - assertEquals("Unexpected status code in exception.", e.getHttpStatusCode(), HttpServletResponse.SC_NOT_FOUND); - verify(postMethod).releaseConnection(); - } - } - - /** Check that the status code is replaced with "Not Implemented" for an unsupported query option. */ - @Test - public void testPostQuery_unsupportedOperation() throws Exception - { - String failureMessage = "{\"error\": {\"trace\": \"java.lang.UnsupportedOperationException: Stacktrace\"}}"; - - when(body.toString()).thenReturn("Example body"); - when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream(failureMessage)); - when(postMethod.getResponseBodyAsString()).thenReturn(failureMessage); - - try - { - abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); - fail("Expected a QueryParserException to be thrown."); - } - catch (QueryParserException e) - { - assertEquals("Unexpected status code in exception.", e.getHttpStatusCode(), HttpServletResponse.SC_NOT_IMPLEMENTED); - } - } - - /** Check that a redirect can be followed if the endpoint reports that it's moved. */ - @Test - public void testPostQuery_moved() throws Exception - { - when(body.toString()).thenReturn("Example body"); - // Report "moved" for the first invocation and then OK for subsequent requests. - when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_MOVED_PERMANENTLY).thenReturn(HttpServletResponse.SC_OK); - when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream("{}")); - when(postMethod.getResponseHeader("location")).thenReturn(header); - when(header.getValue()).thenReturn("http://new/URL"); - - JSONObject response = abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); - - verify(postMethod).setURI(new URI("http://new/URL", true)); - assertEquals("Unexpected JSON response received.", "{}", response.toString()); - } - - @Test - public void testPostQuery_handlesIOException() throws Exception - { - String messageFromHttp = "Some IO Exception"; - when(httpClient.executeMethod(any())).thenThrow(new IOException(messageFromHttp)); - - HttpClientException expectedException = - assertThrows(HttpClientException.class, () -> abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body)); - - String exceptionMessage = expectedException.getMessage(); - assertTrue(exceptionMessage.endsWith("[%s] %s".formatted(abstractSolrQueryHTTPClient.getClass().getSimpleName(), messageFromHttp))); - } - - /** Create an input stream containing the given string. */ - private ByteArrayInputStream convertStringToInputStream(String message) - { - return new ByteArrayInputStream(message.getBytes()); - } -} +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.repo.search.impl.solr; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.openMocks; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import jakarta.servlet.http.HttpServletResponse; + +import org.apache.commons.httpclient.Header; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.URI; +import org.apache.commons.httpclient.methods.PostMethod; +import org.json.JSONObject; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; + +import org.alfresco.httpclient.HttpClientException; +import org.alfresco.repo.search.QueryParserException; + +/** Tests for the {@link AbstractSolrQueryHTTPClient}. */ +public class AbstractSolrQueryHTTPClientTest +{ + /** A URL for use in the tests. */ + private static final String URL = "http://this/is/a/url"; + + /** The abstract class under test. */ + private final AbstractSolrQueryHTTPClient abstractSolrQueryHTTPClient = spy(AbstractSolrQueryHTTPClient.class); + @Mock + private HttpClient httpClient; + @Mock + private JSONObject body; + @Mock + private PostMethod postMethod; + @Mock + private Header header; + + @Before + public void setUp() throws Exception + { + openMocks(this); + + doReturn(postMethod).when(abstractSolrQueryHTTPClient).createNewPostMethod(URL); + when(postMethod.getResponseCharSet()).thenReturn("UTF-8"); + } + + /** Check postQuery works as expected for the success case. */ + @Test + public void testPostQuery_success() throws Exception + { + when(body.toString()).thenReturn("Example body"); + when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_OK); + when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream("{}")); + + JSONObject response = abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); + + assertEquals("Unexpected JSON response received.", "{}", response.toString()); + } + + /** Check that the status code is usually passed through from Solr. */ + @Test + public void testPostQuery_failure() throws Exception + { + String failureMessage = "{\"error\": {\"trace\": \"ExceptionClass: Stacktrace\"}}"; + + when(body.toString()).thenReturn("Example body"); + when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_FOUND); + when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream(failureMessage)); + when(postMethod.getResponseBodyAsString()).thenReturn(failureMessage); + + try + { + abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); + fail("Expected a QueryParserException to be thrown."); + } + catch (QueryParserException e) + { + assertEquals("Unexpected status code in exception.", e.getHttpStatusCode(), HttpServletResponse.SC_NOT_FOUND); + verify(postMethod).releaseConnection(); + } + } + + /** Check that the status code is replaced with "Not Implemented" for an unsupported query option. */ + @Test + public void testPostQuery_unsupportedOperation() throws Exception + { + String failureMessage = "{\"error\": {\"trace\": \"java.lang.UnsupportedOperationException: Stacktrace\"}}"; + + when(body.toString()).thenReturn("Example body"); + when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream(failureMessage)); + when(postMethod.getResponseBodyAsString()).thenReturn(failureMessage); + + try + { + abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); + fail("Expected a QueryParserException to be thrown."); + } + catch (QueryParserException e) + { + assertEquals("Unexpected status code in exception.", e.getHttpStatusCode(), HttpServletResponse.SC_NOT_IMPLEMENTED); + } + } + + /** Check that a redirect can be followed if the endpoint reports that it's moved. */ + @Test + public void testPostQuery_moved() throws Exception + { + when(body.toString()).thenReturn("Example body"); + // Report "moved" for the first invocation and then OK for subsequent requests. + when(postMethod.getStatusCode()).thenReturn(HttpServletResponse.SC_MOVED_PERMANENTLY).thenReturn(HttpServletResponse.SC_OK); + when(postMethod.getResponseBodyAsStream()).thenReturn(convertStringToInputStream("{}")); + when(postMethod.getResponseHeader("location")).thenReturn(header); + when(header.getValue()).thenReturn("http://new/URL"); + + JSONObject response = abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body); + + verify(postMethod).setURI(new URI("http://new/URL", true)); + assertEquals("Unexpected JSON response received.", "{}", response.toString()); + } + + @Test + public void testPostQuery_handlesIOException() throws Exception + { + String messageFromHttp = "Some IO Exception"; + when(httpClient.executeMethod(any())).thenThrow(new IOException(messageFromHttp)); + + HttpClientException expectedException = assertThrows(HttpClientException.class, () -> abstractSolrQueryHTTPClient.postQuery(httpClient, URL, body)); + + String exceptionMessage = expectedException.getMessage(); + assertTrue(exceptionMessage.endsWith("[%s] %s".formatted(abstractSolrQueryHTTPClient.getClass().getSimpleName(), messageFromHttp))); + } + + /** Create an input stream containing the given string. */ + private ByteArrayInputStream convertStringToInputStream(String message) + { + return new ByteArrayInputStream(message.getBytes()); + } +} From 9f6ef99ef5c1ee1e91e462c99509cab7088857f2 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:43:44 +0000 Subject: [PATCH 094/148] [maven-release-plugin][skip ci] prepare release 23.4.0.26 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 399a9d6fa1..56a22a7f03 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b4844238ba..265bda6951 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 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 8455867090..ccc908b848 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2c1232fefd..d8edcfebe1 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 7e3f94125e..8a031b1dd3 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 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 6c3f7d004b..6661ec87b6 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/amps/pom.xml b/amps/pom.xml index 2d0786d217..1aa433dcdc 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 192bdf9029..663245406b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/core/pom.xml b/core/pom.xml index 1778b33205..0d11d4069f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/data-model/pom.xml b/data-model/pom.xml index 31212220fc..9eb57d9346 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/mmt/pom.xml b/mmt/pom.xml index c0e3a9f1c7..895d187334 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 0389cc3124..082ee3f75f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cf994f966a..d973803fe8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/pom.xml b/packaging/pom.xml index c9c9a72cf3..5166599025 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f2a52f507e..f7c611ec45 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 42a07ee175..03d411338e 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 02b2f4f17b..e70e6ce0e7 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index dd64b91846..91c41751f3 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a354be3521..c8008e8c20 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c469ed90f7..47c502a1ce 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 - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a6cfab73dc..6c3eda9b0c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/pom.xml b/pom.xml index f2aa784c0e..9395a3f93f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.26 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 26a6e228f0..618e56d7e3 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 diff --git a/repository/pom.xml b/repository/pom.xml index 2158cd2bc0..9b8e2355c9 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26-SNAPSHOT + 23.4.0.26 From f3e0c43f3b32de6c4a6644e8b42679825783f98f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:43:46 +0000 Subject: [PATCH 095/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 56a22a7f03..2233391be9 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 265bda6951..cbb839ed33 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 - 23.4.0.26 + 23.4.0.27-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 ccc908b848..ff0ca47878 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d8edcfebe1..282beda941 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 8a031b1dd3..48c03eacda 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 - 23.4.0.26 + 23.4.0.27-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 6661ec87b6..6e63776516 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 1aa433dcdc..dd060e23d3 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 663245406b..348d89aafc 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0d11d4069f..329ecf6c76 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9eb57d9346..0c56f329bc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 895d187334..fd125d5a55 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 082ee3f75f..929c66595c 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index d973803fe8..8439f7ab59 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5166599025..471480c002 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f7c611ec45..5549c34907 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 03d411338e..d7ce093eb2 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e70e6ce0e7..5c11665299 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 91c41751f3..7bbfd4c8cc 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c8008e8c20..60798b4a4c 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 47c502a1ce..ed2a8313f7 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 - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6c3eda9b0c..b1f3aca59a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9395a3f93f..21234da963 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.26 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 618e56d7e3..ef20c6f3e7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 9b8e2355c9..378f4f8c7b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.26 + 23.4.0.27-SNAPSHOT From 008b33efbd633856a991c8a0640371a358c55d8f Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 29 Sep 2024 00:04:25 +0000 Subject: [PATCH 096/148] [force] Force release for 2024-09-29. From fd4e630f0ff2ad748d7768b985785c0d9b70c7ca Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 29 Sep 2024 00:07:48 +0000 Subject: [PATCH 097/148] [maven-release-plugin][skip ci] prepare release 23.4.0.27 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2233391be9..2c53912cd9 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index cbb839ed33..9ac92cd966 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 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 ff0ca47878..2a5e58f017 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 282beda941..e534b764b2 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 48c03eacda..9cc24372de 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 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 6e63776516..42183dbca2 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/amps/pom.xml b/amps/pom.xml index dd060e23d3..cbd1d8afe2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 348d89aafc..01445b8a0b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/core/pom.xml b/core/pom.xml index 329ecf6c76..32967ce91d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0c56f329bc..a9962a7223 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/mmt/pom.xml b/mmt/pom.xml index fd125d5a55..640bf9ec7f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 929c66595c..da42cfd220 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8439f7ab59..48179ab8a3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/pom.xml b/packaging/pom.xml index 471480c002..a1e41b295f 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 5549c34907..f46c753ace 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index d7ce093eb2..7b28f4da66 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5c11665299..74febd641b 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7bbfd4c8cc..d78e010e6f 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 60798b4a4c..09fa3a57f3 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index ed2a8313f7..e1339d5d5a 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 - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index b1f3aca59a..029df020d5 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/pom.xml b/pom.xml index 21234da963..3714ba1bba 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.27 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ef20c6f3e7..58f6c1c1ee 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 diff --git a/repository/pom.xml b/repository/pom.xml index 378f4f8c7b..1bf1fdef34 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27-SNAPSHOT + 23.4.0.27 From 487dc56e3cbab0c1a1b69399112c48d041e33fb8 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 29 Sep 2024 00:07:50 +0000 Subject: [PATCH 098/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2c53912cd9..fb1b298775 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9ac92cd966..30bddd7268 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 - 23.4.0.27 + 23.4.0.28-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 2a5e58f017..7a20212ebf 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e534b764b2..889dcbf49d 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9cc24372de..4e5fda040b 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 - 23.4.0.27 + 23.4.0.28-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 42183dbca2..fb2ea641cd 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index cbd1d8afe2..e9a1955159 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 01445b8a0b..b142ea5ebf 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 32967ce91d..38ef5c64c7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a9962a7223..aaebffb303 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 640bf9ec7f..f30851d3a5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index da42cfd220..6be7dca670 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 48179ab8a3..46c65f96de 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index a1e41b295f..e742876a52 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f46c753ace..acabf2b80d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7b28f4da66..5078afc385 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 74febd641b..ab5fe15060 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d78e010e6f..d8d9b71f65 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 09fa3a57f3..8c7d073fd8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index e1339d5d5a..66735bb36a 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 - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 029df020d5..e648598f8c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3714ba1bba..df967320b3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.27 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 58f6c1c1ee..2dc620d601 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 1bf1fdef34..8151d2df41 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.27 + 23.4.0.28-SNAPSHOT From de3dfc1265c6318843299531ce65c0a417b69f2a Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 30 Sep 2024 16:01:24 +0100 Subject: [PATCH 099/148] ACS-8850 Update to IE 2.0.12-A1. --- amps/ags/rm-community/rm-community-repo/.env | 2 +- packaging/tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index c528c95c4a..066b963df8 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.11 +SOLR6_TAG=2.0.12-A1 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index c528c95c4a..066b963df8 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.11 +SOLR6_TAG=2.0.12-A1 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 From a5f8e80bcc1c66cf0d908110cbea2e902e25495e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 00:20:33 +0000 Subject: [PATCH 100/148] Bump Alfresco/ya-pmd-scan from 4.0.0 to 4.1.0 Bumps [Alfresco/ya-pmd-scan](https://github.com/alfresco/ya-pmd-scan) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/alfresco/ya-pmd-scan/releases) - [Commits](https://github.com/alfresco/ya-pmd-scan/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: Alfresco/ya-pmd-scan dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78e6b4a3f8..208b9ad952 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - - uses: Alfresco/ya-pmd-scan@v4.0.0 + - uses: Alfresco/ya-pmd-scan@v4.1.0 with: classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\"" From a2dcb0ebd7e451e50cbb5923f00fcecbcf1bfb92 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:25:55 +0000 Subject: [PATCH 101/148] [maven-release-plugin][skip ci] prepare release 23.4.0.28 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index fb1b298775..3a7ec3f115 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 30bddd7268..2118839c3a 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 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 7a20212ebf..74050dc916 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 889dcbf49d..74c1e22050 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4e5fda040b..673027b135 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 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 fb2ea641cd..834c908fb7 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/amps/pom.xml b/amps/pom.xml index e9a1955159..b42b29e952 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index b142ea5ebf..d8e8f95dae 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/core/pom.xml b/core/pom.xml index 38ef5c64c7..7ef970d995 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/data-model/pom.xml b/data-model/pom.xml index aaebffb303..cf6fd3fc74 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/mmt/pom.xml b/mmt/pom.xml index f30851d3a5..e6c063fe08 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6be7dca670..1787527dd0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 46c65f96de..a764f84e6e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/pom.xml b/packaging/pom.xml index e742876a52..d4241334f6 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index acabf2b80d..1e563cd85f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 5078afc385..990847be6f 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index ab5fe15060..e16af0e215 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d8d9b71f65..1094dc476d 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8c7d073fd8..5fb6b19419 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 66735bb36a..fbcb32c1fc 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 - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e648598f8c..294f8cac55 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/pom.xml b/pom.xml index 1568a5e704..317437610b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.28 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2dc620d601..ad6c29e42f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 diff --git a/repository/pom.xml b/repository/pom.xml index 8151d2df41..867e9f8521 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28-SNAPSHOT + 23.4.0.28 From 6f2100e072b204c7b319a306c1b9b8362b40e24d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:25:57 +0000 Subject: [PATCH 102/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 3a7ec3f115..9886cffa05 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2118839c3a..7c56877dbb 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 - 23.4.0.28 + 23.4.0.29-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 74050dc916..c3da5e7fda 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 74c1e22050..1ee3725e1c 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 673027b135..d9691e8c03 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 - 23.4.0.28 + 23.4.0.29-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 834c908fb7..0dd63cfb57 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index b42b29e952..842232cb71 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index d8e8f95dae..a26ba5c804 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 7ef970d995..c0a8227f73 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index cf6fd3fc74..9fd763ed2f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e6c063fe08..4e0f2a6d51 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 1787527dd0..4509a844f7 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a764f84e6e..a33216a4e7 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d4241334f6..044cb9cebd 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 1e563cd85f..994de34d6f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 990847be6f..928a5076e1 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e16af0e215..67181fb7cc 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1094dc476d..cbdbe92c88 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5fb6b19419..f89fd8ee90 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index fbcb32c1fc..56a405f812 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 - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 294f8cac55..c98af7309d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/pom.xml b/pom.xml index 317437610b..6602349737 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.28 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ad6c29e42f..8b3ca79e18 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 867e9f8521..f3325095a5 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.28 + 23.4.0.29-SNAPSHOT From a323e56a5a6ac6e4aecc74fc8e82516fdc5c6604 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:01:44 +0200 Subject: [PATCH 103/148] Bump org.mockito:mockito-core from 5.13.0 to 5.14.1 (#2948) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.13.0 to 5.14.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.13.0...v5.14.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6602349737..1eb37bcaed 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 1.0.0-jakarta-1 9.3 1.78.1 - 5.13.0 + 5.14.1 3.26.3 20240303 2.12.0 From 4197d9d5c744ca883df6ab478b0a3ce0781ae7f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:31:22 +0200 Subject: [PATCH 104/148] Bump dependency.log4j.version from 2.23.1 to 2.24.1 (#2950) Bumps `dependency.log4j.version` from 2.23.1 to 2.24.1. Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.23.1 to 2.24.1 Updates `org.apache.logging.log4j:log4j-api` from 2.23.1 to 2.24.1 Updates `org.apache.logging.log4j:log4j-core` from 2.23.1 to 2.24.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1eb37bcaed..e8d5c908b8 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 - 2.23.1 + 2.24.1 3.0.22 2.9.2 7.7.10 From 93d4e603ed58e0b3ddf8e66b9c86c7994aad36b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:08:49 +0200 Subject: [PATCH 105/148] Bump Alfresco/alfresco-build-tools from 6.1.0 to 7.1.0 (#2952) Bumps [Alfresco/alfresco-build-tools](https://github.com/alfresco/alfresco-build-tools) from 6.1.0 to 7.1.0. - [Release notes](https://github.com/alfresco/alfresco-build-tools/releases) - [Commits](https://github.com/alfresco/alfresco-build-tools/compare/v6.1.0...v7.1.0) --- updated-dependencies: - dependency-name: Alfresco/alfresco-build-tools dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 184 +++++++++++++-------------- .github/workflows/master_release.yml | 16 +-- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 208b9ad952..25009c47c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,14 +44,14 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - id: changed-files - uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0 + uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v7.1.0 with: write-list-to-env: true - - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v6.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Prepare maven cache and check compilation" @@ -69,12 +69,12 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.1.0 continue-on-error: true with: srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }} @@ -92,10 +92,10 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.0 with: token: ${{ secrets.BOT_GITHUB_TOKEN }} repository: "Alfresco/veracode-baseline-archive" @@ -142,9 +142,9 @@ jobs: !contains(github.event.head_commit.message, '[skip tests]') && !contains(github.event.head_commit.message, '[force]') steps: - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - uses: Alfresco/ya-pmd-scan@v4.1.0 with: classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\"" @@ -175,14 +175,14 @@ jobs: testAttributes: "-Dtest=AllMmtUnitTestSuite" steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }} @@ -213,7 +213,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -255,9 +255,9 @@ jobs: REQUIRES_INSTALLED_ARTIFACTS: true steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | @@ -269,7 +269,7 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} @@ -300,7 +300,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -333,9 +333,9 @@ jobs: version: ['10.2.18', '10.4', '10.5'] steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: Run MariaDB ${{ matrix.version }} database @@ -344,7 +344,7 @@ jobs: MARIADB_VERSION: ${{ matrix.version }} - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }} @@ -375,7 +375,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -404,9 +404,9 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run MariaDB 10.6 database" @@ -415,7 +415,7 @@ jobs: MARIADB_VERSION: 10.6 - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -446,7 +446,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -475,9 +475,9 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run MySQL 8 database" @@ -486,7 +486,7 @@ jobs: MYSQL_VERSION: 8 - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -517,7 +517,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -545,9 +545,9 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run PostgreSQL 13.12 database" @@ -556,7 +556,7 @@ jobs: POSTGRES_VERSION: 13.12 - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -587,7 +587,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -615,9 +615,9 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run PostgreSQL 14.9 database" @@ -626,7 +626,7 @@ jobs: POSTGRES_VERSION: 14.9 - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -657,7 +657,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -685,9 +685,9 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run PostgreSQL 15.4 database" @@ -696,7 +696,7 @@ jobs: POSTGRES_VERSION: 15.4 - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -727,7 +727,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -753,16 +753,16 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run ActiveMQ" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -793,7 +793,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -853,9 +853,9 @@ jobs: mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore' steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Set transformers tag" @@ -877,7 +877,7 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }} @@ -908,7 +908,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -966,9 +966,9 @@ jobs: REQUIRES_LOCAL_IMAGES: true steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | @@ -983,7 +983,7 @@ jobs: run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }} @@ -1021,7 +1021,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.tests.outcome }} @@ -1047,16 +1047,16 @@ jobs: !contains(github.event.head_commit.message, '[force') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - name: "Run Postgres 15.4 database" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -1087,7 +1087,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -1121,9 +1121,9 @@ jobs: REQUIRES_INSTALLED_ARTIFACTS: true steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | @@ -1131,7 +1131,7 @@ jobs: bash ./scripts/ci/build.sh - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }} @@ -1167,9 +1167,9 @@ jobs: REQUIRES_INSTALLED_ARTIFACTS: true steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | @@ -1177,7 +1177,7 @@ jobs: bash ./scripts/ci/build.sh - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }} @@ -1209,9 +1209,9 @@ jobs: REQUIRES_LOCAL_IMAGES: true steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | @@ -1225,7 +1225,7 @@ jobs: mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests - name: "Prepare Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 id: rp-prepare with: rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} @@ -1257,7 +1257,7 @@ jobs: continue-on-error: true - name: "Summarize Report Portal" if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.0.0 + uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 id: rp-summarize with: tests-outcome: ${{ steps.run-tests.outcome }} @@ -1299,9 +1299,9 @@ jobs: !contains(github.event.head_commit.message, '[force]') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Build" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml index 5a7d49353d..c91e307eef 100644 --- a/.github/workflows/master_release.yml +++ b/.github/workflows/master_release.yml @@ -34,12 +34,12 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0 with: username: ${{ env.GIT_USERNAME }} email: ${{ env.GIT_EMAIL }} @@ -63,12 +63,12 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 - name: "Init" run: bash ./scripts/ci/init.sh - - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0 with: username: ${{ env.GIT_USERNAME }} email: ${{ env.GIT_EMAIL }} From c2da1838dad8909d998485ebf9ba05bc08b1efb4 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:48:50 +0000 Subject: [PATCH 106/148] [maven-release-plugin][skip ci] prepare release 23.4.0.29 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 9886cffa05..56dafb9510 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7c56877dbb..839705d87d 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 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 c3da5e7fda..a2f80d97e7 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1ee3725e1c..3aa47d0c59 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d9691e8c03..0b7df9e822 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 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 0dd63cfb57..3c3a8e2895 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/amps/pom.xml b/amps/pom.xml index 842232cb71..5d34295393 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index a26ba5c804..acd7ffae6a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/core/pom.xml b/core/pom.xml index c0a8227f73..0d6c11bb00 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/data-model/pom.xml b/data-model/pom.xml index 9fd763ed2f..a4cf19e685 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/mmt/pom.xml b/mmt/pom.xml index 4e0f2a6d51..4692b47404 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4509a844f7..9bdd7546be 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a33216a4e7..0e0253c835 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/pom.xml b/packaging/pom.xml index 044cb9cebd..de1fe9a0e3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 994de34d6f..9f314568e4 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 928a5076e1..6d2a1339a6 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 67181fb7cc..1422a00487 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index cbdbe92c88..d3023e9564 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index f89fd8ee90..80d915d75e 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 56a405f812..5af863dd04 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 - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c98af7309d..548de12b65 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/pom.xml b/pom.xml index e8d5c908b8..5cbbd5e822 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.29 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8b3ca79e18..ac7b638d21 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 diff --git a/repository/pom.xml b/repository/pom.xml index f3325095a5..54c3010fde 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29-SNAPSHOT + 23.4.0.29 From 024ad00229bc697a6aaf6b571a15412ab0700be1 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:48:57 +0000 Subject: [PATCH 107/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 56dafb9510..85c235341a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 839705d87d..039af28797 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 - 23.4.0.29 + 23.4.0.30-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 a2f80d97e7..226b07929b 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 3aa47d0c59..219988dc1b 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0b7df9e822..eb5e7d3cbe 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 - 23.4.0.29 + 23.4.0.30-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 3c3a8e2895..9959c59ae5 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 5d34295393..1df58b1688 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index acd7ffae6a..280de02a4c 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0d6c11bb00..02643347e1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a4cf19e685..4d922b0c86 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 4692b47404..4ae96bb08b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 9bdd7546be..03d5eae7bb 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0e0253c835..c182aecd4f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index de1fe9a0e3..822aa335a7 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9f314568e4..0d6880f095 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6d2a1339a6..0d7b1e1e9e 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1422a00487..0bc28bd4c8 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d3023e9564..0db7274566 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 80d915d75e..db069dc01a 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5af863dd04..21c82185e5 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 - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 548de12b65..a40f14733b 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5cbbd5e822..9f3480776a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.29 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ac7b638d21..0b8c493345 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 54c3010fde..e44677def6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.29 + 23.4.0.30-SNAPSHOT From 97353e1ee9742d32743687edbf113297a8479631 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:25:47 +0200 Subject: [PATCH 108/148] Bump com.google.guava:guava from 33.3.0-jre to 33.3.1-jre (#2941) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.0-jre to 33.3.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f3480776a..81868e1750 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 2.12.0 2.16.1 2.11.0 - 33.3.0-jre + 33.3.1-jre 4.5.14 4.4.16 5.2.1 From 0e78b61f4cce83098a86507b445e2ce7c904903e Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 1 Oct 2024 15:56:48 +0100 Subject: [PATCH 109/148] ACS-8850 Update to IE 2.0.12. --- amps/ags/rm-community/rm-community-repo/.env | 2 +- packaging/tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 066b963df8..c937095503 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.12-A1 +SOLR6_TAG=2.0.12 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 066b963df8..c937095503 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.12-A1 +SOLR6_TAG=2.0.12 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 From c24812dc20a860f683884128f1326cf61961c823 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:06:42 +0000 Subject: [PATCH 110/148] [maven-release-plugin][skip ci] prepare release 23.4.0.30 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 85c235341a..1778cb4713 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 039af28797..183fd2f635 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 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 226b07929b..f8ce6db4ef 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 219988dc1b..0dd111df89 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index eb5e7d3cbe..4b628ba38f 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 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 9959c59ae5..076b106fef 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/amps/pom.xml b/amps/pom.xml index 1df58b1688..bca6021222 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 280de02a4c..2c396688b8 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/core/pom.xml b/core/pom.xml index 02643347e1..13da5d0669 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/data-model/pom.xml b/data-model/pom.xml index 4d922b0c86..2648f3abc7 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/mmt/pom.xml b/mmt/pom.xml index 4ae96bb08b..3128cf4f72 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 03d5eae7bb..f52c2c68ad 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c182aecd4f..6d7e844508 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/pom.xml b/packaging/pom.xml index 822aa335a7..9871f4eb23 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 0d6880f095..4939e24978 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 0d7b1e1e9e..471ecb42c2 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 0bc28bd4c8..94b3c3086e 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0db7274566..02fcaefa4f 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index db069dc01a..5161d24198 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 21c82185e5..f647af634f 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 - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a40f14733b..b3096d87dd 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/pom.xml b/pom.xml index 81868e1750..b410ffa5da 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.30 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 0b8c493345..a5ef090556 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 diff --git a/repository/pom.xml b/repository/pom.xml index e44677def6..0a62a5eac4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30-SNAPSHOT + 23.4.0.30 From 74af4484da37d281aa4ee7cf69f97c042c19e31b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:06:44 +0000 Subject: [PATCH 111/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 1778cb4713..9971401eef 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 183fd2f635..9c16edc573 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 - 23.4.0.30 + 23.4.0.31-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 f8ce6db4ef..7553a4b4d5 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 0dd111df89..ee2cf12047 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4b628ba38f..8bf793b383 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 - 23.4.0.30 + 23.4.0.31-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 076b106fef..1473ea946f 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index bca6021222..498e4f3c97 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2c396688b8..aca0ac18ad 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 13da5d0669..68e81c4117 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 2648f3abc7..1727a08ce8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 3128cf4f72..f777cf0b0d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f52c2c68ad..a17cfe7be7 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6d7e844508..2c1bccd98f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 9871f4eb23..c9684a3262 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4939e24978..dbd4354047 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 471ecb42c2..6965dc1281 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 94b3c3086e..4e844b7407 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 02fcaefa4f..79495490d0 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5161d24198..04242deadc 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index f647af634f..a018a1a6a1 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 - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index b3096d87dd..c928a838f5 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/pom.xml b/pom.xml index b410ffa5da..1cf96fdb6e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.30 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a5ef090556..d09fc50b75 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 0a62a5eac4..82b39a3b1a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.30 + 23.4.0.31-SNAPSHOT From 2ff97bfe8398d91c9b852203d7a16bb40604f99d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:58:15 +0000 Subject: [PATCH 112/148] [maven-release-plugin][skip ci] prepare release 23.4.0.31 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 9971401eef..4a14429038 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9c16edc573..557a7574c9 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 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 7553a4b4d5..47337c3c8a 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ee2cf12047..10d5f263b7 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 8bf793b383..a82511ab32 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 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 1473ea946f..537c85abb1 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/amps/pom.xml b/amps/pom.xml index 498e4f3c97..2d3c477b95 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index aca0ac18ad..0313f8ecd6 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/core/pom.xml b/core/pom.xml index 68e81c4117..6ebe2c7c2e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/data-model/pom.xml b/data-model/pom.xml index 1727a08ce8..415f0b9262 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/mmt/pom.xml b/mmt/pom.xml index f777cf0b0d..f341414c2b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a17cfe7be7..b81396a675 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2c1bccd98f..213114a8eb 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/pom.xml b/packaging/pom.xml index c9684a3262..ad0240e395 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index dbd4354047..bdd86fdd08 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6965dc1281..95bb66b4ed 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4e844b7407..0cfc7771c8 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 79495490d0..8eb94b8c45 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 04242deadc..9990c746c8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index a018a1a6a1..58b667b05b 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 - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c928a838f5..0f263b1d47 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/pom.xml b/pom.xml index 1cf96fdb6e..36559957c7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.31 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d09fc50b75..2c7093a866 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 diff --git a/repository/pom.xml b/repository/pom.xml index 82b39a3b1a..21509de4b1 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31-SNAPSHOT + 23.4.0.31 From 55c6eacf95e45ce48ae6fefc95a37dfd13621b8f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:58:17 +0000 Subject: [PATCH 113/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 4a14429038..a1cc8bc47c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 557a7574c9..7679e74c77 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 - 23.4.0.31 + 23.4.0.32-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 47337c3c8a..ea52eaec1a 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 10d5f263b7..8fb38ca0fd 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a82511ab32..eb0565a871 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 - 23.4.0.31 + 23.4.0.32-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 537c85abb1..180ec9fa72 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 2d3c477b95..b25fb05c59 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 0313f8ecd6..f0d9a44847 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6ebe2c7c2e..fe414e8fa6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 415f0b9262..622f008a15 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index f341414c2b..d3ed3c9159 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index b81396a675..f819014414 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 213114a8eb..536230c10e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index ad0240e395..ea3f75338a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bdd86fdd08..6804fd05d2 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 95bb66b4ed..7b4e8c1e2d 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 0cfc7771c8..fd3ab7c88d 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 8eb94b8c45..48c5a78880 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9990c746c8..9e851c9da3 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 58b667b05b..a43c4ead21 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 - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0f263b1d47..ff8aa20ff8 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/pom.xml b/pom.xml index 36559957c7..2b86a47cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.31 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2c7093a866..4a9ec32443 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 21509de4b1..987103362e 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.31 + 23.4.0.32-SNAPSHOT From e3483507d053f9a17c6e29842323635a11b8fd84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:30:26 +0200 Subject: [PATCH 114/148] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.10.1 (#2958) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.7.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.7.0...maven-javadoc-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b86a47cf9..6f15efacf9 100644 --- a/pom.xml +++ b/pom.xml @@ -1028,7 +1028,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.10.1 org.apache.maven.plugins From e387ae39cc9e5805f344146ea071091d0f95566a Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 08:11:08 +0000 Subject: [PATCH 115/148] [maven-release-plugin][skip ci] prepare release 23.4.0.32 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index a1cc8bc47c..c799f7744e 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7679e74c77..f225df6961 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 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 ea52eaec1a..b66e5ed61c 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8fb38ca0fd..afa3beef4f 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index eb0565a871..305a262ff2 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 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 180ec9fa72..8d6358800b 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/amps/pom.xml b/amps/pom.xml index b25fb05c59..008452e552 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f0d9a44847..fd8a636d1f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/core/pom.xml b/core/pom.xml index fe414e8fa6..cf75e64834 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/data-model/pom.xml b/data-model/pom.xml index 622f008a15..d862e1d541 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/mmt/pom.xml b/mmt/pom.xml index d3ed3c9159..32b83a7559 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f819014414..8878ef9bae 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 536230c10e..cffa13c733 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/pom.xml b/packaging/pom.xml index ea3f75338a..04c629c73d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 6804fd05d2..a2a2e0aaaa 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7b4e8c1e2d..5420c89f80 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index fd3ab7c88d..35a9e8a206 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 48c5a78880..ec44060a9b 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9e851c9da3..328ebc46dc 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index a43c4ead21..ebac7fcb2e 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 - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ff8aa20ff8..9441eae298 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/pom.xml b/pom.xml index 6f15efacf9..50a194346f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.32 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4a9ec32443..7003f4a1ae 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 diff --git a/repository/pom.xml b/repository/pom.xml index 987103362e..98f47ba3be 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32-SNAPSHOT + 23.4.0.32 From cf66b6381704cc84aaf9beb97f770042497c02a2 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 08:11:10 +0000 Subject: [PATCH 116/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index c799f7744e..81c6a4bf4a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f225df6961..b5b46d6687 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 - 23.4.0.32 + 23.4.0.33-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 b66e5ed61c..b9b30e4cb6 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index afa3beef4f..6d14894f70 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 305a262ff2..c7482b6761 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 - 23.4.0.32 + 23.4.0.33-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 8d6358800b..206dafa9a1 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 008452e552..e58ab58f33 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index fd8a636d1f..bcead47d9e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index cf75e64834..51a7766768 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index d862e1d541..c48ecf60b6 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 32b83a7559..604fdffa8d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8878ef9bae..c020ab964e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cffa13c733..0b5e44bb51 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 04c629c73d..e1372eef08 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a2a2e0aaaa..3b46625c8b 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 5420c89f80..fe517c6675 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 35a9e8a206..9feb0078f4 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ec44060a9b..2ab9ea975e 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 328ebc46dc..51e52c758c 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index ebac7fcb2e..599a5ca7b6 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 - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9441eae298..0723849a41 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/pom.xml b/pom.xml index 50a194346f..881261b43c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.32 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 7003f4a1ae..b678abde57 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 98f47ba3be..7fea04c56c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.32 + 23.4.0.33-SNAPSHOT From f2752929ce75d8fd59a51715a1bb3b4dd4d024fb Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 2 Oct 2024 09:26:36 +0100 Subject: [PATCH 117/148] Revert "Bump dependency.log4j.version from 2.23.1 to 2.24.1 (#2950)" This is causing issues in ent-repo. This reverts commit 4197d9d5c744ca883df6ab478b0a3ce0781ae7f0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 881261b43c..a39ee97c07 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 - 2.24.1 + 2.23.1 3.0.22 2.9.2 7.7.10 From 0fed71467427fb8874aa68068c181b541b49a400 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:13:14 +0000 Subject: [PATCH 118/148] [maven-release-plugin][skip ci] prepare release 23.4.0.33 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 81c6a4bf4a..4a31dc098d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b5b46d6687..77e7e7e258 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 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 b9b30e4cb6..05c5f332ab 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 6d14894f70..8314b156a5 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index c7482b6761..bd40c1c721 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 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 206dafa9a1..4ed7bdd85f 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/amps/pom.xml b/amps/pom.xml index e58ab58f33..685dd51917 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index bcead47d9e..9b660b7298 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/core/pom.xml b/core/pom.xml index 51a7766768..3d89891193 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/data-model/pom.xml b/data-model/pom.xml index c48ecf60b6..94dce1b567 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/mmt/pom.xml b/mmt/pom.xml index 604fdffa8d..fbe28b954d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c020ab964e..265de1ae09 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0b5e44bb51..2277453730 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/pom.xml b/packaging/pom.xml index e1372eef08..afafc98f4f 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 3b46625c8b..7a8435d71a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index fe517c6675..6fdfd74e2b 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9feb0078f4..c6e20e0475 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 2ab9ea975e..4f9b100451 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 51e52c758c..93c3a0aeae 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 599a5ca7b6..40e481328a 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 - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0723849a41..9eb9e42a9c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/pom.xml b/pom.xml index a39ee97c07..ec44635894 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.33 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b678abde57..7ccd62cb2f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 diff --git a/repository/pom.xml b/repository/pom.xml index 7fea04c56c..8e6998a662 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33-SNAPSHOT + 23.4.0.33 From 291684f3d8fca0e4660a2856bea1e218d022480b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:13:16 +0000 Subject: [PATCH 119/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 4a31dc098d..65055ce046 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 77e7e7e258..f70e99e4ea 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 - 23.4.0.33 + 23.4.0.34-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 05c5f332ab..919ca923a0 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8314b156a5..cddfb2ad51 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index bd40c1c721..c3cdd993fc 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 - 23.4.0.33 + 23.4.0.34-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 4ed7bdd85f..67e6eee78d 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 685dd51917..14c16e3528 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9b660b7298..229f9320df 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 3d89891193..046a66fdc2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 94dce1b567..cde69fddf2 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index fbe28b954d..6e1f632e48 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 265de1ae09..8bc07b0b1a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2277453730..3d47cb292f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index afafc98f4f..ab40765863 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7a8435d71a..3e739e58a8 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6fdfd74e2b..9cbc5b09f6 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c6e20e0475..997af0979a 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4f9b100451..f6c30ef1ea 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 93c3a0aeae..819b68bcce 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 40e481328a..75aaab407b 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 - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9eb9e42a9c..2659571896 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/pom.xml b/pom.xml index ec44635894..fef93ffe54 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.33 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 7ccd62cb2f..75ee05a470 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 8e6998a662..c483d306bc 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.33 + 23.4.0.34-SNAPSHOT From 30ce0a1f016647f8910c70ac5c5a92cb33f0d632 Mon Sep 17 00:00:00 2001 From: Krystian Dabrowski <98942253+krdabrowski@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:53:57 +0200 Subject: [PATCH 120/148] ACS-6256: Move logic related with managing folders and categories (#2320) * ACS-6256: Move logic related with managing folders and categories for TAS tests from acs-packaging to community-repo --- .../rest/repo/resource/Categories.java | 97 ++++++++++ .../alfresco/rest/repo/resource/Files.java | 105 +++++++++++ .../alfresco/rest/repo/resource/Folders.java | 113 +++++++++++ .../rest/repo/resource/ResourceManager.java | 61 ++++++ .../resource/cache/MultiKeyResourceMap.java | 129 +++++++++++++ .../category/NestedCategoriesCreator.java | 64 +++++++ .../category/RepoCategoryCreator.java | 154 +++++++++++++++ .../category/RepoCategoryModifier.java | 85 +++++++++ .../category/SerialCategoriesCreator.java | 111 +++++++++++ .../resource/content/MultiContentCreator.java | 111 +++++++++++ .../content/NestedFoldersCreator.java | 65 +++++++ .../resource/content/PlainFileCreator.java | 142 ++++++++++++++ .../resource/content/PlainFileModifier.java | 73 ++++++++ .../resource/content/RepoFolderCreator.java | 143 ++++++++++++++ .../resource/content/RepoFolderModifier.java | 108 +++++++++++ .../resource/content/SerialFilesCreator.java | 156 +++++++++++++++ .../content/SerialFoldersCreator.java | 107 +++++++++++ .../repo/resource/general/ContentCreator.java | 105 +++++++++++ .../resource/general/ContentModifier.java | 177 ++++++++++++++++++ .../rest/repo/resource/general/Creator.java | 107 +++++++++++ .../rest/repo/resource/general/Modifier.java | 84 +++++++++ .../repo/resource/general/MultiCreator.java | 92 +++++++++ .../general/MultipleContentsCreator.java | 106 +++++++++++ .../general/MultipleResourcesCreator.java | 129 +++++++++++++ .../resource/general/ResourceCreator.java | 104 ++++++++++ .../resource/general/ResourceIntroducer.java | 37 ++++ .../resource/general/ResourceModifier.java | 53 ++++++ .../resource/general/ResourceRemover.java | 37 ++++ .../rest/repo/resource/general/Specifier.java | 106 +++++++++++ 29 files changed, 2961 insertions(+) create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java create mode 100644 packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java new file mode 100644 index 0000000000..6e8550721f --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java @@ -0,0 +1,97 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource; + +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap; +import org.alfresco.rest.repo.resource.category.RepoCategoryCreator; +import org.alfresco.rest.repo.resource.category.RepoCategoryModifier; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.model.UserModel; + +/** + * Helper class simplifying things related with repository categories management. + */ +@Component +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) +public class Categories implements ResourceManager +{ + public static final String CATEGORY_NAME_PREFIX = "category"; + private static final String ROOT_CATEGORY_ID = "-root-"; + public static final RestCategoryModel ROOT_CATEGORY = RestCategoryModel.builder().id(ROOT_CATEGORY_ID).create(); + + private final RestWrapper restClient; + private final UserModel user; + + private final Map categoriesCache = new MultiKeyResourceMap<>(RestCategoryModel::getId, RestCategoryModel::getName); + + public Categories(RestWrapper restClient, UserModel user) + { + this.restClient = restClient; + this.user = user; + } + + @Autowired + public Categories(RestWrapper restClient, DataUser dataUser) + { + this(restClient, dataUser.getAdminUser()); + } + + @Override + public Specifier.CategoriesSpecifier add() + { + return (Specifier.CategoriesSpecifier) new RepoCategoryCreator(restClient, categoriesCache) + .underCategory(ROOT_CATEGORY).asUser(user); + } + + @Override + public RestCategoryModel get(String key) + { + return categoriesCache.get(key); + } + + @Override + public Modifier.CategoryModifier modify(RestCategoryModel category) + { + return new RepoCategoryModifier(restClient, category, categoriesCache).asUser(user); + } + + @Override + public void delete(RestCategoryModel category) + { + new RepoCategoryModifier(restClient, category, categoriesCache).asUser(user).delete(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java new file mode 100644 index 0000000000..3a31d47721 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java @@ -0,0 +1,105 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource; + +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap; +import org.alfresco.rest.repo.resource.content.PlainFileCreator; +import org.alfresco.rest.repo.resource.content.PlainFileModifier; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.data.DataSite; +import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; + +/** + * Helper class simplifying things related with repository files management. + */ +@Component +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) +public class Files implements ResourceManager +{ + public static final String FILE_NAME_PREFIX = "file"; + + private final DataContent dataContent; + private final RestWrapper restClient; + private final SiteModel site; + private final UserModel user; + private final Map filesCache = new MultiKeyResourceMap<>(FileModel::getNodeRef, FileModel::getName); + + public Files(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site) + { + this.dataContent = dataContent; + this.restClient = restClient; + this.user = user; + this.site = site; + } + + public Files(DataContent dataContent, RestWrapper restClient, DataUser dataUser) + { + this(dataContent, restClient, dataUser.getAdminUser(), null); + } + + @Autowired + public Files(DataContent dataContent, RestWrapper restClient, DataUser dataUser, DataSite dataSite) + { + this(dataContent, restClient, dataUser.getAdminUser(), dataSite.usingUser(dataUser.getAdminUser()).createPrivateRandomSite()); + } + + @Override + public Specifier.FileSpecifier add() + { + return (Specifier.FileSpecifier) new PlainFileCreator(dataContent, filesCache).withinSite(site).asUser(user); + } + + @Override + public FileModel get(String id) + { + return filesCache.get(id); + } + + @Override + public Modifier.FileModifier modify(FileModel file) + { + return new PlainFileModifier(dataContent, restClient, file, filesCache).withinSite(site).asUser(user); + } + + @Override + public void delete(FileModel file) + { + new PlainFileModifier(dataContent, restClient, file, filesCache).withinSite(site).asUser(user).delete(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java new file mode 100644 index 0000000000..7216b08311 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java @@ -0,0 +1,113 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource; + +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.repo.resource.cache.MultiKeyResourceMap; +import org.alfresco.rest.repo.resource.content.RepoFolderCreator; +import org.alfresco.rest.repo.resource.content.RepoFolderModifier; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.data.DataSite; +import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; + +/** + * Helper class simplifying things related with repository folders management. + */ +@Component +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) +public class Folders implements ResourceManager +{ + public static final String FOLDER_NAME_PREFIX = "folder"; + + private final DataContent dataContent; + private final RestWrapper restClient; + private final SiteModel site; + private final UserModel user; + private final Files files; + + private final Map foldersCache = new MultiKeyResourceMap<>(FolderModel::getNodeRef, FolderModel::getName); + + public Folders(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site, Files files) + { + this.dataContent = dataContent; + this.restClient = restClient; + this.site = site; + this.user = user; + this.files = files; + } + + public Folders(DataContent dataContent, RestWrapper restClient, UserModel user, SiteModel site) + { + this(dataContent, restClient, user, site, new Files(dataContent, restClient, user, site)); + } + + public Folders(DataContent dataContent, RestWrapper restClient, DataUser dataUser) + { + this(dataContent, restClient, dataUser.getAdminUser(), null); + } + + @Autowired + public Folders(DataContent dataContent, RestWrapper restClient, DataUser dataUser, DataSite dataSite) + { + this(dataContent, restClient, dataUser.getAdminUser(), dataSite.usingUser(dataUser.getAdminUser()).createPrivateRandomSite()); + } + + @Override + public Specifier.FolderSpecifier add() + { + return (Specifier.FolderSpecifier) new RepoFolderCreator(dataContent, foldersCache).withinSite(site).asUser(user); + } + + @Override + public FolderModel get(String key) + { + return foldersCache.get(key); + } + + @Override + public Modifier.FolderModifier modify(FolderModel folder) + { + return new RepoFolderModifier(dataContent, restClient, folder, files, foldersCache).withinSite(site).asUser(user); + } + + @Override + public void delete(FolderModel folder) + { + new RepoFolderModifier(dataContent, restClient, folder, files, foldersCache).withinSite(site).asUser(user).delete(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java new file mode 100644 index 0000000000..d0dd4b462e --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java @@ -0,0 +1,61 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource; + +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.ResourceIntroducer; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.model.TestModel; + +/** + * Declares operations introducing new, or allowing to manage repository resources like: folders, files, categories, associations, etc. + * + * @param > + * repository resource, e.g. folder, file, category, etc. + * @param + * repository resource specifier, see {@link Specifier} + * @param > + * repository resource modifier, see {@link Modifier} + */ +public interface ResourceManager> + extends ResourceIntroducer +{ + RESOURCE get(String id); + + MODIFIER modify(RESOURCE resource); + + default MODIFIER modify(String id) + { + return modify(get(id)); + } + + void delete(RESOURCE resource); + + default void delete(String id) + { + delete(get(id)); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java new file mode 100644 index 0000000000..5cac493c6f --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java @@ -0,0 +1,129 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.cache; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.StringUtils; + +import org.alfresco.utility.model.TestModel; + +/** + * Allows to store data in map and find it using three keys - id, name and alias. + * + * @param + * repository resource, e.g. folder, category, etc. + */ +public class MultiKeyResourceMap extends HashMap +{ + private static final String UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"; + + private final Map keys = new HashMap<>(); + private final Function idSupplier; + private final Function nameSupplier; + + public MultiKeyResourceMap(Function idSupplier, Function nameSupplier) + { + super(); + this.idSupplier = idSupplier; + this.nameSupplier = nameSupplier; + } + + @Override + public RESOURCE put(String alias, RESOURCE resource) + { + String id = idSupplier.apply(resource); + String name = nameSupplier.apply(resource); + if (StringUtils.isEmpty(id)) + { + throw new IllegalArgumentException("ID of entity with name: " + name + " and alias: " + alias + " cannot be empty!"); + } + if (StringUtils.isEmpty(name)) + { + throw new IllegalArgumentException("Name of entity with ID: " + id + " and alias: " + alias + " cannot be empty!"); + } + + if (StringUtils.isNotEmpty(alias)) + { + if (keys.containsKey(alias)) + { + throw new IllegalStateException("Entity with alias: " + alias + " already exists in cache!"); + } + keys.put(alias, id); + } + + if (StringUtils.isNotEmpty(name)) + { + keys.put(name, id); + } + return super.put(id, resource); + } + + @Override + public RESOURCE get(Object key) + { + return super.get(findKey(key)); + } + + @Override + public RESOURCE remove(Object key) + { + RESOURCE resource = this.get(key); + if (resource == null) + { + return null; + } + + String id = idSupplier.apply(resource); + findKeysFor(id).forEach(keys::remove); + + return super.remove(id); + } + + private Object findKey(Object key) + { + Object realKey = key; + if (key instanceof String k && (!Pattern.compile(UUID_PATTERN).matcher(k).matches() || !super.containsKey(k))) + { + realKey = keys.getOrDefault(k, k); + } + return realKey; + } + + public Set findKeysFor(Object id) + { + return keys.entrySet() + .stream() + .filter(entry -> id.equals(entry.getValue())) + .map(Entry::getKey) + .collect(Collectors.toSet()); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java new file mode 100644 index 0000000000..f40a90e9f8 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java @@ -0,0 +1,64 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.category; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryModel; + +public class NestedCategoriesCreator extends SerialCategoriesCreator +{ + + public NestedCategoriesCreator(RestWrapper restClient, Map categories) + { + super(restClient, categories); + } + + @Override + public List create() + { + return createNestedCategories(parent, names, 0); + } + + private List createNestedCategories(RestCategoryModel parent, List categoryNames, int index) + { + List createdCategories = new ArrayList<>(); + categoryNames.stream().findFirst().ifPresent(categoryName -> { + RestCategoryModel createdCategory = createCategory(categoryName, getOrNull(aliases, index), parent); + createdCategories.add(createdCategory); + List remainingNames = categoryNames.stream().skip(1).toList(); + if (!remainingNames.isEmpty()) + { + createdCategories.addAll(createNestedCategories(createdCategory, remainingNames, index + 1)); + } + }); + + return createdCategories; + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java new file mode 100644 index 0000000000..57b2f8e777 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java @@ -0,0 +1,154 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.category; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Categories.CATEGORY_NAME_PREFIX; +import static org.alfresco.rest.repo.resource.Categories.ROOT_CATEGORY; + +import java.util.Map; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.repo.resource.general.Creator; +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.ResourceCreator; +import org.alfresco.rest.repo.resource.general.Specifier; + +public class RepoCategoryCreator + extends ResourceCreator + implements Creator.CategoryCreator, Specifier.CategoriesSpecifier +{ + + private final RestWrapper restClient; + private RestCategoryModel parent = ROOT_CATEGORY; + private final Map categoriesCache; + + public RepoCategoryCreator(RestWrapper restClient, Map categoriesCache) + { + super(); + this.restClient = restClient; + this.categoriesCache = categoriesCache; + } + + @Override + protected CategoryCreator self() + { + return this; + } + + @Override + public CategoryCreator category(String name) + { + return this.withName(name); + } + + @Override + public CategoryCreator randomCategory() + { + return this.withRandomName(); + } + + @Override + public CategoryCreator randomCategory(String prefix) + { + return this.withRandomName(prefix); + } + + @Override + public MultiCreator.CategoriesCreator categories(String... names) + { + return new SerialCategoriesCreator(restClient, categoriesCache).withNames(names).underCategory(parent).asUser(user); + } + + @Override + public MultiCreator.CategoriesCreator randomCategories(String... prefixes) + { + return new SerialCategoriesCreator(restClient, categoriesCache).withRandomNames(prefixes).underCategory(parent).asUser(user); + } + + @Override + public MultiCreator.CategoriesCreator randomCategories(int quantity) + { + return new SerialCategoriesCreator(restClient, categoriesCache).withRandomNames(quantity).underCategory(parent).asUser(user); + } + + @Override + public MultiCreator.CategoriesCreator nestedCategories(String... names) + { + return new NestedCategoriesCreator(restClient, categoriesCache).withNames(names).underCategory(parent).asUser(user); + } + + @Override + public MultiCreator.CategoriesCreator nestedRandomCategories(String... prefixes) + { + return new NestedCategoriesCreator(restClient, categoriesCache).withRandomNames(prefixes).underCategory(parent).asUser(user); + } + + @Override + public MultiCreator.CategoriesCreator nestedRandomCategories(int depth) + { + return new NestedCategoriesCreator(restClient, categoriesCache).withRandomNames(depth).underCategory(parent).asUser(user); + } + + @Override + public CategoryCreator withRandomName(String prefix) + { + withAlias(prefix); + return super.withRandomName(prefix); + } + + @Override + public CategoryCreator underCategory(RestCategoryModel parent) + { + this.parent = parent; + return this; + } + + @Override + public RestCategoryModel create() + { + RestCategoryModel category = restClient.authenticateUser(user).withCoreAPI().usingCategory(parent) + .createSingleCategory(RestCategoryModel.builder().name(name).create()); + + categoriesCache.put(alias, category); + + return category; + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix) + { + return super.generateRandomNameWith(CATEGORY_NAME_PREFIX + prefix + "_"); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java new file mode 100644 index 0000000000..4740d6cb95 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java @@ -0,0 +1,85 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.category; + +import java.util.Map; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.ResourceModifier; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.model.UserModel; + +public class RepoCategoryModifier + extends ResourceModifier + implements Modifier.CategoryModifier +{ + + private final RestWrapper restClient; + private final RestCategoryModel category; + private final Map categoriesCache; + + public RepoCategoryModifier(RestWrapper restClient, RestCategoryModel category, Map categoriesCache) + { + super(); + this.restClient = restClient; + this.category = category; + this.categoriesCache = categoriesCache; + } + + @Override + protected CategoryModifier self() + { + return this; + } + + @Override + public Specifier.CategoriesSpecifier add() + { + return (Specifier.CategoriesSpecifier) new RepoCategoryCreator(restClient, categoriesCache) + .underCategory(category).asUser(user); + } + + @Override + public RestCategoryModel get(String id) + { + return buildCategoryRestRequest(restClient, user, RestCategoryModel.builder().id(id).create()) + .getCategory(); + } + + @Override + public void delete() + { + categoriesCache.remove(category.getId()); + buildCategoryRestRequest(restClient, user, category).deleteCategory(); + } + + private static org.alfresco.rest.requests.Categories buildCategoryRestRequest(RestWrapper restClient, UserModel user, RestCategoryModel category) + { + return restClient.authenticateUser(user).withCoreAPI().usingCategory(category); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java new file mode 100644 index 0000000000..427dffd056 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java @@ -0,0 +1,111 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.category; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Categories.CATEGORY_NAME_PREFIX; +import static org.alfresco.rest.repo.resource.Categories.ROOT_CATEGORY; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.MultipleResourcesCreator; + +public class SerialCategoriesCreator + extends MultipleResourcesCreator + implements MultiCreator.CategoriesCreator +{ + + private final RestWrapper restClient; + protected RestCategoryModel parent = ROOT_CATEGORY; + private final Map categoriesCache; + + public SerialCategoriesCreator(RestWrapper restClient, Map categoriesCache) + { + super(); + this.restClient = restClient; + this.categoriesCache = categoriesCache; + } + + @Override + protected CategoriesCreator self() + { + return this; + } + + @Override + public CategoriesCreator underCategory(RestCategoryModel parent) + { + this.parent = parent; + return this; + } + + @Override + public List create() + { + return createRawCategories(parent, names); + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix) + { + return super.generateRandomNameWith(CATEGORY_NAME_PREFIX + prefix + "_"); + } + + private List createRawCategories(RestCategoryModel parent, List categoryNames) + { + List createdCategories = new ArrayList<>(); + AtomicInteger i = new AtomicInteger(); + categoryNames.forEach(categoryName -> { + RestCategoryModel createdCategory = createCategory(categoryName, getOrNull(aliases, i.getAndIncrement()), parent); + createdCategories.add(createdCategory); + }); + + return createdCategories; + } + + protected RestCategoryModel createCategory(String name, String alias, RestCategoryModel parent) + { + return new RepoCategoryCreator(restClient, this.categoriesCache) + .withAlias(alias) + .withName(name) + .underCategory(parent) + .asUser(user) + .create(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java new file mode 100644 index 0000000000..5bbb31bd52 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java @@ -0,0 +1,111 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import java.util.Map; +import java.util.stream.Stream; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestTagModel; +import org.alfresco.rest.repo.resource.Files; +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FolderModel; + +public class MultiContentCreator extends RepoFolderCreator implements Specifier.MultiContentSpecifier +{ + private final RestWrapper restClient; + private final Files files; + + protected MultiContentCreator(DataContent dataContent, RestWrapper restClient, Files files, Map folders) + { + super(dataContent, folders); + this.files = files; + this.restClient = restClient; + } + + @Override + public FileCreator file(String name) + { + return files.add().file(name).underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public FileCreator randomFile() + { + return files.add().randomFile().underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public FileCreator randomFile(String prefix) + { + return files.add().randomFile(prefix).underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FilesCreator files(String... names) + { + return files.add().files(names).underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FilesCreator randomFiles(String... prefixes) + { + return files.add().randomFiles(prefixes).underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FilesCreator randomFiles(int quantity) + { + return files.add().randomFiles(quantity).underFolder(parent).withinSite(site).asUser(user); + } + + @Override + public void secondaryContent(ContentModel content) + { + buildNodeRestRequest(restClient, parent).addSecondaryChild(content); + } + + @Override + public void secondaryContent(ContentModel... contents) + { + buildNodeRestRequest(restClient, parent).addSecondaryChildren(contents); + } + + @Override + public void tag(RestTagModel tag) + { + buildNodeRestRequest(restClient, parent).addTag(tag.getTag()); + } + + @Override + public void tags(RestTagModel... tags) + { + buildNodeRestRequest(restClient, parent).addTags(Stream.of(tags).map(RestTagModel::getTag).toArray(String[]::new)); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java new file mode 100644 index 0000000000..c041f72ffe --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java @@ -0,0 +1,65 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FolderModel; + +public class NestedFoldersCreator extends SerialFoldersCreator +{ + + public NestedFoldersCreator(DataContent dataContent, Map folders) + { + super(dataContent, folders); + } + + @Override + public List create() + { + verifyDataConsistency(); + return createNestedFoldersUnder(parent, names, 0); + } + + private List createNestedFoldersUnder(FolderModel parent, List folderNames, int index) + { + List createdFolders = new ArrayList<>(); + folderNames.stream().findFirst().ifPresent(folderName -> { + FolderModel createdFolder = createFolder(folderName, getOrNull(titles, index), getOrNull(descriptions, index), parent, getOrNull(aliases, index)); + createdFolders.add(createdFolder); + List remainingNames = folderNames.stream().skip(1).toList(); + if (!remainingNames.isEmpty()) + { + createdFolders.addAll(createNestedFoldersUnder(createdFolder, remainingNames, index + 1)); + } + }); + + return createdFolders; + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java new file mode 100644 index 0000000000..fed7f4c626 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java @@ -0,0 +1,142 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Files.FILE_NAME_PREFIX; + +import java.util.Map; + +import org.alfresco.rest.repo.resource.general.ContentCreator; +import org.alfresco.rest.repo.resource.general.Creator; +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; + +public class PlainFileCreator + extends ContentCreator + implements Creator.FileCreator, Specifier.FileSpecifier +{ + + private final DataContent dataContent; + private final Map filesCache; + + public PlainFileCreator(DataContent dataContent, Map filesCache) + { + super(new FileModel()); + this.dataContent = dataContent; + this.filesCache = filesCache; + this.contentModel.setFileType(FileType.TEXT_PLAIN); + } + + @Override + protected FileCreator self() + { + return this; + } + + @Override + public FileCreator withRandomName(String prefix) + { + withAlias(prefix); + return super.withRandomName(prefix); + } + + @Override + public FileCreator file(String name) + { + return this.withName(name); + } + + @Override + public FileCreator randomFile() + { + return this.withRandomName(); + } + + @Override + public FileCreator randomFile(String prefix) + { + return this.withRandomName(prefix); + } + + @Override + public MultiCreator.FilesCreator files(String... names) + { + return new SerialFilesCreator(dataContent, filesCache).withNames(names).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FilesCreator randomFiles(String... prefixes) + { + return new SerialFilesCreator(dataContent, filesCache).withRandomNames(prefixes).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FilesCreator randomFiles(int quantity) + { + return new SerialFilesCreator(dataContent, filesCache).withRandomNames(quantity).withinSite(site).asUser(user); + } + + @Override + public FileCreator ofType(FileType fileType) + { + contentModel.setFileType(fileType); + return this; + } + + @Override + public FileCreator withContent(String fileContent) + { + contentModel.setContent(fileContent); + return this; + } + + @Override + public FileModel create() + { + contentModel.setName(contentModel.getName() + "." + contentModel.getFileType().extension); + FileModel createdFile = create(dataContent, dataContent::createContent); + filesCache.put(alias, createdFile); + + return createdFile; + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix, String suffix) + { + return super.generateRandomNameWith(FILE_NAME_PREFIX + prefix + "_", suffix); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java new file mode 100644 index 0000000000..6bed9eb5d8 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java @@ -0,0 +1,73 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import java.util.Map; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.repo.resource.general.ContentModifier; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FolderModel; + +public class PlainFileModifier + extends ContentModifier + implements Modifier.FileModifier +{ + private final Map filesCache; + + public PlainFileModifier(DataContent dataContent, RestWrapper restClient, FileModel file, Map filesCache) + { + super(dataContent, restClient, file); + this.filesCache = filesCache; + } + + @Override + protected FileModifier self() + { + return this; + } + + @Override + public FileModel get(String id) + { + return super.get(id, FileModel::new); + } + + @Override + public FileModel copyTo(FolderModel target) + { + return super.copyTo(target, FileModel::new); + } + + @Override + public void delete() + { + filesCache.remove(contentModel.getNodeRef()); + super.delete(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java new file mode 100644 index 0000000000..4bc1a3985f --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java @@ -0,0 +1,143 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Folders.FOLDER_NAME_PREFIX; + +import java.util.Map; + +import org.alfresco.rest.repo.resource.general.ContentCreator; +import org.alfresco.rest.repo.resource.general.Creator; +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FolderModel; + +public class RepoFolderCreator + extends ContentCreator + implements Creator.FolderCreator, Specifier.FolderSpecifier +{ + + private final DataContent dataContent; + private final Map foldersCache; + + public RepoFolderCreator(DataContent dataContent, Map foldersCache) + { + super(new FolderModel()); + this.dataContent = dataContent; + this.foldersCache = foldersCache; + } + + @Override + protected RepoFolderCreator self() + { + return this; + } + + @Override + public FolderCreator folder(String name) + { + return this.withName(name); + } + + @Override + public FolderCreator randomFolder() + { + return this.withRandomName(); + } + + @Override + public FolderCreator randomFolder(String prefix) + { + return this.withRandomName(prefix); + } + + @Override + public MultiCreator.FoldersCreator folders(String... names) + { + return new SerialFoldersCreator(dataContent, foldersCache).withNames(names).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FoldersCreator randomFolders(String... prefixes) + { + return new SerialFoldersCreator(dataContent, foldersCache).withRandomNames(prefixes).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FoldersCreator randomFolders(int quantity) + { + return new SerialFoldersCreator(dataContent, foldersCache).withRandomNames(quantity).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FoldersCreator nestedFolders(String... names) + { + return new NestedFoldersCreator(dataContent, foldersCache).withNames(names).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FoldersCreator nestedRandomFolders(String... prefixes) + { + return new NestedFoldersCreator(dataContent, foldersCache).withRandomNames(prefixes).withinSite(site).asUser(user); + } + + @Override + public MultiCreator.FoldersCreator nestedRandomFolders(int depth) + { + return new NestedFoldersCreator(dataContent, foldersCache).withRandomNames(depth).withinSite(site).asUser(user); + } + + @Override + public FolderCreator withRandomName(String prefix) + { + withAlias(prefix); + return super.withRandomName(prefix); + } + + @Override + public FolderModel create() + { + FolderModel createdFolder = create(dataContent, dataContent::createFolder); + foldersCache.put(alias, createdFolder); + + return createdFolder; + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix) + { + return super.generateRandomNameWith(FOLDER_NAME_PREFIX + prefix + "_"); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java new file mode 100644 index 0000000000..7e95f7b412 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java @@ -0,0 +1,108 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import java.util.Map; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestTagModel; +import org.alfresco.rest.repo.resource.Files; +import org.alfresco.rest.repo.resource.general.ContentModifier; +import org.alfresco.rest.repo.resource.general.Modifier; +import org.alfresco.rest.repo.resource.general.Specifier; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FolderModel; + +public class RepoFolderModifier + extends ContentModifier + implements Modifier.FolderModifier +{ + + private final RestWrapper restClient; + private final DataContent dataContent; + private final Files files; + private final Map foldersCache; + + public RepoFolderModifier(DataContent dataContent, RestWrapper restClient, FolderModel folder, Files files, Map foldersCache) + { + super(dataContent, restClient, folder); + this.dataContent = dataContent; + this.restClient = restClient; + this.files = files; + this.foldersCache = foldersCache; + } + + @Override + protected FolderModifier self() + { + return this; + } + + @Override + public Specifier.MultiContentSpecifier add() + { + return (Specifier.MultiContentSpecifier) new MultiContentCreator(dataContent, restClient, files, foldersCache) + .underFolder(contentModel).withinSite(site).asUser(user); + } + + @Override + public Specifier.AssociationSpecifier remove() + { + return new Specifier.AssociationSpecifier() { + @Override + public void secondaryContent(ContentModel content) + { + buildNodeRestRequest(restClient, contentModel).removeSecondaryChild(content); + } + + @Override + public void tag(RestTagModel tag) + { + buildNodeRestRequest(restClient, contentModel).deleteTag(tag); + } + }; + } + + @Override + public FolderModel get(String id) + { + return super.get(id, FolderModel::new); + } + + @Override + public FolderModel copyTo(FolderModel target) + { + return super.copyTo(target, FolderModel::new); + } + + @Override + public void delete() + { + foldersCache.remove(contentModel.getName()); + super.delete(); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java new file mode 100644 index 0000000000..015fb842ea --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java @@ -0,0 +1,156 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Files.FILE_NAME_PREFIX; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.RandomStringUtils; + +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.MultipleContentsCreator; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.FolderModel; + +public class SerialFilesCreator + extends MultipleContentsCreator + implements MultiCreator.FilesCreator +{ + private final DataContent dataContent; + private List fileTypes; + private List filesContents; + private final Map filesCache; + + public SerialFilesCreator(DataContent dataContent, Map filesCache) + { + super(); + this.dataContent = dataContent; + this.filesCache = filesCache; + } + + @Override + protected FilesCreator self() + { + return this; + } + + @Override + public FilesCreator ofTypes(FileType... fileTypes) + { + this.fileTypes = List.of(fileTypes); + return this; + } + + @Override + public FilesCreator withContents(List filesContents) + { + this.filesContents = filesContents; + return this; + } + + @Override + public FilesCreator withRandomContents(int wordsCount, int wordsMaxLength) + { + return withContents( + IntStream.of(0, names.size()) + .mapToObj(i -> IntStream.range(0, wordsCount) + .mapToObj(j -> RandomStringUtils.randomAlphanumeric(1, wordsMaxLength)) + .collect(Collectors.joining(" "))) + .collect(Collectors.toList())); + } + + @Override + public List create() + { + verifyDataConsistency(); + return createRawFilesUnder(parent, names); + } + + @Override + protected void verifyDataConsistency() + { + super.verifyDataConsistency(); + if (CollectionUtils.isEmpty(fileTypes) || fileTypes.size() < names.size()) + { + throw new IllegalArgumentException("Provided file types size is different from created files amount"); + } + if (CollectionUtils.isEmpty(filesContents) || filesContents.size() < names.size()) + { + throw new IllegalArgumentException("Provided file contents size is different from created files amount"); + } + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix) + { + return super.generateRandomNameWith(FILE_NAME_PREFIX + prefix + "_"); + } + + protected FileModel createFile(String fileName, FileType fileType, String title, String description, String fileContent, FolderModel parent, String alias) + { + return new PlainFileCreator(dataContent, filesCache) + .withAlias(alias) + .withName(fileName) + .ofType(fileType) + .withTitle(title) + .withDescription(description) + .withContent(fileContent) + .underFolder(parent) + .withinSite(site) + .asUser(user) + .create(); + } + + private List createRawFilesUnder(FolderModel parent, List fileNames) + { + List createdFiles = new ArrayList<>(); + AtomicInteger i = new AtomicInteger(0); + fileNames.forEach(fileName -> { + createdFiles.add(createFile(fileName, getOrNull(fileTypes, i.get()), getOrNull(titles, i.get()), getOrNull(descriptions, i.get()), + getOrNull(filesContents, i.get()), parent, getOrNull(aliases, i.get()))); + i.getAndIncrement(); + }); + + return createdFiles; + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java new file mode 100644 index 0000000000..5dba8bb5cf --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java @@ -0,0 +1,107 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.content; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import static org.alfresco.rest.repo.resource.Folders.FOLDER_NAME_PREFIX; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import org.alfresco.rest.repo.resource.general.MultiCreator; +import org.alfresco.rest.repo.resource.general.MultipleContentsCreator; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.FolderModel; + +public class SerialFoldersCreator + extends MultipleContentsCreator + implements MultiCreator.FoldersCreator +{ + + private final DataContent dataContent; + private final Map foldersCache; + + public SerialFoldersCreator(DataContent dataContent, Map foldersCache) + { + super(); + this.dataContent = dataContent; + this.foldersCache = foldersCache; + } + + @Override + protected SerialFoldersCreator self() + { + return this; + } + + @Override + public List create() + { + verifyDataConsistency(); + return createRawFoldersUnder(parent, names); + } + + @Override + protected String generateRandomName() + { + return this.generateRandomNameWith(EMPTY); + } + + @Override + protected String generateRandomNameWith(String prefix) + { + return super.generateRandomNameWith(FOLDER_NAME_PREFIX + prefix + "_"); + } + + protected FolderModel createFolder(String folderName, String title, String description, FolderModel parent, String alias) + { + return new RepoFolderCreator(dataContent, foldersCache) + .withAlias(alias) + .withName(folderName) + .withTitle(title) + .withDescription(description) + .underFolder(parent) + .withinSite(site) + .asUser(user) + .create(); + } + + private List createRawFoldersUnder(FolderModel parent, List folderNames) + { + List createdFolders = new ArrayList<>(); + AtomicInteger i = new AtomicInteger(); + folderNames.forEach(folderName -> { + FolderModel createdFolder = createFolder(folderName, getOrNull(titles, i.get()), getOrNull(descriptions, i.get()), parent, getOrNull(aliases, i.get())); + createdFolders.add(createdFolder); + i.getAndIncrement(); + }); + + return createdFolders; + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java new file mode 100644 index 0000000000..7bb0ca4759 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java @@ -0,0 +1,105 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import java.util.function.Function; + +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; + +public abstract class ContentCreator> + extends ResourceCreator + implements Creator.ContentCreator +{ + private static final FolderModel DOCUMENT_LIBRARY = null; + + protected SiteModel site; + protected final CONTENT contentModel; + protected FolderModel parent = DOCUMENT_LIBRARY; + + public ContentCreator(CONTENT contentModel) + { + super(); + this.contentModel = contentModel; + } + + protected abstract SELF self(); + + @Override + public SELF withName(String name) + { + contentModel.setName(name); + return self(); + } + + @Override + public SELF withTitle(String title) + { + contentModel.setTitle(title); + return self(); + } + + @Override + public SELF withDescription(String description) + { + contentModel.setDescription(description); + return self(); + } + + @Override + public SELF underFolder(FOLDER parent) + { + this.parent = parent; + return self(); + } + + @Override + public SELF withinSite(SITE site) + { + this.site = site; + return self(); + } + + protected CONTENT create(DataContent dataContent, Function creator) + { + if (site != null) + { + dataContent.usingSite(site); + } + if (parent != null) + { + dataContent.usingResource(parent); + } + if (user != null) + { + dataContent.usingUser(user); + } + + return creator.apply(contentModel); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java new file mode 100644 index 0000000000..6f6daf0a25 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java @@ -0,0 +1,177 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.model.RestCategoryLinkBodyModel; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.model.RestNodeBodyMoveCopyModel; +import org.alfresco.rest.model.RestNodeModel; +import org.alfresco.utility.data.DataContent; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; + +public abstract class ContentModifier> + extends ResourceModifier + implements Modifier.ContentModifier +{ + protected SiteModel site; + private final DataContent dataContent; + private final RestWrapper restClient; + protected final CONTENT contentModel; + + protected ContentModifier(DataContent dataContent, RestWrapper restClient, CONTENT contentModel) + { + super(); + this.dataContent = dataContent; + this.restClient = restClient; + this.contentModel = contentModel; + } + + public SELF withinSite(SITE site) + { + this.site = site; + return self(); + } + + protected CONTENT get(String id, Supplier contentSupplier) + { + ContentModel getNodeModel = new ContentModel(); + getNodeModel.setNodeRef(id); + RestNodeModel node = buildNodeRestRequest(restClient, getNodeModel).getNode(); + + CONTENT content = contentSupplier.get(); + content.setName(node.getName()); + content.setNodeRef(node.getId()); + content.setCmisLocation(getCmisLocation(node.getPath(), node.getName())); + return content; + } + + @Override + public void moveTo(FOLDER target) + { + RestNodeBodyMoveCopyModel moveModel = new RestNodeBodyMoveCopyModel(); + moveModel.setTargetParentId(target.getNodeRef()); + moveModel.setName(contentModel.getName()); + + RestNodeModel movedNode = buildNodeRestRequest(restClient, contentModel).includePath().move(moveModel); + contentModel.setCmisLocation(getCmisLocation(movedNode.getPath(), movedNode.getName())); + } + + protected CONTENT copyTo(FolderModel target, Function contentSupplier) + { + RestNodeBodyMoveCopyModel copyModel = new RestNodeBodyMoveCopyModel(); + copyModel.setTargetParentId(target.getNodeRef()); + copyModel.setName(contentModel.getName()); + + RestNodeModel nodeCopy = buildNodeRestRequest(restClient, contentModel).includePath().copy(copyModel); + CONTENT contentCopy = contentSupplier.apply(contentModel); + contentCopy.setName(nodeCopy.getName()); + contentCopy.setNodeRef(nodeCopy.getId()); + contentCopy.setCmisLocation(getCmisLocation(nodeCopy.getPath(), nodeCopy.getName())); + return contentCopy; + } + + @Override + public void delete() + { + dataContent.usingUser(user).usingResource(contentModel).deleteContent(); + } + + @Override + public void linkTo(FOLDER secondaryParent) + { + buildNodeRestRequest(restClient, secondaryParent).addSecondaryChild(contentModel); + } + + @Override + @SafeVarargs + public final void linkTo(FOLDER... secondaryParents) + { + Stream.of(secondaryParents).forEach(secondaryParent -> buildNodeRestRequest(restClient, secondaryParent).addSecondaryChildren(contentModel)); + } + + @Override + public void unlinkFrom(FOLDER secondaryParent) + { + buildNodeRestRequest(restClient, secondaryParent).removeSecondaryChild(contentModel); + } + + @Override + public void linkTo(CATEGORY category) + { + buildNodeRestRequest(restClient, contentModel).linkToCategory( + RestCategoryLinkBodyModel.builder().categoryId(category.getId()).create()); + } + + @Override + @SafeVarargs + public final void linkTo(CATEGORY... categories) + { + buildNodeRestRequest(restClient, contentModel).linkToCategories( + Stream.of(categories) + .map(category -> RestCategoryLinkBodyModel.builder().categoryId(category.getId()).create()) + .collect(Collectors.toList())); + } + + @Override + public void unlinkFrom(CATEGORY category) + { + buildNodeRestRequest(restClient, contentModel).unlinkFromCategory(category.getId()); + } + + private static String getCmisLocation(Object pathMap, String name) + { + return Stream.concat( + Stream.of(pathMap) + .filter(Objects::nonNull) + .filter(path -> path instanceof Map) + .map(Map.class::cast) + .map(path -> path.get("elements")) + .filter(Objects::nonNull) + .filter(elements -> elements instanceof List) + .map(List.class::cast) + .flatMap(elements -> (Stream) elements.stream()) + .skip(1) + .filter(element -> element instanceof Map) + .map(Map.class::cast) + .map(element -> element.get("name")) + .filter(Objects::nonNull) + .filter(elementName -> elementName instanceof String) + .map(String.class::cast), + Stream.of(name)) + .collect(Collectors.joining("/", "/", "/")); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java new file mode 100644 index 0000000000..80502dfc6b --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java @@ -0,0 +1,107 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import java.util.random.RandomGenerator; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import org.apache.commons.lang3.RandomStringUtils; + +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +/** + * Declares operations, which can be performed to create repository resource. + * + * @param + * repository resource, e.g. folder, category, etc. + * @param + * return type - this interface extension or implementation + */ +public interface Creator> +{ + SELF withName(String name); + + SELF asUser(USER user); + + RESOURCE create(); + + interface ContentCreator> + extends Creator + { + SELF withTitle(String title); + + default SELF withRandomTitle() + { + return withTitle(RandomStringUtils.randomAlphanumeric(10)); + } + + SELF withDescription(String description); + + default SELF withRandomDescription() + { + return withDescription(RandomStringUtils.randomAlphanumeric(20)); + } + + SELF underFolder(FOLDER parent); + + SELF withinSite(SITE site); + } + + interface FolderCreator extends ContentCreator + {} + + interface FileCreator extends ContentCreator + { + FileCreator ofType(FileType fileType); + + FileCreator withContent(String fileContent); + + default FileCreator withRandomContent() + { + return withRandomContent(RandomGenerator.getDefault().nextInt(30, 70), 10); + } + + default FileCreator withRandomContent(int wordsNumber, int wordsMaxLength) + { + return withContent(IntStream.range(0, wordsNumber) + .mapToObj(i -> RandomStringUtils.randomAlphanumeric(1, wordsMaxLength)) + .collect(Collectors.joining(" "))); + } + } + + interface CategoryCreator extends Creator + { + CategoryCreator underCategory(CATEGORY parent); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java new file mode 100644 index 0000000000..23ae379709 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java @@ -0,0 +1,84 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +/** + * Declares operations, which can be performed on repository resource. + * + * @param + * repository resource, e.g. folder, category, etc. + * @param + * return type - this interface extension or implementation + */ +public interface Modifier> +{ + RESOURCE get(String id); + + SELF asUser(USER user); + + void delete(); + + interface ContentModifier> + extends Modifier + { + void moveTo(FOLDER target); + + CONTENT copyTo(FOLDER target); + + void linkTo(FOLDER secondaryParent); + + void linkTo(FOLDER... secondaryParents); + + void unlinkFrom(FOLDER secondaryParent); + + void linkTo(CATEGORY category); + + void linkTo(CATEGORY... categories); + + void unlinkFrom(CATEGORY category); + + SELF withinSite(SITE site); + } + + interface FolderModifier extends ContentModifier, + ResourceIntroducer, ResourceRemover + {} + + interface FileModifier extends ContentModifier + {} + + interface CategoryModifier extends Modifier, + ResourceIntroducer + {} +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java new file mode 100644 index 0000000000..8b859b9cf0 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java @@ -0,0 +1,92 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import java.util.List; +import java.util.random.RandomGenerator; + +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +/** + * Declares actions, which can be performed to create multiple repository resources. + * + * @param + * repository resource, e.g. folder, category, etc. + * @param + * return type - this interface extension or implementation + */ +public interface MultiCreator> +{ + SELF withNames(String... names); + + SELF asUser(USER user); + + List create(); + + interface ContentsCreator> extends MultiCreator + { + SELF withTitles(String... titles); + + SELF withRandomTitles(); + + SELF withDescriptions(String... descriptions); + + SELF withRandomDescriptions(); + + SELF underFolder(FOLDER parent); + + SELF withinSite(SITE site); + } + + interface FoldersCreator extends ContentsCreator + {} + + interface FilesCreator extends ContentsCreator + { + FilesCreator ofTypes(FileType... fileTypes); + + FilesCreator withContents(List filesContents); + + default FilesCreator withRandomContents() + { + return withRandomContents(RandomGenerator.getDefault().nextInt(30, 70), 10); + } + + FilesCreator withRandomContents(int wordsCount, int wordsMaxLength); + } + + interface CategoriesCreator extends MultiCreator + { + CategoriesCreator underCategory(CATEGORY parent); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java new file mode 100644 index 0000000000..470a5e14db --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java @@ -0,0 +1,106 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.RandomStringUtils; + +import org.alfresco.utility.model.ContentModel; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; + +public abstract class MultipleContentsCreator> + extends MultipleResourcesCreator + implements MultiCreator.ContentsCreator +{ + + protected FolderModel parent; + protected SiteModel site; + protected UserModel user; + protected List titles = new ArrayList<>(); + protected List descriptions = new ArrayList<>(); + + public SELF withTitles(String... titles) + { + this.titles = Stream.of(titles).collect(Collectors.toList()); + return self(); + } + + public SELF withRandomTitles() + { + this.titles = IntStream.range(0, names.size()).mapToObj(i -> RandomStringUtils.randomAlphanumeric(10)).collect(Collectors.toList()); + return self(); + } + + public SELF withDescriptions(String... descriptions) + { + this.descriptions = Stream.of(descriptions).collect(Collectors.toList()); + return self(); + } + + public SELF withRandomDescriptions() + { + this.descriptions = IntStream.range(0, names.size()).mapToObj(i -> RandomStringUtils.randomAlphanumeric(20)).collect(Collectors.toList()); + return self(); + } + + public SELF underFolder(FOLDER parent) + { + this.parent = parent; + return self(); + } + + public SELF withinSite(SITE site) + { + this.site = site; + return self(); + } + + protected void verifyDataConsistency() + { + if (CollectionUtils.isEmpty(names)) + { + throw new IllegalArgumentException("Names of files/folders to create needs to be provided"); + } + + if (CollectionUtils.isNotEmpty(titles) && titles.size() < names.size()) + { + throw new IllegalArgumentException("Provided titles size is different from created files/folders amount"); + } + + if (CollectionUtils.isNotEmpty(descriptions) && descriptions.size() < names.size()) + { + throw new IllegalArgumentException("Provided descriptions size is different from created files/folders amount"); + } + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java new file mode 100644 index 0000000000..1f4a3f4cde --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java @@ -0,0 +1,129 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import java.util.List; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.RandomStringUtils; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.requests.Node; +import org.alfresco.utility.model.RepoTestModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +public abstract class MultipleResourcesCreator> + implements MultiCreator +{ + + protected UserModel user; + protected List names; + protected List aliases; + + protected abstract SELF self(); + + public SELF withNames(String... names) + { + this.names = Stream.of(names).collect(Collectors.toList()); + return self(); + } + + public SELF withRandomNames(String... prefixes) + { + this.aliases = Stream.of(prefixes).toList(); + return withNames(Stream.of(prefixes).map(this::generateRandomNameWith).toArray(String[]::new)); + } + + public SELF withRandomNames(List prefixes, List suffixes) + { + this.aliases = prefixes; + if (CollectionUtils.isEmpty(prefixes) || CollectionUtils.isEmpty(suffixes) || prefixes.size() != suffixes.size()) + { + throw new IllegalArgumentException("Provided suffixes size is different from prefixes size"); + } + + AtomicInteger i = new AtomicInteger(); + return withNames(prefixes.stream() + .map(this::generateRandomNameWith) + .map(name -> name + suffixes.get(i.getAndIncrement())) + .toArray(String[]::new)); + } + + public SELF withRandomNames(int namesCount) + { + return withNames(IntStream.range(0, namesCount).mapToObj(i -> generateRandomName()).toArray(String[]::new)); + } + + @Override + public SELF asUser(USER user) + { + this.user = user; + return self(); + } + + protected String generateRandomName() + { + return generateRandomNameWith(RandomStringUtils.randomAlphanumeric(5) + "_"); + } + + protected String generateRandomNameWith(String prefix) + { + return generateRandomNameWith(prefix, EMPTY); + } + + protected String generateRandomNameWith(String prefix, String suffix) + { + return prefix + UUID.randomUUID() + suffix; + } + + protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node) + { + return restClient.authenticateUser(user).withCoreAPI().usingNode(node); + } + + protected T getOrNull(List list, int index) + { + if (CollectionUtils.isEmpty(list)) + { + return null; + } + + if (index < 0 || index >= list.size()) + { + return null; + } + + return list.get(index); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java new file mode 100644 index 0000000000..949b1d52fb --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java @@ -0,0 +1,104 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import static org.apache.commons.lang3.StringUtils.EMPTY; + +import java.util.UUID; + +import org.apache.commons.lang3.RandomStringUtils; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.requests.Node; +import org.alfresco.utility.model.RepoTestModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +public abstract class ResourceCreator> + implements Creator +{ + + protected UserModel user; + protected String name; + protected String alias; + + protected abstract SELF self(); + + @Override + public SELF withName(String name) + { + this.name = name; + return self(); + } + + public SELF withAlias(String alias) + { + this.alias = alias; + return self(); + } + + public SELF withRandomName() + { + return withName(generateRandomName()); + } + + public SELF withRandomName(String prefix) + { + return withName(generateRandomNameWith(prefix)); + } + + public SELF withRandomName(String prefix, String suffix) + { + return withName(generateRandomNameWith(prefix, suffix)); + } + + @Override + public SELF asUser(USER user) + { + this.user = user; + return self(); + } + + protected String generateRandomName() + { + return generateRandomNameWith(RandomStringUtils.randomAlphanumeric(5) + "_"); + } + + protected String generateRandomNameWith(String prefix) + { + return generateRandomNameWith(prefix, EMPTY); + } + + protected String generateRandomNameWith(String prefix, String suffix) + { + return prefix + UUID.randomUUID() + suffix; + } + + protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node) + { + return restClient.authenticateUser(user).withCoreAPI().usingNode(node); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java new file mode 100644 index 0000000000..399cdef206 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java @@ -0,0 +1,37 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +/** + * Declares an action introducing new repository resource like: folder, file, category, association, etc. + * + * @param + * repository resource specifier, see {@link Specifier} + */ +public interface ResourceIntroducer +{ + SPECIFIER add(); +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java new file mode 100644 index 0000000000..6389bf9ee7 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java @@ -0,0 +1,53 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.requests.Node; +import org.alfresco.utility.model.RepoTestModel; +import org.alfresco.utility.model.TestModel; +import org.alfresco.utility.model.UserModel; + +public abstract class ResourceModifier> + implements Modifier +{ + + protected UserModel user; + + protected abstract SELF self(); + + @Override + public SELF asUser(UserModel user) + { + this.user = user; + return self(); + } + + protected Node buildNodeRestRequest(RestWrapper restClient, RepoTestModel node) + { + return restClient.authenticateUser(user).withCoreAPI().usingNode(node); + } +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java new file mode 100644 index 0000000000..40038346b6 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java @@ -0,0 +1,37 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +/** + * Declares an action, which removes repository resource like association. + * + * @param + * repository resource specifier, see {@link Specifier} + */ +public interface ResourceRemover +{ + SPECIFIER remove(); +} diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java new file mode 100644 index 0000000000..81894c43c1 --- /dev/null +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java @@ -0,0 +1,106 @@ +/*- + * #%L + * alfresco-tas-restapi + * %% + * Copyright (C) 2005 - 2024 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 . + * #L% + */ +package org.alfresco.rest.repo.resource.general; + +import org.alfresco.rest.model.RestTagModel; +import org.alfresco.utility.model.ContentModel; + +/** + * Specifies repository resource to perform an operation on, like: add, modify, remove. + */ +public interface Specifier +{ + interface FolderSpecifier extends Specifier + { + Creator.FolderCreator folder(String name); + + Creator.FolderCreator randomFolder(); + + Creator.FolderCreator randomFolder(String prefix); + + MultiCreator.FoldersCreator folders(String... names); + + MultiCreator.FoldersCreator randomFolders(String... prefixes); + + MultiCreator.FoldersCreator randomFolders(int quantity); + + MultiCreator.FoldersCreator nestedFolders(String... names); + + MultiCreator.FoldersCreator nestedRandomFolders(String... prefixes); + + MultiCreator.FoldersCreator nestedRandomFolders(int depth); + } + + interface FileSpecifier extends Specifier + { + Creator.FileCreator file(String name); + + Creator.FileCreator randomFile(); + + Creator.FileCreator randomFile(String prefix); + + MultiCreator.FilesCreator files(String... names); + + MultiCreator.FilesCreator randomFiles(String... prefixes); + + MultiCreator.FilesCreator randomFiles(int quantity); + } + + interface AssociationSpecifier extends Specifier + { + void secondaryContent(CONTENT content); + + void tag(TAG tag); + } + + interface MultiContentSpecifier extends FolderSpecifier, FileSpecifier, AssociationSpecifier + { + void secondaryContent(CONTENT... contents); + + void tags(TAG... tags); + } + + interface CategoriesSpecifier extends Specifier + { + Creator.CategoryCreator category(String name); + + Creator.CategoryCreator randomCategory(); + + Creator.CategoryCreator randomCategory(String prefix); + + MultiCreator.CategoriesCreator categories(String... names); + + MultiCreator.CategoriesCreator randomCategories(String... prefixes); + + MultiCreator.CategoriesCreator randomCategories(int quantity); + + MultiCreator.CategoriesCreator nestedCategories(String... names); + + MultiCreator.CategoriesCreator nestedRandomCategories(String... prefixes); + + MultiCreator.CategoriesCreator nestedRandomCategories(int depth); + } +} From aa1ec3cf35964978838cf543058a4e033ec81656 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:42:43 +0000 Subject: [PATCH 121/148] [maven-release-plugin][skip ci] prepare release 23.4.0.34 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 65055ce046..75ef0d08f7 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f70e99e4ea..c90859fde7 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 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 919ca923a0..ff1704bda9 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index cddfb2ad51..5f69e69023 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index c3cdd993fc..87fa0b7c0b 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 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 67e6eee78d..ecd08e98ed 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/amps/pom.xml b/amps/pom.xml index 14c16e3528..c750bff7ea 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 229f9320df..57e1c2c538 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/core/pom.xml b/core/pom.xml index 046a66fdc2..d0746f7800 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/data-model/pom.xml b/data-model/pom.xml index cde69fddf2..128862b606 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/mmt/pom.xml b/mmt/pom.xml index 6e1f632e48..149a84fe5c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8bc07b0b1a..8c18ab53af 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3d47cb292f..d13d42c18a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/pom.xml b/packaging/pom.xml index ab40765863..15eba0a4a8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 3e739e58a8..b711e896b8 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 9cbc5b09f6..7d99703250 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 997af0979a..9ba7a012de 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f6c30ef1ea..cccce834db 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 819b68bcce..899d05bc00 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 75aaab407b..075c849fe4 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 - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2659571896..0e7cf51127 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/pom.xml b/pom.xml index fef93ffe54..af16533d00 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.34 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 75ee05a470..c9e3ae7f78 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 diff --git a/repository/pom.xml b/repository/pom.xml index c483d306bc..7e89667040 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34-SNAPSHOT + 23.4.0.34 From dde8dc90e65766a0ca9b4776d99ef14dd68b44de Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:42:45 +0000 Subject: [PATCH 122/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 75ef0d08f7..026dd9c52a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c90859fde7..9c9abb6f6d 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 - 23.4.0.34 + 23.4.0.35-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 ff1704bda9..7ca384ab23 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 5f69e69023..fbd73cfd1e 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 87fa0b7c0b..bbe19a186d 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 - 23.4.0.34 + 23.4.0.35-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 ecd08e98ed..f5e790bacd 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index c750bff7ea..d29c208645 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 57e1c2c538..4e69cc2c13 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d0746f7800..49ee075142 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 128862b606..edb15b95ba 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 149a84fe5c..b74cae858c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8c18ab53af..842ff8ca67 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index d13d42c18a..3cd8db01b4 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 15eba0a4a8..5716be5475 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b711e896b8..a31381fe75 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7d99703250..995d158696 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9ba7a012de..215b398272 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index cccce834db..a56231e9c7 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 899d05bc00..e53a130c54 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 075c849fe4..d8b5d8c013 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 - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0e7cf51127..93a9007bca 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/pom.xml b/pom.xml index af16533d00..766cc4809c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.34 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c9e3ae7f78..06e8ebfdc5 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 7e89667040..7d434dfd88 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.34 + 23.4.0.35-SNAPSHOT From aeebd3dcc6dbccf583a9e912c9cc160c0926e264 Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:32:53 +0200 Subject: [PATCH 123/148] ACS-8832 Fix Event Outbox shutdown (#2959) * ACS-8832 Add destroy method in EventSender * ACS-8832 Rename * ACS-8832 Reformat --- .../alfresco/repo/event2/EventGenerator.java | 114 ++++++++++-------- .../org/alfresco/repo/event2/EventSender.java | 17 ++- 2 files changed, 75 insertions(+), 56 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java index f6a62ddac6..3142b42ebc 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java @@ -38,6 +38,12 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.ApplicationEvent; +import org.springframework.extensions.surf.util.AbstractLifecycleBean; + import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.TransactionEntity; import org.alfresco.repo.event.v1.model.DataAttributes; @@ -81,11 +87,6 @@ import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.PropertyCheck; import org.alfresco.util.TriPredicate; import org.alfresco.util.transaction.TransactionListenerAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationEvent; -import org.springframework.extensions.surf.util.AbstractLifecycleBean; /** * Generates events and sends them to an event topic. @@ -93,8 +94,8 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean; * @author Jamal Kaabi-Mofrad */ public class EventGenerator extends AbstractLifecycleBean implements InitializingBean, EventSupportedPolicies, - ChildAssociationEventSupportedPolicies, - PeerAssociationEventSupportedPolicies + ChildAssociationEventSupportedPolicies, + PeerAssociationEventSupportedPolicies { private static final Log LOGGER = LogFactory.getLog(EventGenerator.class); @@ -354,7 +355,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin } protected ChildAssociationEventConsolidator createChildAssociationEventConsolidator( - ChildAssociationRef childAssociationRef) + ChildAssociationRef childAssociationRef) { return new ChildAssociationEventConsolidator(childAssociationRef, nodeResourceHelper); } @@ -417,8 +418,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin } /** - * @return the {@link NodeEventConsolidator} for the supplied {@code nodeRef} from - * the current transaction context. + * @return the {@link NodeEventConsolidator} for the supplied {@code nodeRef} from the current transaction context. */ protected NodeEventConsolidator getEventConsolidator(NodeRef nodeRef) { @@ -438,7 +438,6 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin return eventConsolidator; } - protected Consolidators getTxnConsolidators(Object resourceKey) { Consolidators consolidators = AlfrescoTransactionSupport.getResource(resourceKey); @@ -451,8 +450,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin } /** - * @return the {@link ChildAssociationEventConsolidator} for the supplied {@code childAssociationRef} from - * the current transaction context. + * @return the {@link ChildAssociationEventConsolidator} for the supplied {@code childAssociationRef} from the current transaction context. */ private ChildAssociationEventConsolidator getEventConsolidator(ChildAssociationRef childAssociationRef) { @@ -473,8 +471,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin } /** - * @return the {@link PeerAssociationEventConsolidator} for the supplied {@code peerAssociationRef} from - * the current transaction context. + * @return the {@link PeerAssociationEventConsolidator} for the supplied {@code peerAssociationRef} from the current transaction context. */ private PeerAssociationEventConsolidator getEventConsolidator(AssociationRef peerAssociationRef) { @@ -507,10 +504,10 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin protected EventInfo getEventInfo(String user) { return new EventInfo().setTimestamp(getCurrentTransactionTimestamp()) - .setId(UUID.randomUUID().toString()) - .setTxnId(AlfrescoTransactionSupport.getTransactionId()) - .setPrincipal(user) - .setSource(URI.create("/" + descriptorService.getCurrentRepositoryDescriptor().getId())); + .setId(UUID.randomUUID().toString()) + .setTxnId(AlfrescoTransactionSupport.getTransactionId()) + .setPrincipal(user) + .setSource(URI.create("/" + descriptorService.getCurrentRepositoryDescriptor().getId())); } private ZonedDateTime getCurrentTransactionTimestamp() @@ -523,13 +520,12 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin private static ChildAssociationRef childAssociationWithoutParentOf(ChildAssociationRef childAssociationRef) { return new ChildAssociationRef( - null, - null, - childAssociationRef.getQName(), - childAssociationRef.getChildRef(), - childAssociationRef.isPrimary(), - childAssociationRef.getNthSibling() - ); + null, + null, + childAssociationRef.getQName(), + childAssociationRef.getChildRef(), + childAssociationRef.isPrimary(), + childAssociationRef.getNthSibling()); } @Override @@ -546,7 +542,10 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin @Override protected void onShutdown(ApplicationEvent applicationEvent) { - //NOOP + if (eventSender != null) + { + eventSender.destroy(); + } } protected class EventTransactionListener extends TransactionListenerAdapter @@ -586,8 +585,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin } /** - * @return true if a node transaction is not only active, but also committed with modifications. - * This means that a {@link TransactionEntity} object was created. + * @return true if a node transaction is not only active, but also committed with modifications. This means that a {@link TransactionEntity} object was created. */ protected boolean isTransactionCommitted() { @@ -601,7 +599,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin try { sendEvents(); - } catch (Exception e) + } + catch (Exception e) { // Must consume the exception to protect other TransactionListeners LOGGER.error("Unexpected error while sending repository events", e); @@ -650,14 +649,19 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin /** * Handles all kinds of events and sends them within dedicated transaction. * - * @param entityReference - reference to an entity (e.g. node, child association, peer association) - * @param eventConsolidator - object encapsulating events occurred in a transaction - * @param entityToEventEligibilityVerifier - allows to verify if entity is eligible to generate an even. If null no verification is necessary - * @param - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef}) - * @param - event consolidator type - extension of {@link EventConsolidator} + * @param entityReference + * - reference to an entity (e.g. node, child association, peer association) + * @param eventConsolidator + * - object encapsulating events occurred in a transaction + * @param entityToEventEligibilityVerifier + * - allows to verify if entity is eligible to generate an even. If null no verification is necessary + * @param + * - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef}) + * @param + * - event consolidator type - extension of {@link EventConsolidator} */ - private > void sendEvent( - final REF entityReference, final CON eventConsolidator, final TriPredicate entityToEventEligibilityVerifier) + private > void sendEvent( + final REF entityReference, final CON eventConsolidator, final TriPredicate entityToEventEligibilityVerifier) { final EventInfo eventInfo = getEventInfo(AuthenticationUtil.getFullyAuthenticatedUser()); if (isSendingEventBeforeCommitRequired()) @@ -676,16 +680,22 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin /** * Creates events from various kinds of entities. * - * @param entityReference - reference to an entity (e.g. node, child association, peer association) - * @param eventConsolidator - object encapsulating events occurred in a transaction - * @param eventInfo - object holding the event information - * @param entityToEventEligibilityVerifier - allows to verify if entity is eligible to generate an even. If null no verification is necessary - * @param - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef}) - * @param - event consolidator type - extension of {@link EventConsolidator} + * @param entityReference + * - reference to an entity (e.g. node, child association, peer association) + * @param eventConsolidator + * - object encapsulating events occurred in a transaction + * @param eventInfo + * - object holding the event information + * @param entityToEventEligibilityVerifier + * - allows to verify if entity is eligible to generate an even. If null no verification is necessary + * @param + * - entity reference type (e.g. {@link NodeRef}, {@link AssociationRef}, {@link ChildAssociationRef}) + * @param + * - event consolidator type - extension of {@link EventConsolidator} */ private > Optional> createEvent( - final REF entityReference, final CON eventConsolidator, final EventInfo eventInfo, - final TriPredicate entityToEventEligibilityVerifier) + final REF entityReference, final CON eventConsolidator, final EventInfo eventInfo, + final TriPredicate entityToEventEligibilityVerifier) { if (eventConsolidator.isTemporaryEntity()) { @@ -719,8 +729,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin if (LOGGER.isTraceEnabled()) { LOGGER.trace("EventFilter - Excluding node: '" + nodeReference + "' of type: '" - + ((nodeType == null) ? "Unknown' " : nodeType.toPrefixString()) - + "' created by: " + user); + + ((nodeType == null) ? "Unknown' " : nodeType.toPrefixString()) + + "' created by: " + user); } return false; } @@ -747,8 +757,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin if (LOGGER.isTraceEnabled()) { LOGGER.trace("EventFilter - Excluding child association: '" + childAssociationReference + "' of type: '" - + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString()) - + "' created by: " + user); + + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString()) + + "' created by: " + user); } return false; } @@ -757,8 +767,8 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin if (LOGGER.isTraceEnabled()) { LOGGER.trace("EventFilter - Excluding primary child association: '" + childAssociationReference + "' of type: '" - + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString()) - + "' created by: " + user); + + ((childAssocType == null) ? "Unknown' " : childAssocType.toPrefixString()) + + "' created by: " + user); } return false; } @@ -804,7 +814,7 @@ public class EventGenerator extends AbstractLifecycleBean implements Initializin { if (peerAssocs == null) { - peerAssocs = new LinkedHashMap<>(29); + peerAssocs = new LinkedHashMap<>(29); } return peerAssocs; } diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java index 8ff7c47a2a..b97ee111a7 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java @@ -37,17 +37,26 @@ public interface EventSender { /** * Accepts a callback function creating an event and sends this event to specified destination. - * @param eventProducer - callback function that creates an event + * + * @param eventProducer + * - callback function that creates an event */ void accept(Callable>> eventProducer); /** - * It's called right after event sender instantiation (see {@link org.alfresco.repo.event2.EventSenderFactoryBean}). - * It might be used to initialize the sender implementation. + * It's called right after event sender instantiation (see {@link org.alfresco.repo.event2.EventSenderFactoryBean}). It might be used to initialize the sender implementation. */ default void initialize() { - //no initialization by default + // no initialization by default + } + + /** + * It's called when the application context is closing, allowing {@link org.alfresco.repo.event2.EventGenerator} to perform cleanup operations. + */ + default void destroy() + { + // no destruction by default } default boolean shouldParticipateInTransaction() From 27962726b4831609bea7eb250b85f3893a5d3688 Mon Sep 17 00:00:00 2001 From: Krystian Dabrowski <98942253+krdabrowski@users.noreply.github.com> Date: Wed, 2 Oct 2024 17:09:36 +0200 Subject: [PATCH 124/148] ACS-8871: Bump Spring from 6.0.19 to 6.1.13 (#2947) * ACS-8871: Bump Spring from 6.0.19 to 6.1.13 --- pom.xml | 2 +- .../repo/web/scripts/content/ContentGet.java | 59 ++++++++++--------- .../web-scripts-application-context.xml | 2 +- .../alfresco/repo/lock/LockServiceImpl.java | 2 +- scripts/ci/docker-compose/docker-compose.yaml | 2 +- 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 766cc4809c..115120b0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 0.0.27 1.9.22.1 - 6.0.19 + 6.1.13 6.3.3 3.5.3 2.17.2 diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java index b929343ac3..3c704cc308 100644 --- a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java +++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java @@ -25,15 +25,24 @@ */ package org.alfresco.repo.web.scripts.content; +import static java.util.Optional.ofNullable; +import static java.util.function.Predicate.not; + import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.WebScriptException; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.web.context.ServletContextAware; + import org.alfresco.model.ContentModel; import org.alfresco.repo.web.scripts.MimeTypeUtil; import org.alfresco.service.cmr.dictionary.DictionaryService; @@ -42,13 +51,6 @@ import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.webscripts.WebScriptException; -import org.springframework.extensions.webscripts.WebScriptRequest; -import org.springframework.extensions.webscripts.WebScriptResponse; -import org.springframework.web.context.ServletContextAware; - /** * Content Retrieval Service @@ -62,7 +64,7 @@ public class ContentGet extends StreamContent implements ServletContextAware // Logger @SuppressWarnings("unused") private static final Log logger = LogFactory.getLog(ContentGet.class); - + // Component dependencies private ServletContext servletContext; private DictionaryService dictionaryService; @@ -72,18 +74,19 @@ public class ContentGet extends StreamContent implements ServletContextAware private List nonAttachContentTypes = Collections.emptyList(); /** - * @param nonAttachContentTypes List + * @param nonAttachContentTypes + * List */ public void setNonAttachContentTypes(List nonAttachContentTypes) { - if (nonAttachContentTypes != null && !nonAttachContentTypes.isEmpty()) - { - this.nonAttachContentTypes = nonAttachContentTypes; - } + this.nonAttachContentTypes = ofNullable(nonAttachContentTypes) + .map(types -> types.stream().filter(not(String::isBlank)).toList()) + .orElse(Collections.emptyList()); } /** - * @param servletContext ServletContext + * @param servletContext + * ServletContext */ public void setServletContext(ServletContext servletContext) { @@ -91,23 +94,26 @@ public class ContentGet extends StreamContent implements ServletContextAware } /** - * @param dictionaryService DictionaryService + * @param dictionaryService + * DictionaryService */ public void setDictionaryService(DictionaryService dictionaryService) { - this.dictionaryService = dictionaryService; + this.dictionaryService = dictionaryService; } /** - * @param namespaceService NamespaceService + * @param namespaceService + * NamespaceService */ public void setNamespaceService(NamespaceService namespaceService) { - this.namespaceService = namespaceService; + this.namespaceService = namespaceService; } - + /** - * @param contentService ContentService + * @param contentService + * ContentService */ public void setContentService(ContentService contentService) { @@ -118,7 +124,7 @@ public class ContentGet extends StreamContent implements ServletContextAware * @see org.springframework.extensions.webscripts.WebScript#execute(WebScriptRequest, WebScriptResponse) */ public void execute(WebScriptRequest req, WebScriptResponse res) - throws IOException + throws IOException { // create map of args String[] names = req.getParameterNames(); @@ -127,10 +133,10 @@ public class ContentGet extends StreamContent implements ServletContextAware { args.put(name, req.getParameter(name)); } - + // create map of template vars Map templateVars = req.getServiceMatch().getTemplateVars(); - + // create object reference from url ObjectReference reference = createObjectReferenceFromUrl(args, templateVars); NodeRef nodeRef = reference.getNodeRef(); @@ -139,7 +145,6 @@ public class ContentGet extends StreamContent implements ServletContextAware throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + reference.toString()); } - // render content QName propertyQName = ContentModel.PROP_CONTENT; String contentPart = templateVars.get("property"); @@ -186,7 +191,7 @@ public class ContentGet extends StreamContent implements ServletContextAware if (attach && rfc5987Supported) { String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME); - + // maintain the original name of the node during the download - do not modify it - see MNT-16510 streamContent(req, res, nodeRef, propertyQName, attach, name, model); } @@ -195,4 +200,4 @@ public class ContentGet extends StreamContent implements ServletContextAware streamContent(req, res, nodeRef, propertyQName, attach, null, model); } } -} \ No newline at end of file +} diff --git a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml index f255f96162..b1630853ec 100644 --- a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml +++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml @@ -250,7 +250,7 @@ - + diff --git a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java index df0d2ea0b9..41b670c545 100644 --- a/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java @@ -997,7 +997,7 @@ public class LockServiceImpl implements LockService, } // Never return a null LockState - Assert.notNull(lockState); + Assert.notNull(lockState, "The lockState should not be null"); return lockState; } diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index bf96f0d391..29604ba4bc 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -68,4 +68,4 @@ services: volumes: - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json ports: - - 8999:8080 \ No newline at end of file + - 8999:8080 From c0ca7cc27f91fea3e2ff7aae0b0712874d7604d7 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:50:16 +0000 Subject: [PATCH 125/148] [maven-release-plugin][skip ci] prepare release 23.4.0.35 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 026dd9c52a..13c38b8975 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9c9abb6f6d..7edcdbd783 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 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 7ca384ab23..7551709c26 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index fbd73cfd1e..dda34b4e5e 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index bbe19a186d..dd21212d8a 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 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 f5e790bacd..7b1fc4b435 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/amps/pom.xml b/amps/pom.xml index d29c208645..89ca9b18b0 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4e69cc2c13..7309661c7b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/core/pom.xml b/core/pom.xml index 49ee075142..04a1063c70 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/data-model/pom.xml b/data-model/pom.xml index edb15b95ba..ed50ea4894 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/mmt/pom.xml b/mmt/pom.xml index b74cae858c..261778e8b5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 842ff8ca67..ba1920ae06 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3cd8db01b4..87d782fcd8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/pom.xml b/packaging/pom.xml index 5716be5475..fa752e7d8e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a31381fe75..35171fcd7e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 995d158696..d1ea150272 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 215b398272..15b8aa0eed 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a56231e9c7..8098822562 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e53a130c54..ab52e0d1a3 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d8b5d8c013..d8195b4b44 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 - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 93a9007bca..777ca6136a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/pom.xml b/pom.xml index 115120b0f4..4077e533e5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.35 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 06e8ebfdc5..9b5435523a 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 diff --git a/repository/pom.xml b/repository/pom.xml index 7d434dfd88..5f3e7fc366 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35-SNAPSHOT + 23.4.0.35 From 42cc7f16c2f818680386e92e567d5345179c82a2 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:50:17 +0000 Subject: [PATCH 126/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 13c38b8975..48d2abdcfb 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7edcdbd783..127ecbab94 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 - 23.4.0.35 + 23.4.0.36-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 7551709c26..e3802722f3 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index dda34b4e5e..2874618d30 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index dd21212d8a..0096b3bea7 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 - 23.4.0.35 + 23.4.0.36-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 7b1fc4b435..53b4b796bd 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 89ca9b18b0..b2dc4ddc38 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 7309661c7b..d0212d981a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 04a1063c70..7623d15f9f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index ed50ea4894..5ff1034bcf 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 261778e8b5..85b4521cf3 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ba1920ae06..04933d71a4 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 87d782fcd8..fe6a02e449 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index fa752e7d8e..7774f27b87 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 35171fcd7e..60f4ca898f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index d1ea150272..4f494fa119 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 15b8aa0eed..6ad17bb68e 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 8098822562..b4dc27889f 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index ab52e0d1a3..3b9192b408 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d8195b4b44..c0514c93c8 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 - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 777ca6136a..9ecf87bcb4 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4077e533e5..7be6fbd351 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.35 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9b5435523a..a269f6f3cc 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 5f3e7fc366..aec7149048 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.35 + 23.4.0.36-SNAPSHOT From a7d31b981103434444248bc75f296c015f0f8133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 08:53:25 +0100 Subject: [PATCH 127/148] Bump org.alfresco:acs-event-model from 0.0.27 to 0.0.33 (#2966) Bumps [org.alfresco:acs-event-model](https://github.com/Alfresco/acs-event-model) from 0.0.27 to 0.0.33. - [Commits](https://github.com/Alfresco/acs-event-model/compare/acs-event-model-0.0.27...acs-event-model-0.0.33) --- updated-dependencies: - dependency-name: org.alfresco:acs-event-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7be6fbd351..7deaa9324f 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 5.1.4 4.1.4 7.0 - 0.0.27 + 0.0.33 1.9.22.1 6.1.13 From 1f558e4c582c2a3ff3b11acddecbb7df44c617ad Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 3 Oct 2024 08:34:10 +0000 Subject: [PATCH 128/148] [maven-release-plugin][skip ci] prepare release 23.4.0.36 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 48d2abdcfb..400c84ec09 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 127ecbab94..ba22f1c766 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 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 e3802722f3..3c35a0f891 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2874618d30..43e5dc5956 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0096b3bea7..38718bec28 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 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 53b4b796bd..6d35462417 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/amps/pom.xml b/amps/pom.xml index b2dc4ddc38..4896eca8ed 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index d0212d981a..2f2ba3edc6 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/core/pom.xml b/core/pom.xml index 7623d15f9f..5abb9b5137 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/data-model/pom.xml b/data-model/pom.xml index 5ff1034bcf..45e56d4bee 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/mmt/pom.xml b/mmt/pom.xml index 85b4521cf3..799f2ef0a1 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 04933d71a4..b55567841b 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index fe6a02e449..00d0511bad 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/pom.xml b/packaging/pom.xml index 7774f27b87..4b83bdb062 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 60f4ca898f..7785dcac74 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 4f494fa119..12078db1a5 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 6ad17bb68e..b7770ae028 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b4dc27889f..59084b547a 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3b9192b408..135aa080cc 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c0514c93c8..4a22fb928e 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 - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9ecf87bcb4..2eac51756e 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/pom.xml b/pom.xml index 7deaa9324f..6831b9038c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.36 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a269f6f3cc..706906271a 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 diff --git a/repository/pom.xml b/repository/pom.xml index aec7149048..c84450968d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36-SNAPSHOT + 23.4.0.36 From 3748482f515c6ff08760eff74572d2f9c2c87bdf Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 3 Oct 2024 08:34:12 +0000 Subject: [PATCH 129/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 400c84ec09..b019cda399 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ba22f1c766..7cf43faafb 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 - 23.4.0.36 + 23.4.0.37-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 3c35a0f891..82b2e511ea 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 43e5dc5956..13b805e73d 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 38718bec28..f17be1d604 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 - 23.4.0.36 + 23.4.0.37-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 6d35462417..cf10b7f3f2 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 4896eca8ed..f840bd07d4 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2f2ba3edc6..47e67138d9 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5abb9b5137..3c93ababf1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 45e56d4bee..17850bec7d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 799f2ef0a1..d1385c2d60 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index b55567841b..185ad1f5eb 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 00d0511bad..a818f6893f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 4b83bdb062..674a85d78b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7785dcac74..e912957fe0 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 12078db1a5..e4a33aadea 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b7770ae028..1a2fe2d8a2 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 59084b547a..71fd41c2df 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 135aa080cc..7bc9e6aad4 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4a22fb928e..3cff5336b1 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 - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2eac51756e..dee38bfc3c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6831b9038c..adb34d8561 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.36 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 706906271a..0232ffb957 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index c84450968d..58b27fe38c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.36 + 23.4.0.37-SNAPSHOT From b2c87aa22dbd394a8565688e46802f3a230118c1 Mon Sep 17 00:00:00 2001 From: mikolajbrzezinski <86791239+mikolajbrzezinski@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:05:59 +0200 Subject: [PATCH 130/148] ACS-8867 Add time-out to "Set up the environment" steps (#2955) * ACS-8867 Add time-out to set up steps --- .github/workflows/ci.yml | 3 +++ .secrets.baseline | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25009c47c3..7a90a7f642 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -266,6 +266,7 @@ jobs: - name: "Set transformers tag" run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV - name: "Set up the environment" + timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' @@ -874,6 +875,7 @@ jobs: echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV" fi - name: "Set up the environment" + timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" if: github.ref_name == 'master' @@ -975,6 +977,7 @@ jobs: bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - name: "Set up the environment" + timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | ${{ env.TAS_SCRIPTS }}/start-compose.sh ${{ env.TAS_ENVIRONMENT }}/docker-compose-minimal+transforms.yml ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" diff --git a/.secrets.baseline b/.secrets.baseline index 7375162a97..4f2c57dff6 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -133,21 +133,21 @@ "filename": ".github/workflows/ci.yml", "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572", "is_verified": false, - "line_number": 292 + "line_number": 293 }, { "type": "Secret Keyword", "filename": ".github/workflows/ci.yml", "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966", "is_verified": false, - "line_number": 367 + "line_number": 368 }, { "type": "Secret Keyword", "filename": ".github/workflows/ci.yml", "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39", "is_verified": false, - "line_number": 900 + "line_number": 902 } ], ".github/workflows/master_release.yml": [ @@ -1888,5 +1888,5 @@ } ] }, - "generated_at": "2024-09-25T10:33:16Z" + "generated_at": "2024-10-02T10:18:47Z" } From 8a1d8dba94204e388d61088d5a521f0aa9764fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Thu, 3 Oct 2024 12:53:17 +0200 Subject: [PATCH 131/148] ACS-8870 Propagate latest ATS/AIS (#2967) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index adb34d8561..7b5d4862c7 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ 7.0.1 5.23.0 5.23.0 - 5.1.4 - 4.1.4 + 5.1.5-A1 + 4.1.5-A1 7.0 0.0.33 From b8c9605ae669c03f6602623da4af0c1348271bb6 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:33:18 +0000 Subject: [PATCH 132/148] [maven-release-plugin][skip ci] prepare release 23.4.0.37 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index b019cda399..4fb79975c4 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7cf43faafb..d217114979 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 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 82b2e511ea..fbc7a15c9d 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 13b805e73d..08a9a5e6c3 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f17be1d604..88766aa9e9 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 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 cf10b7f3f2..054f2fcabe 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/amps/pom.xml b/amps/pom.xml index f840bd07d4..17db3914f7 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 47e67138d9..90cc743f6f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/core/pom.xml b/core/pom.xml index 3c93ababf1..2699830af4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/data-model/pom.xml b/data-model/pom.xml index 17850bec7d..6bff68ca6b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/mmt/pom.xml b/mmt/pom.xml index d1385c2d60..da7e40f59c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 185ad1f5eb..56c952cea3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a818f6893f..a9758c7474 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/pom.xml b/packaging/pom.xml index 674a85d78b..4bf9d0e1cc 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index e912957fe0..a5e9df9dce 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index e4a33aadea..a1aeeea35e 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1a2fe2d8a2..fad3a1b8ec 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 71fd41c2df..61ab11a9e8 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7bc9e6aad4..b58c07c39f 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 3cff5336b1..67d5818555 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 - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index dee38bfc3c..5f8e2e9d3f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/pom.xml b/pom.xml index 7b5d4862c7..4abb0aab0d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.37 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 0232ffb957..4e8d25947a 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 diff --git a/repository/pom.xml b/repository/pom.xml index 58b27fe38c..fdb4f5c60f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37-SNAPSHOT + 23.4.0.37 From 187e9138da8be9d65f1749f7104618b7334fd64d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:33:20 +0000 Subject: [PATCH 133/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 4fb79975c4..30937cf20d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d217114979..b463170da3 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 - 23.4.0.37 + 23.4.0.38-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 fbc7a15c9d..9cf6e40bc3 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 08a9a5e6c3..de692e60ac 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 88766aa9e9..65c92f4bb2 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 - 23.4.0.37 + 23.4.0.38-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 054f2fcabe..bf885ba581 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 17db3914f7..077b32aa4c 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 90cc743f6f..a2d5fa17e8 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 2699830af4..0b4d055802 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 6bff68ca6b..8a55a6ae5e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index da7e40f59c..d7d7250f43 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 56c952cea3..5bf5ba3495 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a9758c7474..56115abb4e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 4bf9d0e1cc..cfe9142840 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a5e9df9dce..9fefe1dfef 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a1aeeea35e..6e1ffa07fc 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index fad3a1b8ec..c7982315ad 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 61ab11a9e8..7325e97936 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b58c07c39f..fcfa2ebabd 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 67d5818555..4fc8d86fc6 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 - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 5f8e2e9d3f..5e60f188ad 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4abb0aab0d..6f22ad661d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.37 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4e8d25947a..060b0ccf90 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index fdb4f5c60f..34f0285897 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.37 + 23.4.0.38-SNAPSHOT From 7a937f1e511667e533c1334e3e4c250a86da61f3 Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:10:40 +0530 Subject: [PATCH 134/148] Update surf-webscript version to 9.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f22ad661d..850669ed1a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.17.2 4.0.5 1.0.0-jakarta-1 - 9.3 + 9.4 1.78.1 5.14.1 3.26.3 From 67d880752971f79c4ada554057d575b9d2ad2f16 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 06:24:15 +0000 Subject: [PATCH 135/148] [maven-release-plugin][skip ci] prepare release 23.4.0.38 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 30937cf20d..02f89eef85 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b463170da3..33adaa4eec 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 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 9cf6e40bc3..1da92ec8e9 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index de692e60ac..a554a9ec01 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 65c92f4bb2..9fe2c97188 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 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 bf885ba581..cf127d62cf 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/amps/pom.xml b/amps/pom.xml index 077b32aa4c..fa2ef6d6bc 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index a2d5fa17e8..227a33e100 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/core/pom.xml b/core/pom.xml index 0b4d055802..933dfdcfc4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/data-model/pom.xml b/data-model/pom.xml index 8a55a6ae5e..a44be8cf83 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/mmt/pom.xml b/mmt/pom.xml index d7d7250f43..f749a3f84d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 5bf5ba3495..a3e9b6f79e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 56115abb4e..ec727b29ab 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/pom.xml b/packaging/pom.xml index cfe9142840..029cdbcfb4 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9fefe1dfef..af2dacec7d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6e1ffa07fc..1f2a0c5517 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c7982315ad..6eb32399a4 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7325e97936..1217c9667c 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index fcfa2ebabd..e6f977274a 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4fc8d86fc6..2973786307 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 - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 5e60f188ad..6a74ebd4d0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/pom.xml b/pom.xml index 850669ed1a..776f757eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.38 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 060b0ccf90..268b039109 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 diff --git a/repository/pom.xml b/repository/pom.xml index 34f0285897..28290f7c92 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38-SNAPSHOT + 23.4.0.38 From 60a31112eadbdfce8708fa0bc1f7102f839e616b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 06:24:17 +0000 Subject: [PATCH 136/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 02f89eef85..677497d07a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 33adaa4eec..8d211a8ce7 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 - 23.4.0.38 + 23.4.0.39-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 1da92ec8e9..1cc4804fc5 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a554a9ec01..f219eaf518 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9fe2c97188..daeb6be91c 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 - 23.4.0.38 + 23.4.0.39-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 cf127d62cf..3edc103bfb 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index fa2ef6d6bc..f48662bc16 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 227a33e100..581d8b4923 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 933dfdcfc4..39265d200a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a44be8cf83..584d99fad3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index f749a3f84d..3ffeb60c5a 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a3e9b6f79e..a6934de298 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ec727b29ab..70af1195c0 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 029cdbcfb4..dc1ac09e36 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index af2dacec7d..4bea682c94 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 1f2a0c5517..2e45715165 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 6eb32399a4..5757844e47 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1217c9667c..f5c2551491 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e6f977274a..16d2c2349f 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 2973786307..577ce6594f 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 - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6a74ebd4d0..fe6d873766 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/pom.xml b/pom.xml index 776f757eaf..6e91340980 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.38 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 268b039109..aa21711177 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 28290f7c92..6c0ea69696 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.38 + 23.4.0.39-SNAPSHOT From 674fa8d7e099293257eb2109e88b0111bdbba0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Fri, 4 Oct 2024 14:31:56 +0200 Subject: [PATCH 137/148] ACS-8843 Investigate Java 21 compatibility (#2960) * [ACS-8843] Delegate creation of proxy to one place Co-authored-by: Kacper Magdziarz --- .../PermissionCheckCollection.java | 256 ++++++++-------- .../PermissionCheckedCollection.java | 287 +++++++++--------- .../permissions/ProxyFactoryUtils.java | 59 ++++ 3 files changed, 327 insertions(+), 275 deletions(-) create mode 100644 repository/src/main/java/org/alfresco/repo/security/permissions/ProxyFactoryUtils.java diff --git a/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java index 24b300b8e2..49f2fd840f 100644 --- a/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java +++ b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckCollection.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -23,133 +23,127 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.repo.security.permissions; - -import java.util.Collection; - -import org.springframework.aop.IntroductionAdvisor; -import org.springframework.aop.framework.ProxyFactory; -import org.springframework.aop.support.DefaultIntroductionAdvisor; -import org.springframework.aop.support.DelegatingIntroductionInterceptor; - -/** - * Interface for collection-based results that describe permission filtering - * behaviour around cut-off limits. - * - * @author Derek Hulley - * @since 4.0 - */ -public interface PermissionCheckCollection -{ - /** - * Get the desired number of results. Permission checks can stop once the number of - * return objects reaches this number. - * - * @return the number of results desired - */ - int getTargetResultCount(); - - /** - * Get the maximum time for permission checks to execute before cutting the results off. - *
Zero: Ignore this value. - * - * @return the time allowed for permission checks before cutoff - */ - long getCutOffAfterTimeMs(); - - /** - * Get the maximum number of permission checks to perform before cutting the results off - * - * @return the maximum number of permission checks before cutoff - */ - int getCutOffAfterCount(); - - /** - * Helper 'introduction' to allow simple addition of the {@link PermissionCheckCollection} interface to - * existing collections. - * - * @param the type of the Collection in use - * - * @author Derek Hulley - * @since 4.0 - */ - @SuppressWarnings("serial") - public static class PermissionCheckCollectionMixin extends DelegatingIntroductionInterceptor implements PermissionCheckCollection - { - private final int targetResultCount; - private final long cutOffAfterTimeMs; - private final int cutOffAfterCount; - - private PermissionCheckCollectionMixin(int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount) - { - super(); - this.targetResultCount = targetResultCount; - this.cutOffAfterTimeMs = cutOffAfterTimeMs; - this.cutOffAfterCount = cutOffAfterCount; - if (cutOffAfterTimeMs <= 0) - { - cutOffAfterTimeMs = 0; - } - if (cutOffAfterCount <= 0) - { - cutOffAfterCount = 0; - } - } - - @Override - public int getTargetResultCount() - { - return targetResultCount; - } - - @Override - public long getCutOffAfterTimeMs() - { - return cutOffAfterTimeMs; - } - - @Override - public int getCutOffAfterCount() - { - return cutOffAfterCount; - } - - /** - * Helper method to create a {@link PermissionCheckCollection} from an existing Collection - * - * @param the type of the Collection - * @param collection the Collection to proxy - * @param targetResultCount the desired number of results or default to the collection size - * @param cutOffAfterTimeMs the number of milliseconds to wait before cut-off or zero to use the system default - * time-based cut-off. - * @param cutOffAfterCount the number of permission checks to process before cut-off or zero to use the system default - * count-based cut-off. - * @return a Collection of the same type but including the - * {@link PermissionCheckCollection} interface - */ - @SuppressWarnings("unchecked") - public static final Collection create( - Collection collection, - int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount) - { - if (targetResultCount <= 0) - { - targetResultCount = collection.size(); - } - // Create the mixin - DelegatingIntroductionInterceptor mixin = new PermissionCheckCollectionMixin( - targetResultCount, - cutOffAfterTimeMs, - cutOffAfterCount); - // Create the advisor - IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckCollection.class); - // Proxy - ProxyFactory pf = new ProxyFactory(collection); - pf.addAdvisor(advisor); - Object proxiedObject = pf.getProxy(); - - // Done - return (Collection) proxiedObject; - } - } -} +package org.alfresco.repo.security.permissions; + +import java.util.Collection; + +import org.springframework.aop.IntroductionAdvisor; +import org.springframework.aop.support.DefaultIntroductionAdvisor; +import org.springframework.aop.support.DelegatingIntroductionInterceptor; + +/** + * Interface for collection-based results that describe permission filtering behaviour around cut-off limits. + * + * @author Derek Hulley + * @since 4.0 + */ +public interface PermissionCheckCollection +{ + /** + * Get the desired number of results. Permission checks can stop once the number of return objects reaches this number. + * + * @return the number of results desired + */ + int getTargetResultCount(); + + /** + * Get the maximum time for permission checks to execute before cutting the results off.
+ * Zero: Ignore this value. + * + * @return the time allowed for permission checks before cutoff + */ + long getCutOffAfterTimeMs(); + + /** + * Get the maximum number of permission checks to perform before cutting the results off + * + * @return the maximum number of permission checks before cutoff + */ + int getCutOffAfterCount(); + + /** + * Helper 'introduction' to allow simple addition of the {@link PermissionCheckCollection} interface to existing collections. + * + * @param + * the type of the Collection in use + * + * @author Derek Hulley + * @since 4.0 + */ + @SuppressWarnings("serial") + class PermissionCheckCollectionMixin extends DelegatingIntroductionInterceptor implements PermissionCheckCollection + { + private final int targetResultCount; + private final long cutOffAfterTimeMs; + private final int cutOffAfterCount; + + private PermissionCheckCollectionMixin(int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount) + { + super(); + this.targetResultCount = targetResultCount; + this.cutOffAfterTimeMs = cutOffAfterTimeMs; + this.cutOffAfterCount = cutOffAfterCount; + if (cutOffAfterTimeMs <= 0) + { + cutOffAfterTimeMs = 0; + } + if (cutOffAfterCount <= 0) + { + cutOffAfterCount = 0; + } + } + + @Override + public int getTargetResultCount() + { + return targetResultCount; + } + + @Override + public long getCutOffAfterTimeMs() + { + return cutOffAfterTimeMs; + } + + @Override + public int getCutOffAfterCount() + { + return cutOffAfterCount; + } + + /** + * Helper method to create a {@link PermissionCheckCollection} from an existing Collection + * + * @param + * the type of the Collection + * @param collection + * the Collection to proxy + * @param targetResultCount + * the desired number of results or default to the collection size + * @param cutOffAfterTimeMs + * the number of milliseconds to wait before cut-off or zero to use the system default time-based cut-off. + * @param cutOffAfterCount + * the number of permission checks to process before cut-off or zero to use the system default count-based cut-off. + * @return a Collection of the same type but including the {@link PermissionCheckCollection} interface + */ + @SuppressWarnings("unchecked") + public static Collection create( + Collection collection, + int targetResultCount, long cutOffAfterTimeMs, int cutOffAfterCount) + { + if (targetResultCount <= 0) + { + targetResultCount = collection.size(); + } + // Create the mixin + DelegatingIntroductionInterceptor mixin = new PermissionCheckCollectionMixin<>( + targetResultCount, + cutOffAfterTimeMs, + cutOffAfterCount); + // Create the advisor + IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckCollection.class); + // Create Proxy + return (Collection) ProxyFactoryUtils.createProxy(collection, advisor); + } + } +} diff --git a/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java index 305cb9cd05..b855219951 100644 --- a/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java +++ b/repository/src/main/java/org/alfresco/repo/security/permissions/PermissionCheckedCollection.java @@ -2,161 +2,160 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 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 + * 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 . * #L% */ -package org.alfresco.repo.security.permissions; - -import java.util.Collection; - -import org.springframework.aop.IntroductionAdvisor; -import org.springframework.aop.framework.ProxyFactory; -import org.springframework.aop.support.DefaultIntroductionAdvisor; -import org.springframework.aop.support.DelegatingIntroductionInterceptor; - -/** - * Interface for collection-based results that carry extra information - * about the state of permission cut-offs. - * - * @author Derek Hulley - * @since 4.0 - */ -public interface PermissionCheckedCollection -{ - /** - * Check if the results have been truncated by permission check limits. - * - * @return true - if the results (usually a collection) have been - * cut off by permission check limits - */ - boolean isCutOff(); - - /** - * Get the number of objects in the original (unfiltered) collection that did - * not have any permission checks. - * - * @return number of entries from the original collection that were not checked - */ - int sizeUnchecked(); - - /** - * Get the number of objects in the original (unfiltered) collection. - * - * @return number of entries in the original, pre-checked collection - */ - int sizeOriginal(); - - /** - * Helper 'introduction' to allow simple addition of the {@link PermissionCheckedCollection} interface to - * existing collections. - * - * @param the type of the Collection in use - * - * @author Derek Hulley - * @since 4.0 - */ - @SuppressWarnings("serial") - public static class PermissionCheckedCollectionMixin extends DelegatingIntroductionInterceptor implements PermissionCheckedCollection - { - private final boolean isCutOff; - private final int sizeUnchecked; - private final int sizeOriginal; - private PermissionCheckedCollectionMixin(boolean isCutOff, int sizeUnchecked, int sizeOriginal) - { - super(); - this.isCutOff = isCutOff; - this.sizeUnchecked = sizeUnchecked; - this.sizeOriginal = sizeOriginal; - } - @Override - public boolean isCutOff() - { - return isCutOff; - } - @Override - public int sizeUnchecked() - { - return sizeUnchecked; - } - @Override - public int sizeOriginal() - { - return sizeOriginal; - } - /** - * Helper method to create a {@link PermissionCheckedCollection} from an existing Collection - * by applying the same values as present on a potentially permission-checked source. If the - * existing checked source is NOT permission-checked, then the collection will not be - * decorated. - * - * @param the type of the Collection - * @param collection the Collection to proxy - * @param checkedSource a collection that might implement {@link PermissionCheckedCollection} - * @return a Collection of the same type but including the - * {@link PermissionCheckedCollection} interface - */ - public static final Collection create( - Collection collection, Collection checkedSource) - { - if (checkedSource instanceof PermissionCheckedCollection) - { - PermissionCheckedCollection source = (PermissionCheckedCollection) checkedSource; - return create(collection, source.isCutOff(), source.sizeUnchecked(), source.sizeOriginal()); - } - else - { - return collection; - } - } - /** - * Helper method to create a {@link PermissionCheckedCollection} from an existing Collection - * - * @param the type of the Collection - * @param collection the Collection to proxy - * @param isCutOff true if permission checking was cut off before completion - * @param sizeUnchecked number of entries from the original collection that were not checked - * @param sizeOriginal number of entries in the original, pre-checked collection - * @return a Collection of the same type but including the - * {@link PermissionCheckedCollection} interface - */ - @SuppressWarnings("unchecked") - public static final Collection create( - Collection collection, - boolean isCutOff, int sizeUnchecked, int sizeOriginal) - { - // Create the mixin - DelegatingIntroductionInterceptor mixin = new PermissionCheckedCollectionMixin( - isCutOff, - sizeUnchecked, - sizeOriginal - ); - // Create the advisor - IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckedCollection.class); - // Proxy - ProxyFactory pf = new ProxyFactory(collection); - pf.addAdvisor(advisor); - Object proxiedObject = pf.getProxy(); - - // Done - return (Collection) proxiedObject; - } - } -} +package org.alfresco.repo.security.permissions; + +import java.util.Collection; + +import org.springframework.aop.IntroductionAdvisor; +import org.springframework.aop.support.DefaultIntroductionAdvisor; +import org.springframework.aop.support.DelegatingIntroductionInterceptor; + +/** + * Interface for collection-based results that carry extra information about the state of permission cut-offs. + * + * @author Derek Hulley + * @since 4.0 + */ +public interface PermissionCheckedCollection +{ + /** + * Check if the results have been truncated by permission check limits. + * + * @return true - if the results (usually a collection) have been cut off by permission check limits + */ + boolean isCutOff(); + + /** + * Get the number of objects in the original (unfiltered) collection that did not have any permission checks. + * + * @return number of entries from the original collection that were not checked + */ + int sizeUnchecked(); + + /** + * Get the number of objects in the original (unfiltered) collection. + * + * @return number of entries in the original, pre-checked collection + */ + int sizeOriginal(); + + /** + * Helper 'introduction' to allow simple addition of the {@link PermissionCheckedCollection} interface to existing collections. + * + * @param + * the type of the Collection in use + * + * @author Derek Hulley + * @since 4.0 + */ + @SuppressWarnings("serial") + class PermissionCheckedCollectionMixin extends DelegatingIntroductionInterceptor implements PermissionCheckedCollection + { + private final boolean isCutOff; + private final int sizeUnchecked; + private final int sizeOriginal; + + private PermissionCheckedCollectionMixin(boolean isCutOff, int sizeUnchecked, int sizeOriginal) + { + super(); + this.isCutOff = isCutOff; + this.sizeUnchecked = sizeUnchecked; + this.sizeOriginal = sizeOriginal; + } + + @Override + public boolean isCutOff() + { + return isCutOff; + } + + @Override + public int sizeUnchecked() + { + return sizeUnchecked; + } + + @Override + public int sizeOriginal() + { + return sizeOriginal; + } + + /** + * Helper method to create a {@link PermissionCheckedCollection} from an existing Collection by applying the same values as present on a potentially permission-checked source. If the existing checked source is NOT permission-checked, then the collection will not be decorated. + * + * @param + * the type of the Collection + * @param collection + * the Collection to proxy + * @param checkedSource + * a collection that might implement {@link PermissionCheckedCollection} + * @return a Collection of the same type but including the {@link PermissionCheckedCollection} interface + */ + public static Collection create( + Collection collection, Collection checkedSource) + { + if (checkedSource instanceof PermissionCheckedCollection) + { + PermissionCheckedCollection source = (PermissionCheckedCollection) checkedSource; + return create(collection, source.isCutOff(), source.sizeUnchecked(), source.sizeOriginal()); + } + else + { + return collection; + } + } + + /** + * Helper method to create a {@link PermissionCheckedCollection} from an existing Collection + * + * @param + * the type of the Collection + * @param collection + * the Collection to proxy + * @param isCutOff + * true if permission checking was cut off before completion + * @param sizeUnchecked + * number of entries from the original collection that were not checked + * @param sizeOriginal + * number of entries in the original, pre-checked collection + * @return a Collection of the same type but including the {@link PermissionCheckedCollection} interface + */ + @SuppressWarnings("unchecked") + public static Collection create( + Collection collection, + boolean isCutOff, int sizeUnchecked, int sizeOriginal) + { + // Create the mixin + DelegatingIntroductionInterceptor mixin = new PermissionCheckedCollectionMixin<>( + isCutOff, + sizeUnchecked, + sizeOriginal); + // Create the advisor + IntroductionAdvisor advisor = new DefaultIntroductionAdvisor(mixin, PermissionCheckedCollection.class); + // Create Proxy + return (Collection) ProxyFactoryUtils.createProxy(collection, advisor); + } + } +} diff --git a/repository/src/main/java/org/alfresco/repo/security/permissions/ProxyFactoryUtils.java b/repository/src/main/java/org/alfresco/repo/security/permissions/ProxyFactoryUtils.java new file mode 100644 index 0000000000..88333e79b4 --- /dev/null +++ b/repository/src/main/java/org/alfresco/repo/security/permissions/ProxyFactoryUtils.java @@ -0,0 +1,59 @@ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2024 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 . + * #L% + */ +package org.alfresco.repo.security.permissions; + +import java.util.Collection; +import java.util.Deque; +import java.util.List; + +import org.springframework.aop.IntroductionAdvisor; +import org.springframework.aop.framework.ProxyFactory; + +class ProxyFactoryUtils +{ + private ProxyFactoryUtils() + {} + + /** + * Delegate creation of {@link ProxyFactory} and proxy to have control over it in one place. + * + * @param collection + * given collection for ProxyFactory. + * @param advisor + * given advisor for ProxyFactory. + * @return the proxy object. + */ + protected static Object createProxy(Collection collection, IntroductionAdvisor advisor) + { + ProxyFactory pf = new ProxyFactory(collection); + pf.addAdvisor(advisor); + if (pf.isInterfaceProxied(List.class) && pf.isInterfaceProxied(Deque.class)) + { + pf.removeInterface(Deque.class); + } + return pf.getProxy(); + } +} From ea63cf76e538208b765d4909a60ee53020bd6957 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:13:39 +0000 Subject: [PATCH 138/148] [maven-release-plugin][skip ci] prepare release 23.4.0.39 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 677497d07a..e702a0f671 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 8d211a8ce7..9bb735c19b 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 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 1cc4804fc5..291a44d47b 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index f219eaf518..2577a5360e 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index daeb6be91c..3ee0576e94 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 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 3edc103bfb..c20dc46a7c 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/amps/pom.xml b/amps/pom.xml index f48662bc16..fb275ba337 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 581d8b4923..303bbc783e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/core/pom.xml b/core/pom.xml index 39265d200a..1b713029f0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/data-model/pom.xml b/data-model/pom.xml index 584d99fad3..5faff3dc24 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/mmt/pom.xml b/mmt/pom.xml index 3ffeb60c5a..bb0ded2d2e 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a6934de298..60920ea176 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 70af1195c0..ea568d73d1 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/pom.xml b/packaging/pom.xml index dc1ac09e36..2782281fb9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4bea682c94..3960a4e0ef 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 2e45715165..e17d7941a1 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5757844e47..616ee151b4 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f5c2551491..043333cb46 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 16d2c2349f..084cf794b0 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 577ce6594f..7892fb0545 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 - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index fe6d873766..10f0260d05 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/pom.xml b/pom.xml index 6e91340980..b2319c42ad 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.39 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index aa21711177..b64d43d80a 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 diff --git a/repository/pom.xml b/repository/pom.xml index 6c0ea69696..0c0ee0a3ac 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39-SNAPSHOT + 23.4.0.39 From 1350e68c29edbe1259fc6607b7dceebc67ed5246 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:13:41 +0000 Subject: [PATCH 139/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index e702a0f671..6b93378673 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9bb735c19b..260e1f364a 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 - 23.4.0.39 + 23.4.0.40-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 291a44d47b..bbd7a092ad 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2577a5360e..a8030bffca 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 3ee0576e94..64b4ef7e05 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 - 23.4.0.39 + 23.4.0.40-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 c20dc46a7c..ac5c7ea64d 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index fb275ba337..9df58436d2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 303bbc783e..717a92f804 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 1b713029f0..8a96e3fbf9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 5faff3dc24..478a60e550 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index bb0ded2d2e..709696e121 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 60920ea176..1c21132d96 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ea568d73d1..03b8724861 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 2782281fb9..f0f4705889 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 3960a4e0ef..0f24f46d49 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index e17d7941a1..255e83f8ef 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 616ee151b4..6ed89e8d8e 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 043333cb46..38f015ec8e 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 084cf794b0..875a0fd4a6 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7892fb0545..a8d40417ce 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 - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 10f0260d05..116a0d8dbf 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/pom.xml b/pom.xml index b2319c42ad..bd0050244c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.39 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b64d43d80a..15b0179220 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 0c0ee0a3ac..78cdacc0c1 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.39 + 23.4.0.40-SNAPSHOT From 7668849a59857580e72428f124cf3c2e6bbeb144 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 4 Oct 2024 15:21:53 +0100 Subject: [PATCH 140/148] MNT-24637 Pre-commit formatting. --- .../rest/favorites/GetFavoritesTests.java | 203 ++-- .../rest/api/impl/FavouritesImpl.java | 919 +++++++++--------- .../rest/api/model/DocumentTarget.java | 80 +- .../alfresco/rest/api/model/Favourite.java | 208 ++-- .../org/alfresco/AppContext04TestSuite.java | 93 +- 5 files changed, 752 insertions(+), 751 deletions(-) diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java index 93727c7f9a..8c1ff59d9d 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java @@ -2,6 +2,11 @@ package org.alfresco.rest.favorites; import java.util.List; +import org.hamcrest.Matchers; +import org.springframework.http.HttpStatus; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import org.alfresco.dataprep.CMISUtil.DocumentType; import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestErrorModel; @@ -20,10 +25,6 @@ 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; -import org.hamcrest.Matchers; -import org.springframework.http.HttpStatus; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; public class GetFavoritesTests extends RestTest { @@ -56,7 +57,7 @@ public class GetFavoritesTests extends RestTest firstSiteUsers = dataUser.addUsersWithRolesToSite(firstSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor); secondSiteUsers = dataUser.addUsersWithRolesToSite(secondSiteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, - UserRole.SiteContributor); + UserRole.SiteContributor); restClient.authenticateUser(userModel); restClient.withCoreAPI().usingUser(userModel).addSiteToFavorites(firstSiteModel); @@ -64,9 +65,9 @@ public class GetFavoritesTests extends RestTest restClient.withCoreAPI().usingUser(userModel).addSiteToFavorites(thirdSiteModel); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.SANITY, description = "Verify Manager user gets favorites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY}) public void managerIsAbleToRetrieveFavorites() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager)); @@ -79,10 +80,10 @@ public class GetFavoritesTests extends RestTest .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.SANITY, description = "Verify user gets status code 401 if authentication call fails") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY }) -// @Bug(id = "MNT-16904", description = "It fails only on environment with tenants") + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY}) + // @Bug(id = "MNT-16904", description = "It fails only on environment with tenants") public void userIsNotAbleToRetrieveFavoritesIfAuthenticationFails() { UserModel siteManager = firstSiteUsers.getOneUserWithRole(UserRole.SiteManager); @@ -91,44 +92,44 @@ public class GetFavoritesTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Admin user gets favorites sites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void adminIsAbleToRetrieveFavoritesSites() { restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(firstSiteModel); restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(secondSiteModel); - + userFavorites = restClient.withCoreAPI() .usingAuthUser().where().targetSiteExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) - .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); + .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Admin user gets favorites folders with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void adminIsAbleToRetrieveFavoritesFolders() { restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(firstFolderModel); restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(secondFolderModel); - + userFavorites = restClient.withCoreAPI() .usingAuthUser().where().targetFolderExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); userFavorites.assertThat().entriesListContains("targetGuid", firstFolderModel.getNodeRef()) - .and().entriesListContains("targetGuid", secondFolderModel.getNodeRef()); + .and().entriesListContains("targetGuid", secondFolderModel.getNodeRef()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Admin user gets favorites files with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void adminIsAbleToRetrieveFavoritesFiles() { restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFileToFavorites(firstFileModel); restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(secondFileModel); - + userFavorites = restClient.withCoreAPI() .usingAuthUser().where().targetFileExist().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -136,87 +137,87 @@ public class GetFavoritesTests extends RestTest .and().entriesListContains("targetGuid", secondFileModel.getNodeRefWithoutVersion()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Collaborator user gets favorites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void collaboratorIsAbleToRetrieveFavorites() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)) - .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); + .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - + userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) - .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); + .and().entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Contributor user gets favorites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void contributorIsAbleToRetrieveFavorites() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteContributor)) - .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); + .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - + userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and() - .entriesListContains("targetGuid", secondSiteModel.getGuid()); + .entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify Consumer user gets favorites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void consumerIsAbleToRetrieveFavorites() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)) - .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); + .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel); restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(secondSiteModel); - + userFavorites = restClient.withCoreAPI().usingAuthUser().getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()) - .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid()); + .assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify user doesn't have permission to get favorites of another user with Rest API and status code is 404") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsNotAbleToRetrieveFavoritesOfAnotherUser() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)) - .withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).getFavorites(); + .withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify user doesn't have permission to get favorites of admin user with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsNotAbleToRetrieveFavoritesOfAdminUser() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)).withCoreAPI() - .usingUser(adminUserModel).getFavorites(); + .usingUser(adminUserModel).getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) - .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername())); + .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, adminUserModel.getUsername())); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify admin user doesn't have permission to get favorites of another user with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser() { restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)) - .getFavorites(); + .getFavorites(); restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) - .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); + .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator).getUsername())); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites sites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveOnlyFavoritesSites() { restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager)); @@ -232,9 +233,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites files with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveOnlyFavoritesFiles() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)); @@ -250,9 +251,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites folders with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveOnlyFavoritesFolders() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)); @@ -268,9 +269,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstFileModel.getNodeRefWithoutVersion()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites files or folders with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveFavoritesFilesOrFolders() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)); @@ -289,9 +290,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites files or sites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveFavoritesFilesOrSites() { restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager)); @@ -310,9 +311,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstFolderModel.getNodeRef()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets only favorites folders or sites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveFavoritesFoldersOrSites() { restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager)); @@ -331,9 +332,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", firstFileModel.getNodeRefWithoutVersion()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets all favorites with Rest API and status code is 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToRetrieveAllFavorites() { restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)); @@ -362,9 +363,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", secondFileModel.getNodeRefWithoutVersion()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify request for a user with no favorites returns status 200") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userHasNoFavorites() { restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteContributor)); @@ -374,9 +375,9 @@ public class GetFavoritesTests extends RestTest userFavorites.assertThat().entriesListIsEmpty().and().paginationField("totalItems").is("0"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify request using invalid where parameter returns status 400") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void getFavoritesUsingInvalidWhereParameter() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)); @@ -390,9 +391,9 @@ public class GetFavoritesTests extends RestTest .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query")); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify User gets correct favorites after deleting a favorite") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void checkFavoriteFolderIsRemoved() { restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager)); @@ -408,9 +409,9 @@ public class GetFavoritesTests extends RestTest .and().paginationField("totalItems").is("2"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites specifying -me- string in place of for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesWhenUsingMeAsUsername() { userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getFavorites(); @@ -418,9 +419,9 @@ public class GetFavoritesTests extends RestTest userFavorites.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and().entriesListContains("targetGuid", secondSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites using empty for where parameter for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesWhenUsingEmptyWhereParameter() { userFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().where().getFavorites(); @@ -428,27 +429,27 @@ public class GetFavoritesTests extends RestTest .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query")); } - @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid maxItems parameter status code returned is 400.") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void checkInvalidMaxItemsStatusCode() { restClient.authenticateUser(adminUserModel).withParams("maxItems=AB").withCoreAPI().usingUser(adminUserModel).getFavorites(); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter"); } - @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify that for invalid skipCount parameter status code returned is 400.") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void checkInvalidSkipCountStatusCode() { restClient.authenticateUser(adminUserModel).withParams("skipCount=AB").withCoreAPI().usingUser(adminUserModel).getFavorites(); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites when using invalid network id for non-tenant user") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void getFavoritesWhenNetworkIdIsInvalid() { UserModel networkUserModel = dataUser.createRandomTestUser(); @@ -457,9 +458,9 @@ public class GetFavoritesTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, networkUserModel.getUsername())); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites using AND instead of OR in where parameter for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsNotAbleToGetFavoritesWhenUsingANDInWhereParameter() { userFavorites = restClient.withCoreAPI().usingAuthUser().where().targetFolderExist().invalidWhereParameter("AND").targetFileExist().getFavorites(); @@ -467,9 +468,9 @@ public class GetFavoritesTests extends RestTest .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query")); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites using wrong name instead of EXISTS in where parameter for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsNotAbleToGetFavoritesWhenUsingWrongWhereParameter() { userFavorites = restClient.withCoreAPI().usingAuthUser().where().invalidWhereParameter("EXIST((target/site))").targetFileExist().getFavorites(); @@ -477,9 +478,9 @@ public class GetFavoritesTests extends RestTest .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query")); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites except the first one for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesExceptTheFirstOne() { userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=1").withCoreAPI().usingUser(userModel).getFavorites(); @@ -490,9 +491,9 @@ public class GetFavoritesTests extends RestTest .and().entriesListDoesNotContain("targetGuid", thirdSiteModel.getGuid()); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get first two favorites sites") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFirstTwoFavorites() { userFavorites = restClient.authenticateUser(userModel).withParams("maxItems=2").withCoreAPI().usingUser(userModel).getFavorites(); @@ -506,9 +507,9 @@ public class GetFavoritesTests extends RestTest .and().field("count").is("2"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify get favorites sites when using empty values for skipCount and maxItems") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesWhenSkipCountAndMaxItemsAreEmpty() { restClient.authenticateUser(userModel).withParams("skipCount= ").withCoreAPI().usingUser(userModel).getFavorites(); @@ -518,9 +519,9 @@ public class GetFavoritesTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary(String.format(RestErrorModel.INVALID_MAXITEMS, " ")); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify the get favorites request for a high value for skipCount parameter") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesWithHighSkipCount() { userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=999999999").withCoreAPI().usingUser(userModel).getFavorites(); @@ -529,9 +530,9 @@ public class GetFavoritesTests extends RestTest userFavorites.assertThat().entriesListIsEmpty().assertThat().paginationField("skipCount").is("999999999"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify the get favorites request with properties parameter applied") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) public void userIsAbleToGetFavoritesWithPropertiesParamApplied() { userFavorites = restClient.authenticateUser(userModel).withParams("properties=targetGuid").withCoreAPI().usingUser(userModel).getFavorites(); @@ -541,8 +542,8 @@ public class GetFavoritesTests extends RestTest restPersonFavoritesModel.assertThat().field("targetGuid").is(thirdSiteModel.getGuid()).and().field("createdAt").isNull(); } - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify entry details for get favorites response with Rest API") + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify entry details for get favorites response with Rest API") public void checkResponseSchemaForGetFavorites() { userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().getFavorites(); @@ -564,8 +565,7 @@ public class GetFavoritesTests extends RestTest description = "Verify if get favorites response returns allowableOperations object when requested") public void checkResponsesForGetFavoritesWithAllowableOperations() { - final RestPersonFavoritesModelsCollection adminFavorites = - restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ALLOWABLE_OPERATIONS).getFavorites(); + final RestPersonFavoritesModelsCollection adminFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ALLOWABLE_OPERATIONS).getFavorites(); restClient.assertStatusCodeIs(HttpStatus.OK); adminFavorites.getEntries().stream() @@ -576,18 +576,17 @@ public class GetFavoritesTests extends RestTest @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, description = "Verify the get favorites request with properties parameter applied") @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) - public void checkSearchResponseContainsIsFavoriteWhenRequested() throws InterruptedException { + public void checkSearchResponseContainsIsFavoriteWhenRequested() throws InterruptedException + { final SearchRequest query = new SearchRequest(); final RestRequestQueryModel queryReq = new RestRequestQueryModel(); queryReq.setQuery(firstFileModel.getName()); query.setQuery(queryReq); query.setInclude(List.of("isFavorite")); - Utility.sleep(500, 60000, () -> - { - restClient.authenticateUser(adminUserModel).withSearchAPI().search(query); - restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue()); - } - ); + Utility.sleep(500, 60000, () -> { + restClient.authenticateUser(adminUserModel).withSearchAPI().search(query); + restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue()); + }); } } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java index 5dd75b1591..8fa3a3e0ad 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java @@ -1,460 +1,459 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2019 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 . - * #L% - */ -package org.alfresco.rest.api.impl; - -import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS; - -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.model.ContentModel; -import org.alfresco.query.PagingResults; -import org.alfresco.repo.favourites.PersonFavourite; -import org.alfresco.repo.site.SiteDoesNotExistException; -import org.alfresco.repo.site.SiteModel; -import org.alfresco.rest.api.Favourites; -import org.alfresco.rest.api.Nodes; -import org.alfresco.rest.api.People; -import org.alfresco.rest.api.Sites; -import org.alfresco.rest.api.model.Document; -import org.alfresco.rest.api.model.DocumentTarget; -import org.alfresco.rest.api.model.Favourite; -import org.alfresco.rest.api.model.Folder; -import org.alfresco.rest.api.model.FolderTarget; -import org.alfresco.rest.api.model.Node; -import org.alfresco.rest.api.model.PathInfo; -import org.alfresco.rest.api.model.Site; -import org.alfresco.rest.api.model.SiteTarget; -import org.alfresco.rest.api.model.Target; -import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; -import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException; -import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; -import org.alfresco.rest.framework.resource.parameters.Paging; -import org.alfresco.rest.framework.resource.parameters.Parameters; -import org.alfresco.rest.framework.resource.parameters.Params; -import org.alfresco.rest.framework.resource.parameters.SortColumn; -import org.alfresco.rest.framework.resource.parameters.where.QueryHelper; -import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter; -import org.alfresco.service.cmr.favourites.FavouritesService; -import org.alfresco.service.cmr.favourites.FavouritesService.SortFields; -import org.alfresco.service.cmr.favourites.FavouritesService.Type; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.site.SiteInfo; -import org.alfresco.service.cmr.site.SiteService; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Public REST API: Centralises access to favourites functionality and maps between representations repository and api representations. - * - * @author steveglover - * @since publicapi1.0 - */ -public class FavouritesImpl implements Favourites -{ - private static final Log logger = LogFactory.getLog(FavouritesImpl.class); - - private static final List ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ALLOWABLEOPERATIONS); - - private People people; - private Sites sites; - private Nodes nodes; - private FavouritesService favouritesService; - private SiteService siteService; - private NamespaceService namespaceService; - - // additional exclude properties for favourites as these can be already top-level properties - private static final List EXCLUDED_PROPS = Arrays.asList( - ContentModel.PROP_TITLE, - ContentModel.PROP_DESCRIPTION, - SiteModel.PROP_SITE_VISIBILITY, - SiteModel.PROP_SITE_PRESET - ); - - public void setPeople(People people) - { - this.people = people; - } - - public void setSites(Sites sites) - { - this.sites = sites; - } - - public void setNodes(Nodes nodes) - { - this.nodes = nodes; - } - - public void setFavouritesService(FavouritesService favouritesService) - { - this.favouritesService = favouritesService; - } - - public void setSiteService(SiteService siteService) - { - this.siteService = siteService; - } - - public void setNamespaceService(NamespaceService namespaceService) - { - this.namespaceService = namespaceService; - } - - private Target getTarget(PersonFavourite personFavourite, Parameters parameters) - { - Target target = null; - NodeRef nodeRef = personFavourite.getNodeRef(); - Type type = personFavourite.getType(); - if(type.equals(Type.FILE)) - { - Document document = nodes.getDocument(nodeRef); - setPathInfo(document, parameters.getInclude()); - target = new DocumentTarget(document); - } - else if(type.equals(Type.FOLDER)) - { - Folder folder = nodes.getFolder(nodeRef); - setPathInfo(folder, parameters.getInclude()); - target = new FolderTarget(folder); - } - else if(type.equals(Type.SITE)) - { - SiteInfo siteInfo = siteService.getSite(nodeRef); - String role = sites.getSiteRole(siteInfo.getShortName()); - Site site = new Site(siteInfo, role); - target = new SiteTarget(site); - } - else - { - throw new AlfrescoRuntimeException("Unexpected favourite target type: " + type); - } - - return target; - } - - private Favourite getFavourite(PersonFavourite personFavourite, Parameters parameters) - { - Favourite fav = new Favourite(); - fav.setTargetGuid(personFavourite.getNodeRef().getId()); - fav.setCreatedAt(personFavourite.getCreatedAt()); - Target target = getTarget(personFavourite, parameters); - fav.setTarget(target); - - // REPO-1147 allow retrieving additional properties - final List paramsInclude = parameters.getInclude(); - if (!Collections.disjoint(paramsInclude, ALLOWED_INCLUDES)) - { - final List includes = ALLOWED_INCLUDES.stream().filter(a -> paramsInclude.contains(a)).collect(Collectors.toList()); - // get node representation with only properties included - Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includes, null); - // Create a map from node properties excluding properties already in this Favorite - Map filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS); - if(filteredNodeProperties.size() > 0 && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES)) - { - fav.setProperties(filteredNodeProperties); - } - final List allowableOperations = node.getAllowableOperations(); - if (CollectionUtils.isNotEmpty(allowableOperations) && paramsInclude.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS)) - { - fav.setAllowableOperations(allowableOperations); - } - } - - return fav; - } - - private Map filterProps(Map properties, List toRemove) - { - Map filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties); - List propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList()); - filteredProps.keySet().removeAll(propsToRemove); - return filteredProps; - } - - private CollectionWithPagingInfo wrap(Paging paging, PagingResults personFavourites, Parameters parameters) - { - final List page = personFavourites.getPage(); - final List list = new AbstractList() - { - @Override - public Favourite get(int index) - { - PersonFavourite personFavourite = page.get(index); - Favourite fav = getFavourite(personFavourite, parameters); - return fav; - } - - @Override - public int size() - { - return page.size(); - } - }; - Pair pair = personFavourites.getTotalResultCount(); - Integer total = null; - if(pair.getFirst().equals(pair.getSecond())) - { - total = pair.getFirst(); - } - return CollectionWithPagingInfo.asPaged(paging, list, personFavourites.hasMoreItems(), total); - } - - @Override - public Favourite addFavourite(String personId, Favourite favourite) - { - Parameters parameters = getDefaultParameters(personId, null); - return addFavourite(personId, favourite, parameters); - } - - @Override - public Favourite addFavourite(String personId, Favourite favourite, Parameters parameters) - { - Favourite ret = null; - - personId = people.validatePerson(personId, true); - Target target = favourite.getTarget(); - if(target == null) - { - throw new InvalidArgumentException("target is missing"); - } - else if(target instanceof SiteTarget) - { - SiteTarget siteTarget = (SiteTarget)target; - String guid = siteTarget.getSite().getGuid(); - SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid)); - NodeRef siteNodeRef = siteInfo.getNodeRef(); - String siteId = siteInfo.getShortName(); - - try - { - PersonFavourite personFavourite = favouritesService.addFavourite(personId, siteNodeRef); - ret = getFavourite(personFavourite, parameters); - } - catch(SiteDoesNotExistException e) - { - throw new RelationshipResourceNotFoundException(personId, siteId); - } - } - else if(target instanceof DocumentTarget) - { - DocumentTarget documentTarget = (DocumentTarget)target; - NodeRef nodeRef = documentTarget.getFile().getGuid(); - if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null)) - { - throw new RelationshipResourceNotFoundException(personId, nodeRef.getId()); - } - - PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef); - ret = getFavourite(personFavourite, parameters); - } - else if(target instanceof FolderTarget) - { - FolderTarget folderTarget = (FolderTarget)target; - NodeRef nodeRef = folderTarget.getFolder().getGuid(); - if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), Collections.singleton(SiteModel.TYPE_SITE))) - { - throw new RelationshipResourceNotFoundException(personId, nodeRef.getId()); - } - - PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef); - ret = getFavourite(personFavourite, parameters); - } - - return ret; - } - - @Override - public void removeFavourite(String personId, String id) - { - personId = people.validatePerson(personId, true); - NodeRef nodeRef = nodes.validateNode(id); - boolean exists = false; - - Type type = favouritesService.getType(nodeRef); - if(type.equals(Type.SITE)) - { - SiteInfo siteInfo = siteService.getSite(nodeRef); - if(siteInfo == null) - { - // shouldn't happen because the type implies it's a site - throw new AlfrescoRuntimeException("Unable to find site with nodeRef " + nodeRef); - } - exists = favouritesService.removeFavourite(personId, siteInfo.getNodeRef()); - } - else if(type.equals(Type.FILE)) - { - exists = favouritesService.removeFavourite(personId, nodeRef); - } - else if(type.equals(Type.FOLDER)) - { - exists = favouritesService.removeFavourite(personId, nodeRef); - } - if(!exists) - { - throw new RelationshipResourceNotFoundException(personId, id); - } - } - - @Override - public Favourite getFavourite(String personId, String favouriteId) - { - Parameters parameters = getDefaultParameters(personId, favouriteId); - return getFavourite(personId, favouriteId, parameters); - } - - @Override - public Favourite getFavourite(String personId, String favouriteId, Parameters parameters) - { - NodeRef nodeRef = nodes.validateNode(favouriteId); - personId = people.validatePerson(personId, true); - - PersonFavourite personFavourite = favouritesService.getFavourite(personId, nodeRef); - if(personFavourite != null) - { - Favourite favourite = getFavourite(personFavourite, parameters); - return favourite; - } - else - { - throw new RelationshipResourceNotFoundException(personId, favouriteId); - } - } - - @Override - public CollectionWithPagingInfo getFavourites(String personId, final Parameters parameters) - { - personId = people.validatePerson(personId, true); - - Paging paging = parameters.getPaging(); - - List> sortProps = getSortProps(parameters); - - final Set filteredByClientQuery = new HashSet(); - Set filterTypes = FavouritesService.Type.ALL_FILTER_TYPES; //Default all - - // filterType is of the form 'target.' - QueryHelper.walk(parameters.getQuery(), new WalkerCallbackAdapter() - { - @Override - public void or() { - //OR is supported but exists() will be called for each EXISTS so we don't - //need to do anything here. If we don't override it then it will be assumed - //that OR in the grammar is not supported. - } - - @Override - public void exists(String filteredByClient, boolean negated) { - if(filteredByClient != null) - { - int idx = filteredByClient.lastIndexOf("/"); - if(idx == -1 || idx == filteredByClient.length()) - { - throw new InvalidArgumentException(); - } - else - { - String filtertype = filteredByClient.substring(idx + 1).toUpperCase(); - filteredByClientQuery.add(Type.valueOf(filtertype)); - } - } - - } - }); - - if (filteredByClientQuery.size() > 0) - { - filterTypes = filteredByClientQuery; - } - - final PagingResults favourites = favouritesService.getPagedFavourites(personId, filterTypes, sortProps, Util.getPagingRequest(paging)); - - return wrap(paging, favourites, parameters); - } - - private void setPathInfo(Node node, List includeParam) - { - if (includeParam.contains(PARAM_INCLUDE_PATH)) - { - PathInfo pathInfo = nodes.lookupPathInfo(node.getNodeRef(), null); - node.setPath(pathInfo); - } - } - - /** - * Returns a {@code {@link Parameters} object where almost all of its values are null. - * the non-null value is the {@literal include} and whatever value is passed for {@code personId} and {@code favouriteId} - */ - private Parameters getDefaultParameters(String personId, String favouriteId) - { - Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, null, null, Collections.emptyList(), null, null, null, - false); - Parameters parameters = Params.valueOf(recognizedParams, personId, favouriteId, null); - return parameters; - } - - private List> getSortProps(Parameters parameters) - { - List> sortProps = new ArrayList<>(); - List sortCols = parameters.getSorting(); - if ((sortCols != null) && (sortCols.size() > 0)) - { - for (SortColumn sortCol : sortCols) - { - SortFields sortField; - try - { - sortField = SortFields.valueOf(sortCol.column); - } - catch (Exception e) - { - throw new InvalidArgumentException("Invalid sort field: " + sortCol.column); - } - sortProps.add(new Pair<>(sortField, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE))); - } - } - else - { - // default sort order - sortProps = FavouritesService.DEFAULT_SORT_PROPS; - } - return sortProps; - } -} +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2019 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 . + * #L% + */ +package org.alfresco.rest.api.impl; + +import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS; + +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.model.ContentModel; +import org.alfresco.query.PagingResults; +import org.alfresco.repo.favourites.PersonFavourite; +import org.alfresco.repo.site.SiteDoesNotExistException; +import org.alfresco.repo.site.SiteModel; +import org.alfresco.rest.api.Favourites; +import org.alfresco.rest.api.Nodes; +import org.alfresco.rest.api.People; +import org.alfresco.rest.api.Sites; +import org.alfresco.rest.api.model.Document; +import org.alfresco.rest.api.model.DocumentTarget; +import org.alfresco.rest.api.model.Favourite; +import org.alfresco.rest.api.model.Folder; +import org.alfresco.rest.api.model.FolderTarget; +import org.alfresco.rest.api.model.Node; +import org.alfresco.rest.api.model.PathInfo; +import org.alfresco.rest.api.model.Site; +import org.alfresco.rest.api.model.SiteTarget; +import org.alfresco.rest.api.model.Target; +import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; +import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; +import org.alfresco.rest.framework.resource.parameters.Paging; +import org.alfresco.rest.framework.resource.parameters.Parameters; +import org.alfresco.rest.framework.resource.parameters.Params; +import org.alfresco.rest.framework.resource.parameters.SortColumn; +import org.alfresco.rest.framework.resource.parameters.where.QueryHelper; +import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter; +import org.alfresco.service.cmr.favourites.FavouritesService; +import org.alfresco.service.cmr.favourites.FavouritesService.SortFields; +import org.alfresco.service.cmr.favourites.FavouritesService.Type; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.site.SiteInfo; +import org.alfresco.service.cmr.site.SiteService; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; +import org.alfresco.util.Pair; + +/** + * Public REST API: Centralises access to favourites functionality and maps between representations repository and api representations. + * + * @author steveglover + * @since publicapi1.0 + */ +public class FavouritesImpl implements Favourites +{ + private static final Log logger = LogFactory.getLog(FavouritesImpl.class); + + private static final List ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ALLOWABLEOPERATIONS); + + private People people; + private Sites sites; + private Nodes nodes; + private FavouritesService favouritesService; + private SiteService siteService; + private NamespaceService namespaceService; + + // additional exclude properties for favourites as these can be already top-level properties + private static final List EXCLUDED_PROPS = Arrays.asList( + ContentModel.PROP_TITLE, + ContentModel.PROP_DESCRIPTION, + SiteModel.PROP_SITE_VISIBILITY, + SiteModel.PROP_SITE_PRESET); + + public void setPeople(People people) + { + this.people = people; + } + + public void setSites(Sites sites) + { + this.sites = sites; + } + + public void setNodes(Nodes nodes) + { + this.nodes = nodes; + } + + public void setFavouritesService(FavouritesService favouritesService) + { + this.favouritesService = favouritesService; + } + + public void setSiteService(SiteService siteService) + { + this.siteService = siteService; + } + + public void setNamespaceService(NamespaceService namespaceService) + { + this.namespaceService = namespaceService; + } + + private Target getTarget(PersonFavourite personFavourite, Parameters parameters) + { + Target target = null; + NodeRef nodeRef = personFavourite.getNodeRef(); + Type type = personFavourite.getType(); + if (type.equals(Type.FILE)) + { + Document document = nodes.getDocument(nodeRef); + setPathInfo(document, parameters.getInclude()); + target = new DocumentTarget(document); + } + else if (type.equals(Type.FOLDER)) + { + Folder folder = nodes.getFolder(nodeRef); + setPathInfo(folder, parameters.getInclude()); + target = new FolderTarget(folder); + } + else if (type.equals(Type.SITE)) + { + SiteInfo siteInfo = siteService.getSite(nodeRef); + String role = sites.getSiteRole(siteInfo.getShortName()); + Site site = new Site(siteInfo, role); + target = new SiteTarget(site); + } + else + { + throw new AlfrescoRuntimeException("Unexpected favourite target type: " + type); + } + + return target; + } + + private Favourite getFavourite(PersonFavourite personFavourite, Parameters parameters) + { + Favourite fav = new Favourite(); + fav.setTargetGuid(personFavourite.getNodeRef().getId()); + fav.setCreatedAt(personFavourite.getCreatedAt()); + Target target = getTarget(personFavourite, parameters); + fav.setTarget(target); + + // REPO-1147 allow retrieving additional properties + final List paramsInclude = parameters.getInclude(); + if (!Collections.disjoint(paramsInclude, ALLOWED_INCLUDES)) + { + final List includes = ALLOWED_INCLUDES.stream().filter(a -> paramsInclude.contains(a)).collect(Collectors.toList()); + // get node representation with only properties included + Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includes, null); + // Create a map from node properties excluding properties already in this Favorite + Map filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS); + if (filteredNodeProperties.size() > 0 && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES)) + { + fav.setProperties(filteredNodeProperties); + } + final List allowableOperations = node.getAllowableOperations(); + if (CollectionUtils.isNotEmpty(allowableOperations) && paramsInclude.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS)) + { + fav.setAllowableOperations(allowableOperations); + } + } + + return fav; + } + + private Map filterProps(Map properties, List toRemove) + { + Map filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties); + List propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList()); + filteredProps.keySet().removeAll(propsToRemove); + return filteredProps; + } + + private CollectionWithPagingInfo wrap(Paging paging, PagingResults personFavourites, Parameters parameters) + { + final List page = personFavourites.getPage(); + final List list = new AbstractList() { + @Override + public Favourite get(int index) + { + PersonFavourite personFavourite = page.get(index); + Favourite fav = getFavourite(personFavourite, parameters); + return fav; + } + + @Override + public int size() + { + return page.size(); + } + }; + Pair pair = personFavourites.getTotalResultCount(); + Integer total = null; + if (pair.getFirst().equals(pair.getSecond())) + { + total = pair.getFirst(); + } + return CollectionWithPagingInfo.asPaged(paging, list, personFavourites.hasMoreItems(), total); + } + + @Override + public Favourite addFavourite(String personId, Favourite favourite) + { + Parameters parameters = getDefaultParameters(personId, null); + return addFavourite(personId, favourite, parameters); + } + + @Override + public Favourite addFavourite(String personId, Favourite favourite, Parameters parameters) + { + Favourite ret = null; + + personId = people.validatePerson(personId, true); + Target target = favourite.getTarget(); + if (target == null) + { + throw new InvalidArgumentException("target is missing"); + } + else if (target instanceof SiteTarget) + { + SiteTarget siteTarget = (SiteTarget) target; + String guid = siteTarget.getSite().getGuid(); + SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid)); + NodeRef siteNodeRef = siteInfo.getNodeRef(); + String siteId = siteInfo.getShortName(); + + try + { + PersonFavourite personFavourite = favouritesService.addFavourite(personId, siteNodeRef); + ret = getFavourite(personFavourite, parameters); + } + catch (SiteDoesNotExistException e) + { + throw new RelationshipResourceNotFoundException(personId, siteId); + } + } + else if (target instanceof DocumentTarget) + { + DocumentTarget documentTarget = (DocumentTarget) target; + NodeRef nodeRef = documentTarget.getFile().getGuid(); + if (!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null)) + { + throw new RelationshipResourceNotFoundException(personId, nodeRef.getId()); + } + + PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef); + ret = getFavourite(personFavourite, parameters); + } + else if (target instanceof FolderTarget) + { + FolderTarget folderTarget = (FolderTarget) target; + NodeRef nodeRef = folderTarget.getFolder().getGuid(); + if (!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), Collections.singleton(SiteModel.TYPE_SITE))) + { + throw new RelationshipResourceNotFoundException(personId, nodeRef.getId()); + } + + PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef); + ret = getFavourite(personFavourite, parameters); + } + + return ret; + } + + @Override + public void removeFavourite(String personId, String id) + { + personId = people.validatePerson(personId, true); + NodeRef nodeRef = nodes.validateNode(id); + boolean exists = false; + + Type type = favouritesService.getType(nodeRef); + if (type.equals(Type.SITE)) + { + SiteInfo siteInfo = siteService.getSite(nodeRef); + if (siteInfo == null) + { + // shouldn't happen because the type implies it's a site + throw new AlfrescoRuntimeException("Unable to find site with nodeRef " + nodeRef); + } + exists = favouritesService.removeFavourite(personId, siteInfo.getNodeRef()); + } + else if (type.equals(Type.FILE)) + { + exists = favouritesService.removeFavourite(personId, nodeRef); + } + else if (type.equals(Type.FOLDER)) + { + exists = favouritesService.removeFavourite(personId, nodeRef); + } + if (!exists) + { + throw new RelationshipResourceNotFoundException(personId, id); + } + } + + @Override + public Favourite getFavourite(String personId, String favouriteId) + { + Parameters parameters = getDefaultParameters(personId, favouriteId); + return getFavourite(personId, favouriteId, parameters); + } + + @Override + public Favourite getFavourite(String personId, String favouriteId, Parameters parameters) + { + NodeRef nodeRef = nodes.validateNode(favouriteId); + personId = people.validatePerson(personId, true); + + PersonFavourite personFavourite = favouritesService.getFavourite(personId, nodeRef); + if (personFavourite != null) + { + Favourite favourite = getFavourite(personFavourite, parameters); + return favourite; + } + else + { + throw new RelationshipResourceNotFoundException(personId, favouriteId); + } + } + + @Override + public CollectionWithPagingInfo getFavourites(String personId, final Parameters parameters) + { + personId = people.validatePerson(personId, true); + + Paging paging = parameters.getPaging(); + + List> sortProps = getSortProps(parameters); + + final Set filteredByClientQuery = new HashSet(); + Set filterTypes = FavouritesService.Type.ALL_FILTER_TYPES; // Default all + + // filterType is of the form 'target.' + QueryHelper.walk(parameters.getQuery(), new WalkerCallbackAdapter() { + @Override + public void or() + { + // OR is supported but exists() will be called for each EXISTS so we don't + // need to do anything here. If we don't override it then it will be assumed + // that OR in the grammar is not supported. + } + + @Override + public void exists(String filteredByClient, boolean negated) + { + if (filteredByClient != null) + { + int idx = filteredByClient.lastIndexOf("/"); + if (idx == -1 || idx == filteredByClient.length()) + { + throw new InvalidArgumentException(); + } + else + { + String filtertype = filteredByClient.substring(idx + 1).toUpperCase(); + filteredByClientQuery.add(Type.valueOf(filtertype)); + } + } + + } + }); + + if (filteredByClientQuery.size() > 0) + { + filterTypes = filteredByClientQuery; + } + + final PagingResults favourites = favouritesService.getPagedFavourites(personId, filterTypes, sortProps, Util.getPagingRequest(paging)); + + return wrap(paging, favourites, parameters); + } + + private void setPathInfo(Node node, List includeParam) + { + if (includeParam.contains(PARAM_INCLUDE_PATH)) + { + PathInfo pathInfo = nodes.lookupPathInfo(node.getNodeRef(), null); + node.setPath(pathInfo); + } + } + + /** + * Returns a {@code {@link Parameters} object where almost all of its values are null. the non-null value is the {@literal include} and whatever value is passed for {@code personId} and {@code favouriteId} + */ + private Parameters getDefaultParameters(String personId, String favouriteId) + { + Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, null, null, Collections.emptyList(), null, null, null, + false); + Parameters parameters = Params.valueOf(recognizedParams, personId, favouriteId, null); + return parameters; + } + + private List> getSortProps(Parameters parameters) + { + List> sortProps = new ArrayList<>(); + List sortCols = parameters.getSorting(); + if ((sortCols != null) && (sortCols.size() > 0)) + { + for (SortColumn sortCol : sortCols) + { + SortFields sortField; + try + { + sortField = SortFields.valueOf(sortCol.column); + } + catch (Exception e) + { + throw new InvalidArgumentException("Invalid sort field: " + sortCol.column); + } + sortProps.add(new Pair<>(sortField, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE))); + } + } + else + { + // default sort order + sortProps = FavouritesService.DEFAULT_SORT_PROPS; + } + return sortProps; + } +} diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java index 261c5b8e41..bb9fc16c7d 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java @@ -23,43 +23,43 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.api.model; - -/** - * A document target favourite. - * - * @author steveglover - * - */ -public class DocumentTarget extends Target -{ - private Document file; - - public DocumentTarget() - { - super(); - } - - public DocumentTarget(Document file) - { - super(); - this.file = file; - } - - public void setDocument(Document file) - { - this.file = file; - } - - public Document getFile() - { - return file; - } - - @Override - public String toString() - { - return "DocumentTarget [file=" + file + "]"; - } - -} +package org.alfresco.rest.api.model; + +/** + * A document target favourite. + * + * @author steveglover + * + */ +public class DocumentTarget extends Target +{ + private Document file; + + public DocumentTarget() + { + super(); + } + + public DocumentTarget(Document file) + { + super(); + this.file = file; + } + + public void setDocument(Document file) + { + this.file = file; + } + + public Document getFile() + { + return file; + } + + @Override + public String toString() + { + return "DocumentTarget [file=" + file + "]"; + } + +} diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java index 79429a40ab..878043a6a5 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java @@ -1,103 +1,105 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 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 . - * #L% - */ -package org.alfresco.rest.api.model; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.alfresco.rest.framework.resource.UniqueId; - -/** - * Representation of a favourite (document, folder, site, ...). - * - * @author steveglover - * - */ -public class Favourite -{ - private String targetGuid; - private Date createdAt; - private Target target; - private Map properties; - private List allowableOperations; - - public Date getCreatedAt() - { - return createdAt; - } - - public void setCreatedAt(Date createdAt) - { - this.createdAt = createdAt; - } - - @UniqueId(name="targetGuid") - public String getTargetGuid() - { - return targetGuid; - } - - public void setTargetGuid(String targetGuid) - { - this.targetGuid = targetGuid; - } - - public Target getTarget() - { - return target; - } - - public void setTarget(Target target) - { - this.target = target; - } - - public Map getProperties() - { - return properties; - } - - public void setProperties(Map properties) - { - this.properties = properties; - } - - public List getAllowableOperations() { - return allowableOperations; - } - - public void setAllowableOperations(List allowableOperations) { - this.allowableOperations = allowableOperations; - } - - @Override - public String toString() - { - return "Favourite [targetGuid=" + targetGuid - + ", createdAt=" + createdAt + ", target=" + target + ", properties=" + properties + "]"; - } -} +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 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 . + * #L% + */ +package org.alfresco.rest.api.model; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.alfresco.rest.framework.resource.UniqueId; + +/** + * Representation of a favourite (document, folder, site, ...). + * + * @author steveglover + * + */ +public class Favourite +{ + private String targetGuid; + private Date createdAt; + private Target target; + private Map properties; + private List allowableOperations; + + public Date getCreatedAt() + { + return createdAt; + } + + public void setCreatedAt(Date createdAt) + { + this.createdAt = createdAt; + } + + @UniqueId(name = "targetGuid") + public String getTargetGuid() + { + return targetGuid; + } + + public void setTargetGuid(String targetGuid) + { + this.targetGuid = targetGuid; + } + + public Target getTarget() + { + return target; + } + + public void setTarget(Target target) + { + this.target = target; + } + + public Map getProperties() + { + return properties; + } + + public void setProperties(Map properties) + { + this.properties = properties; + } + + public List getAllowableOperations() + { + return allowableOperations; + } + + public void setAllowableOperations(List allowableOperations) + { + this.allowableOperations = allowableOperations; + } + + @Override + public String toString() + { + return "Favourite [targetGuid=" + targetGuid + + ", createdAt=" + createdAt + ", target=" + target + ", properties=" + properties + "]"; + } +} diff --git a/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java index 8f41edd452..2651b987e5 100644 --- a/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java +++ b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java @@ -25,59 +25,60 @@ */ package org.alfresco; -import org.alfresco.repo.web.scripts.TestWebScriptRepoServer; -import org.alfresco.util.testing.category.DBTests; -import org.alfresco.util.testing.category.NonBuildTests; import org.junit.experimental.categories.Categories; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import org.alfresco.repo.web.scripts.TestWebScriptRepoServer; +import org.alfresco.util.testing.category.DBTests; +import org.alfresco.util.testing.category.NonBuildTests; + @RunWith(Categories.class) @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class}) @Suite.SuiteClasses({ - // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml, - // classpath:alfresco/web-scripts-application-context.xml] - org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class, - org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class, - org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class, - org.alfresco.repo.web.scripts.blogs.BlogServiceTest.class, - org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest.class, - org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest.class, - org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest.class, - org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test.class, - org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test.class, - org.alfresco.repo.web.scripts.groups.GroupsTest.class, - org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest.class, - org.alfresco.repo.web.scripts.invite.InviteServiceTest.class, - org.alfresco.repo.web.scripts.LoginTest.class, - org.alfresco.repo.web.scripts.search.PersonSearchTest.class, - org.alfresco.repo.web.scripts.person.PersonServiceTest.class, - org.alfresco.repo.web.scripts.preference.PreferenceServiceTest.class, - org.alfresco.repo.web.scripts.rating.RatingRestApiTest.class, - org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest.class, - org.alfresco.repo.web.scripts.RepositoryContainerTest.class, - org.alfresco.repo.web.scripts.rule.RuleServiceTest.class, - org.alfresco.repo.web.scripts.action.RunningActionRestApiTest.class, - org.alfresco.repo.web.scripts.site.SiteServiceTest.class, - org.alfresco.repo.web.scripts.tagging.TaggingServiceTest.class, - org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest.class, - org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest.class, - org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest.class, - org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest.class, - org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest.class, - org.alfresco.repo.web.scripts.facet.FacetRestApiTest.class, - org.alfresco.repo.web.scripts.comment.CommentsApiTest.class, - org.alfresco.repo.web.scripts.content.ContentGetTest.class, - org.alfresco.repo.web.scripts.XssVulnerabilityTest.class, - org.alfresco.repo.web.scripts.links.LinksRestApiTest.class, - org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest.class, - org.alfresco.repo.web.scripts.ReadOnlyTransactionInGetRestApiTest.class, - org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest.class, - org.alfresco.repo.web.scripts.site.SurfConfigTest.class, - org.alfresco.repo.web.scripts.node.NodeWebScripTest.class, - org.alfresco.rest.api.impl.CommentsImplUnitTest.class, - org.alfresco.rest.api.impl.DownloadsImplCheckArchiveStatusUnitTest.class, - org.alfresco.rest.api.impl.RestApiDirectUrlConfigUnitTest.class + // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml, + // classpath:alfresco/web-scripts-application-context.xml] + org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class, + org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class, + org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class, + org.alfresco.repo.web.scripts.blogs.BlogServiceTest.class, + org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest.class, + org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest.class, + org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest.class, + org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test.class, + org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test.class, + org.alfresco.repo.web.scripts.groups.GroupsTest.class, + org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest.class, + org.alfresco.repo.web.scripts.invite.InviteServiceTest.class, + org.alfresco.repo.web.scripts.LoginTest.class, + org.alfresco.repo.web.scripts.search.PersonSearchTest.class, + org.alfresco.repo.web.scripts.person.PersonServiceTest.class, + org.alfresco.repo.web.scripts.preference.PreferenceServiceTest.class, + org.alfresco.repo.web.scripts.rating.RatingRestApiTest.class, + org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest.class, + org.alfresco.repo.web.scripts.RepositoryContainerTest.class, + org.alfresco.repo.web.scripts.rule.RuleServiceTest.class, + org.alfresco.repo.web.scripts.action.RunningActionRestApiTest.class, + org.alfresco.repo.web.scripts.site.SiteServiceTest.class, + org.alfresco.repo.web.scripts.tagging.TaggingServiceTest.class, + org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest.class, + org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest.class, + org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest.class, + org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest.class, + org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest.class, + org.alfresco.repo.web.scripts.facet.FacetRestApiTest.class, + org.alfresco.repo.web.scripts.comment.CommentsApiTest.class, + org.alfresco.repo.web.scripts.content.ContentGetTest.class, + org.alfresco.repo.web.scripts.XssVulnerabilityTest.class, + org.alfresco.repo.web.scripts.links.LinksRestApiTest.class, + org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest.class, + org.alfresco.repo.web.scripts.ReadOnlyTransactionInGetRestApiTest.class, + org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest.class, + org.alfresco.repo.web.scripts.site.SurfConfigTest.class, + org.alfresco.repo.web.scripts.node.NodeWebScripTest.class, + org.alfresco.rest.api.impl.CommentsImplUnitTest.class, + org.alfresco.rest.api.impl.DownloadsImplCheckArchiveStatusUnitTest.class, + org.alfresco.rest.api.impl.RestApiDirectUrlConfigUnitTest.class }) public class AppContext04TestSuite { From f193309e4c0eb4c00b8fbcda297750931f6c93ec Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 4 Oct 2024 15:22:38 +0100 Subject: [PATCH 141/148] MNT-24637 Add include=aspectNames to favourites API. --- .../rest/favorites/GetFavoritesTests.java | 14 ++ .../rest/api/impl/FavouritesImpl.java | 7 +- .../rest/api/model/DocumentTarget.java | 22 +++ .../alfresco/rest/api/model/Favourite.java | 43 +++++- .../org/alfresco/AppContext04TestSuite.java | 3 +- .../rest/api/impl/FavouritesImplUnitTest.java | 134 ++++++++++++++++++ 6 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 remote-api/src/test/java/org/alfresco/rest/api/impl/FavouritesImplUnitTest.java diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java index 8c1ff59d9d..3897d4cbcf 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java @@ -29,6 +29,7 @@ import org.alfresco.utility.testrail.annotation.TestRail; public class GetFavoritesTests extends RestTest { private static final String ALLOWABLE_OPERATIONS = "allowableOperations"; + private static final String ASPECT_NAMES = "aspectNames"; private UserModel adminUserModel, userModel; private SiteModel firstSiteModel; private SiteModel secondSiteModel; @@ -589,4 +590,17 @@ public class GetFavoritesTests extends RestTest restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue()); }); } + + @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION}) + @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION, + description = "Verify if get favorites response returns aspectNames when requested") + public void checkResponsesForGetFavoritesWithAspectNames() + { + final RestPersonFavoritesModelsCollection adminFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ASPECT_NAMES).getFavorites(); + restClient.assertStatusCodeIs(HttpStatus.OK); + + adminFavorites.getEntries().stream() + .map(RestPersonFavoritesModel::onModel) + .forEach(m -> m.assertThat().field(ASPECT_NAMES).isNotEmpty()); + } } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java index 8fa3a3e0ad..0774beeec2 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java @@ -26,6 +26,7 @@ package org.alfresco.rest.api.impl; import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS; +import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES; import java.util.AbstractList; import java.util.ArrayList; @@ -92,7 +93,7 @@ public class FavouritesImpl implements Favourites { private static final Log logger = LogFactory.getLog(FavouritesImpl.class); - private static final List ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ALLOWABLEOPERATIONS); + private static final List ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ASPECTNAMES, PARAM_INCLUDE_ALLOWABLEOPERATIONS); private People people; private Sites sites; @@ -191,6 +192,10 @@ public class FavouritesImpl implements Favourites { fav.setProperties(filteredNodeProperties); } + if (paramsInclude.contains(PARAM_INCLUDE_ASPECTNAMES)) + { + fav.setAspectNames(node.getAspectNames()); + } final List allowableOperations = node.getAllowableOperations(); if (CollectionUtils.isNotEmpty(allowableOperations) && paramsInclude.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS)) { diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java index bb9fc16c7d..6f9a3a42a2 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java @@ -25,6 +25,8 @@ */ package org.alfresco.rest.api.model; +import java.util.Objects; + /** * A document target favourite. * @@ -62,4 +64,24 @@ public class DocumentTarget extends Target return "DocumentTarget [file=" + file + "]"; } + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + DocumentTarget that = (DocumentTarget) o; + return Objects.equals(file, that.file); + } + + @Override + public int hashCode() + { + return Objects.hashCode(file); + } } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java index 878043a6a5..a499a19410 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java @@ -28,6 +28,7 @@ package org.alfresco.rest.api.model; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import org.alfresco.rest.framework.resource.UniqueId; @@ -43,6 +44,7 @@ public class Favourite private Date createdAt; private Target target; private Map properties; + private List aspectNames; private List allowableOperations; public Date getCreatedAt() @@ -86,6 +88,16 @@ public class Favourite this.properties = properties; } + public List getAspectNames() + { + return aspectNames; + } + + public void setAspectNames(List aspectNames) + { + this.aspectNames = aspectNames; + } + public List getAllowableOperations() { return allowableOperations; @@ -99,7 +111,34 @@ public class Favourite @Override public String toString() { - return "Favourite [targetGuid=" + targetGuid - + ", createdAt=" + createdAt + ", target=" + target + ", properties=" + properties + "]"; + return "Favourite{" + + "targetGuid='" + targetGuid + '\'' + + ", createdAt=" + createdAt + + ", target=" + target + + ", properties=" + properties + + ", aspectNames=" + aspectNames + + ", allowableOperations=" + allowableOperations + + '}'; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + Favourite favourite = (Favourite) o; + return Objects.equals(targetGuid, favourite.targetGuid) && Objects.equals(createdAt, favourite.createdAt) && Objects.equals(target, favourite.target) && Objects.equals(properties, favourite.properties) && Objects.equals(aspectNames, favourite.aspectNames) && Objects.equals(allowableOperations, favourite.allowableOperations); + } + + @Override + public int hashCode() + { + return Objects.hash(targetGuid, createdAt, target, properties, aspectNames, allowableOperations); } } diff --git a/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java index 2651b987e5..2ffec4fc7b 100644 --- a/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java +++ b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java @@ -36,8 +36,6 @@ import org.alfresco.util.testing.category.NonBuildTests; @RunWith(Categories.class) @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class}) @Suite.SuiteClasses({ - // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml, - // classpath:alfresco/web-scripts-application-context.xml] org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class, org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class, org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class, @@ -78,6 +76,7 @@ import org.alfresco.util.testing.category.NonBuildTests; org.alfresco.repo.web.scripts.node.NodeWebScripTest.class, org.alfresco.rest.api.impl.CommentsImplUnitTest.class, org.alfresco.rest.api.impl.DownloadsImplCheckArchiveStatusUnitTest.class, + org.alfresco.rest.api.impl.FavouritesImplUnitTest.class, org.alfresco.rest.api.impl.RestApiDirectUrlConfigUnitTest.class }) public class AppContext04TestSuite diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/FavouritesImplUnitTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/FavouritesImplUnitTest.java new file mode 100644 index 0000000000..da38348a9e --- /dev/null +++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/FavouritesImplUnitTest.java @@ -0,0 +1,134 @@ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2020 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 . + * #L% + */ +package org.alfresco.rest.api.impl; + +import static java.util.Collections.singleton; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.openMocks; + +import static org.alfresco.model.ContentModel.TYPE_CONTENT; +import static org.alfresco.service.cmr.favourites.FavouritesService.Type.FILE; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import org.alfresco.repo.favourites.PersonFavourite; +import org.alfresco.rest.api.Nodes; +import org.alfresco.rest.api.People; +import org.alfresco.rest.api.model.Document; +import org.alfresco.rest.api.model.DocumentTarget; +import org.alfresco.rest.api.model.Favourite; +import org.alfresco.rest.framework.resource.parameters.Parameters; +import org.alfresco.service.cmr.favourites.FavouritesService; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.namespace.NamespaceService; + +/** + * Unit tests for {@link FavouritesImpl} class. + */ +public class FavouritesImplUnitTest +{ + static final String NODE_ID = "12345678"; + static final NodeRef NODE_REF = new NodeRef("favourite://node/" + NODE_ID); + static final String PERSON_ID = "personId"; + static final String ASPECT_NAME = "some:aspect"; + + @InjectMocks + FavouritesImpl favouritesImpl; + @Mock + People people; + @Mock + Nodes nodes; + @Mock + FavouritesService favouritesService; + @Mock + NamespaceService namespaceService; + @Mock + Favourite favourite; + @Mock + Document document; + @Mock + PersonFavourite personFavourite; + + @Before + public void setUp() + { + openMocks(this); + + when(nodes.getDocument(NODE_REF)).thenReturn(document); + when(nodes.nodeMatches(NODE_REF, singleton(TYPE_CONTENT), null)).thenReturn(true); + when(document.getGuid()).thenReturn(NODE_REF); + when(people.validatePerson(PERSON_ID, true)).thenReturn(PERSON_ID); + when(personFavourite.getNodeRef()).thenReturn(NODE_REF); + when(personFavourite.getType()).thenReturn(FILE); + when(favouritesService.addFavourite(PERSON_ID, NODE_REF)).thenReturn(personFavourite); + when(namespaceService.getPrefixes(anyString())).thenReturn(List.of("prefix")); + } + + @Test + public void testAddFavourite() + { + DocumentTarget documentTarget = new DocumentTarget(document); + when(favourite.getTarget()).thenReturn(documentTarget); + + Favourite response = favouritesImpl.addFavourite(PERSON_ID, favourite); + + Favourite expected = new Favourite(); + expected.setTarget(documentTarget); + expected.setTargetGuid(NODE_ID); + assertEquals(expected, response); + } + + @Test + public void testAddFavouriteIncludeAspectNames() + { + List includes = List.of("aspectNames"); + + DocumentTarget documentTarget = new DocumentTarget(document); + when(favourite.getTarget()).thenReturn(documentTarget); + when(nodes.getFolderOrDocument(NODE_REF, null, null, includes, null)).thenReturn(document); + when(document.getAspectNames()).thenReturn(List.of(ASPECT_NAME)); + + Parameters parameters = mock(Parameters.class); + when(parameters.getInclude()).thenReturn(includes); + + Favourite response = favouritesImpl.addFavourite(PERSON_ID, favourite, parameters); + + Favourite expected = new Favourite(); + expected.setTarget(documentTarget); + expected.setTargetGuid(NODE_ID); + expected.setAspectNames(List.of(ASPECT_NAME)); + assertEquals(expected, response); + } +} From 3b027c6c3637f6a3de33cc9cfcf265fb057e296e Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 4 Oct 2024 15:45:54 +0100 Subject: [PATCH 142/148] MNT-24637 Include aspectNames in TAS model. --- .../rest/model/RestPersonFavoritesModel.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java index 7643872eec..9969f9aadb 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java @@ -36,22 +36,22 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel aspectNames; private List allowableOperations; - + private RestTargetModel target; public RestPersonFavoritesModel() - { - } + {} public RestPersonFavoritesModel(String targetGuid, String createdAt) { @@ -69,7 +69,7 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel getAllowableOperations() { + public List getAspectNames() + { + return aspectNames; + } + + public void setAspectNames(List aspectNames) + { + this.aspectNames = aspectNames; + } + + public List getAllowableOperations() + { return allowableOperations; } - public void setAllowableOperations(List allowableOperations) { + public void setAllowableOperations(List allowableOperations) + { this.allowableOperations = allowableOperations; } } From 093b3281fba1847e86f42e08e4ac96579d1dc5b9 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 4 Oct 2024 15:54:57 +0100 Subject: [PATCH 143/148] MNT-24637 PMD fixes. --- .../rest/api/impl/FavouritesImpl.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java index 0774beeec2..6f2898e4a3 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java @@ -40,8 +40,6 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; @@ -91,8 +89,6 @@ import org.alfresco.util.Pair; */ public class FavouritesImpl implements Favourites { - private static final Log logger = LogFactory.getLog(FavouritesImpl.class); - private static final List ALLOWED_INCLUDES = List.of(PARAM_INCLUDE_PROPERTIES, PARAM_INCLUDE_ASPECTNAMES, PARAM_INCLUDE_ALLOWABLEOPERATIONS); private People people; @@ -141,7 +137,7 @@ public class FavouritesImpl implements Favourites private Target getTarget(PersonFavourite personFavourite, Parameters parameters) { - Target target = null; + Target target; NodeRef nodeRef = personFavourite.getNodeRef(); Type type = personFavourite.getType(); if (type.equals(Type.FILE)) @@ -183,12 +179,12 @@ public class FavouritesImpl implements Favourites final List paramsInclude = parameters.getInclude(); if (!Collections.disjoint(paramsInclude, ALLOWED_INCLUDES)) { - final List includes = ALLOWED_INCLUDES.stream().filter(a -> paramsInclude.contains(a)).collect(Collectors.toList()); + final List includes = ALLOWED_INCLUDES.stream().filter(paramsInclude::contains).collect(Collectors.toList()); // get node representation with only properties included Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includes, null); // Create a map from node properties excluding properties already in this Favorite Map filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS); - if (filteredNodeProperties.size() > 0 && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES)) + if (!filteredNodeProperties.isEmpty() && paramsInclude.contains(PARAM_INCLUDE_PROPERTIES)) { fav.setProperties(filteredNodeProperties); } @@ -217,7 +213,7 @@ public class FavouritesImpl implements Favourites private CollectionWithPagingInfo wrap(Paging paging, PagingResults personFavourites, Parameters parameters) { final List page = personFavourites.getPage(); - final List list = new AbstractList() { + final List list = new AbstractList<>() { @Override public Favourite get(int index) { @@ -371,7 +367,7 @@ public class FavouritesImpl implements Favourites List> sortProps = getSortProps(parameters); - final Set filteredByClientQuery = new HashSet(); + final Set filteredByClientQuery = new HashSet<>(); Set filterTypes = FavouritesService.Type.ALL_FILTER_TYPES; // Default all // filterType is of the form 'target.' @@ -389,7 +385,7 @@ public class FavouritesImpl implements Favourites { if (filteredByClient != null) { - int idx = filteredByClient.lastIndexOf("/"); + int idx = filteredByClient.lastIndexOf('/'); if (idx == -1 || idx == filteredByClient.length()) { throw new InvalidArgumentException(); @@ -404,7 +400,7 @@ public class FavouritesImpl implements Favourites } }); - if (filteredByClientQuery.size() > 0) + if (!filteredByClientQuery.isEmpty()) { filterTypes = filteredByClientQuery; } @@ -438,7 +434,7 @@ public class FavouritesImpl implements Favourites { List> sortProps = new ArrayList<>(); List sortCols = parameters.getSorting(); - if ((sortCols != null) && (sortCols.size() > 0)) + if (sortCols != null && !sortCols.isEmpty()) { for (SortColumn sortCol : sortCols) { @@ -451,7 +447,7 @@ public class FavouritesImpl implements Favourites { throw new InvalidArgumentException("Invalid sort field: " + sortCol.column); } - sortProps.add(new Pair<>(sortField, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE))); + sortProps.add(new Pair<>(sortField, sortCol.asc ? Boolean.TRUE : Boolean.FALSE)); } } else From 6e442e93b8253989279260e1f09fae01f6bcbe71 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:40:03 +0000 Subject: [PATCH 144/148] [maven-release-plugin][skip ci] prepare release 23.4.0.40 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 6b93378673..2f3f80c0e9 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 260e1f364a..027ae94044 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 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 bbd7a092ad..964687e93c 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a8030bffca..f3c18fef2f 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 64b4ef7e05..46df24320b 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 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 ac5c7ea64d..b3cd1a111a 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/amps/pom.xml b/amps/pom.xml index 9df58436d2..87bb2163b5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 717a92f804..4af5f86b53 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/core/pom.xml b/core/pom.xml index 8a96e3fbf9..2e69aff892 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/data-model/pom.xml b/data-model/pom.xml index 478a60e550..f695105bb3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/mmt/pom.xml b/mmt/pom.xml index 709696e121..e51b6e2c78 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 1c21132d96..a4c5f69ce6 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 03b8724861..cce373fb8b 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/pom.xml b/packaging/pom.xml index f0f4705889..38d8fcfcba 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 0f24f46d49..eba1ac76fc 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 255e83f8ef..99ab3f48ec 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 6ed89e8d8e..4beb20eaf2 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 38f015ec8e..f075330cc3 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 875a0fd4a6..add3c6bd39 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index a8d40417ce..9b6038c57f 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 - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 116a0d8dbf..1fb1799dc9 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/pom.xml b/pom.xml index bd0050244c..9ba1cec70b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.40 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 15b0179220..75c40e4bb2 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 diff --git a/repository/pom.xml b/repository/pom.xml index 78cdacc0c1..33d0036d90 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40-SNAPSHOT + 23.4.0.40 From 9846f7b04f339412c25bfb47b19a938fdf674d10 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 4 Oct 2024 18:40:05 +0000 Subject: [PATCH 145/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2f3f80c0e9..74fb96e1cc 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 027ae94044..a11ab8d087 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 - 23.4.0.40 + 23.4.0.41-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 964687e93c..0015751b73 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index f3c18fef2f..a7864c28e2 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 46df24320b..1e4b124d40 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 - 23.4.0.40 + 23.4.0.41-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 b3cd1a111a..0489caef98 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 87bb2163b5..83ba53550f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4af5f86b53..c4c7d0b16a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 2e69aff892..e47c0af19f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index f695105bb3..3bbee933ec 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e51b6e2c78..0746267c17 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a4c5f69ce6..5426db693e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cce373fb8b..385cb5004e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 38d8fcfcba..627b915b08 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index eba1ac76fc..119b716cc4 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 99ab3f48ec..ed53f3f6f0 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4beb20eaf2..356ef7a40a 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f075330cc3..1668173045 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index add3c6bd39..43c09f2859 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9b6038c57f..b1cb3b4fcc 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 - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 1fb1799dc9..ff93667deb 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9ba1cec70b..171dc564b1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.40 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 75c40e4bb2..6a77117867 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 33d0036d90..af383d5cd7 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.40 + 23.4.0.41-SNAPSHOT From 314e1aeb642decd9e766c4883876988d6c1fca72 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 6 Oct 2024 00:04:26 +0000 Subject: [PATCH 146/148] [force] Force release for 2024-10-06. From bb207340fdcae89bd3d4f7fed91f733f1f54ce79 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:07:51 +0000 Subject: [PATCH 147/148] [maven-release-plugin][skip ci] prepare release 23.4.0.41 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 74fb96e1cc..150ed2e66b 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index a11ab8d087..36c5c79343 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 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 0015751b73..abe2dcba37 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a7864c28e2..0d93bb3655 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1e4b124d40..2de3312689 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 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 0489caef98..2972ae71f0 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/amps/pom.xml b/amps/pom.xml index 83ba53550f..aa6fef3a99 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index c4c7d0b16a..eb986147aa 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/core/pom.xml b/core/pom.xml index e47c0af19f..8bf7f9427e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/data-model/pom.xml b/data-model/pom.xml index 3bbee933ec..7a864b9163 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/mmt/pom.xml b/mmt/pom.xml index 0746267c17..3dc9165e6d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 5426db693e..eafc7f2a30 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 385cb5004e..72a1b8424d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/pom.xml b/packaging/pom.xml index 627b915b08..5ebd1fa9f2 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 119b716cc4..9559bf9431 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ed53f3f6f0..73aec10b73 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 356ef7a40a..33c62a5067 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1668173045..447a582ee9 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 43c09f2859..6467d4682d 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b1cb3b4fcc..17b97ee282 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 - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ff93667deb..ed0919d17f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/pom.xml b/pom.xml index 171dc564b1..82d6bb07ef 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 23.4.0.41 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 6a77117867..7bc5d1ef02 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 diff --git a/repository/pom.xml b/repository/pom.xml index af383d5cd7..d6ff2c1447 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41-SNAPSHOT + 23.4.0.41 From d528ed1e971b94f86e6f564d66ff5030e0669f38 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 6 Oct 2024 00:07:53 +0000 Subject: [PATCH 148/148] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 150ed2e66b..367dadea73 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 36c5c79343..09bc77c278 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 - 23.4.0.41 + 23.4.0.42-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 abe2dcba37..ad877b07d2 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 0d93bb3655..85cd817a94 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 2de3312689..321e69ab74 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 - 23.4.0.41 + 23.4.0.42-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 2972ae71f0..b27166ed79 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index aa6fef3a99..b9e0317980 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index eb986147aa..0b16f63814 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 8bf7f9427e..c7664fb86c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 7a864b9163..167e6e5cf3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 3dc9165e6d..b3a582b893 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index eafc7f2a30..f2e8f6c594 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 72a1b8424d..313a96357f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5ebd1fa9f2..84a0056771 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9559bf9431..07715e448f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 73aec10b73..d28ada2444 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 33c62a5067..8e1c689d69 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 447a582ee9..b111f5a870 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 6467d4682d..77e1869706 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 17b97ee282..d8866540b6 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 - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ed0919d17f..6299dfc036 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/pom.xml b/pom.xml index 82d6bb07ef..01dcb9fb9c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT pom Alfresco Community Repo Parent @@ -154,7 +154,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 23.4.0.41 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 7bc5d1ef02..e61a918e1b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index d6ff2c1447..26df93ce4a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.4.0.41 + 23.4.0.42-SNAPSHOT