[maven-release-plugin][skip ci] prepare release 23.2.2.3

[skip tests] PRODENG-291 Upgrade ya-pmd-scan.
(cherry picked from commit 1a7027327e)
2025-09-10 14:11:58 +00:00 · 2024-07-23 11:47:08 +00:00 · 2024-07-23 12:24:46 +01:00 · 2024-07-22 14:18:23 +00:00 · 2024-07-22 14:18:21 +00:00 · 2024-07-22 16:16:06 +02:00
36 changed files with 123 additions and 105 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -135,7 +135,7 @@ jobs:
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
-      - uses: Alfresco/ya-pmd-scan@v3.0.0
+      - uses: Alfresco/ya-pmd-scan@v4.0.0
        with:
          classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""

@@ -198,7 +198,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"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
        run: 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
      - name: "Clean Maven cache"
@@ -227,7 +227,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: Run MariaDB ${{ matrix.version }} database
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
          MARIADB_VERSION: ${{ matrix.version }}
      - name: "Run tests"
@@ -254,7 +254,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MariaDB 10.6 database"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
          MARIADB_VERSION: 10.6
      - name: "Run tests"
@@ -281,7 +281,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MySQL 8 database"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
        env:
          MYSQL_VERSION: 8
      - name: "Run tests"
@@ -307,7 +307,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run PostgreSQL 13.12 database"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
          POSTGRES_VERSION: 13.12
      - name: "Run tests"
@@ -333,7 +333,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run PostgreSQL 14.9 database"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
          POSTGRES_VERSION: 14.9
      - name: "Run tests"
@@ -359,7 +359,7 @@ jobs:
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run PostgreSQL 15.4 database"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
          POSTGRES_VERSION: 15.4
      - name: "Run tests"
@@ -383,7 +383,7 @@ jobs:
      - 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
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
      - name: "Clean Maven cache"
@@ -454,7 +454,7 @@ jobs:
            echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV"
          fi
      - name: "Set up the environment"
-        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }}
      - name: "Clean Maven cache"
@@ -546,7 +546,7 @@ jobs:
      - 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
+        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
      - name: "Run tests"
        run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
--- a/amps/ags/README.md
+++ b/amps/ags/README.md
@@ -227,7 +227,7 @@ If only the Community or Enterprise images need to be built than the same comman

 The Docker images of the Repo can be started independently from Share running the following command in the rm-repo-enterprise or rm-repo-community folder which contains the Docker-compose.yml file:
 ```
-docker-compose up
+docker compose up
 ```
 > Be aware of the fact that the Share images can not be started independently from Repo

@@ -237,5 +237,5 @@ e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share

 If you have a license for jRebel then this can be used from the rm-community-share or rm-enterprise-share directories with:
 ```
-docker-compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
+docker compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
 ```
--- a/amps/ags/ci/scripts/getLogs.sh
+++ b/amps/ags/ci/scripts/getLogs.sh
@@ -4,9 +4,9 @@ set -x
 # Display running containers
 docker ps

-alfrescoContainerId=$(docker ps -a | grep '_alfresco_' | awk '{print $1}')
-shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}')
-solrContainerId=$(docker ps -a | grep '_search_' | awk '{print $1}')
+alfrescoContainerId=$(docker ps -a | grep '\-alfresco\-' | awk '{print $1}')
+shareContainerId=$(docker ps -a | grep '\-share\-' | awk '{print $1}')
+solrContainerId=$(docker ps -a | grep '\-search\-' | awk '{print $1}')

 docker logs $alfrescoContainerId > alfresco.log
 if [ -n "$shareContainerId" ]; then
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <modules>
--- 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 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <modules>
--- 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.8.1
+SOLR6_TAG=2.0.11
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -5,7 +5,7 @@
 # Version label
 version.major=23
 version.minor=2
-version.revision=0
+version.revision=2
 version.label=

 # Edition label
--- 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 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.2.0.52-SNAPSHOT</version>
+      <version>23.2.2.3</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.8.1
+SOLR6_TAG=2.0.11
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <modules>
--- a/packaging/tests/scripts/start-compose.sh
+++ b/packaging/tests/scripts/start-compose.sh
@@ -27,8 +27,8 @@ fi
 # The second parameter can be used to avoid doing a clean up if we are doing a restart test.
 if [ "$CLEAN_UP" != "no-clean-up" ]
 then
-  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill
-  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f
+  docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill
+  docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f

  export GENERATED_IMAGES=$(docker images | grep '^environment_' | awk '{ print $3 }')
  if [ -n "$GENERATED_IMAGES" ]
@@ -43,7 +43,7 @@ export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-tra
 export TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)

 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
-docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
+docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d

 if [ $? -eq 0 ]
 then
--- a/packaging/tests/scripts/stop-compose.sh
+++ b/packaging/tests/scripts/stop-compose.sh
@@ -10,8 +10,8 @@ fi

 echo "Killing ACS stack in ${DOCKER_COMPOSE_PATH}"

-docker-compose --file ${DOCKER_COMPOSE_PATH} ps
+docker compose --file ${DOCKER_COMPOSE_PATH} ps
 # logs for debug
-docker-compose --file ${DOCKER_COMPOSE_PATH} logs --no-color -t alfresco
-docker-compose --file ${DOCKER_COMPOSE_PATH} kill
-docker-compose --file ${DOCKER_COMPOSE_PATH} rm -fv
+docker compose --file ${DOCKER_COMPOSE_PATH} logs --no-color -t alfresco
+docker compose --file ${DOCKER_COMPOSE_PATH} kill
+docker compose --file ${DOCKER_COMPOSE_PATH} rm -fv
--- a/packaging/tests/scripts/wait-for-alfresco-start.sh
+++ b/packaging/tests/scripts/wait-for-alfresco-start.sh
@@ -51,7 +51,7 @@ else
   echo "Alfresco Could not start in time."
   echo "All started containers:"	
   docker ps -a	
-   ALFCONTAINER=`docker ps -a | grep _alfresco | awk '{ print $1 }'`
+   ALFCONTAINER=`docker ps -a | grep '\-alfresco' | awk '{ print $1 }'`
   echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
   docker logs --tail=200 $ALFCONTAINER
   exit 1
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>23.2.0.52-SNAPSHOT</version>
+    <version>23.2.2.3</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -25,7 +25,7 @@
    <properties>
        <acs.version.major>23</acs.version.major>
        <acs.version.minor>2</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>2</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>

@@ -51,10 +51,10 @@
        <dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
        <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
        <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-core.version>5.1.0-A1</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.1.0-A1</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>5.1.3</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.1.3</dependency.alfresco-transform-service.version>
        <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.26</dependency.acs-event-model.version>
+        <dependency.acs-event-model.version>0.0.27</dependency.acs-event-model.version>

        <dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
        <dependency.spring.version>6.0.14</dependency.spring.version>
@@ -88,7 +88,7 @@
        <dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
        <dependency.netty.version>4.1.96.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
        <dependency.activemq.version>5.18.3</dependency.activemq.version>
-        <dependency.apache-compress.version>1.25.0</dependency.apache-compress.version>
+        <dependency.apache-compress.version>1.26.0</dependency.apache-compress.version>
        <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
        <dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
        <dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
@@ -112,9 +112,9 @@
        <dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
        <dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
        <dependency.json-smart.version>2.5.0</dependency.json-smart.version>
-        <alfresco.googledrive.version>4.1.0-A1</alfresco.googledrive.version>
-        <alfresco.aos-module.version>2.0.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>23.1.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
+        <alfresco.aos-module.version>3.0.0</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>23.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
        <license-maven-plugin.version>2.0.1</license-maven-plugin.version>
@@ -151,7 +151,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>HEAD</tag>
+        <tag>23.2.2.3</tag>
    </scm>

    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.0.52-SNAPSHOT</version>
+        <version>23.2.2.3</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/transfer/HttpClientTransmitterImpl.java
@@ -53,8 +53,6 @@ import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.alfresco.service.cmr.transfer.TransferVersion;
 import org.alfresco.util.HttpClientHelper;
 import org.alfresco.util.PropertyCheck;
-import org.alfresco.util.json.ExceptionJsonSerializer;
-import org.alfresco.util.json.JsonSerializer;
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
@@ -73,8 +71,10 @@ import org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
 import org.json.JSONObject;

 /**
@@ -102,7 +102,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
    private Protocol httpsProtocol = new Protocol(HTTPS_SCHEME_NAME, (ProtocolSocketFactory) new SSLProtocolSocketFactory(), DEFAULT_HTTPS_PORT);
    private Map<String,Protocol> protocolMap = null;
    private HttpMethodFactory httpMethodFactory = null;
-    private JsonSerializer<Throwable, JSONObject> jsonErrorSerializer;

    private ContentService contentService;

@@ -125,7 +124,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
        httpClient = new HttpClient();
        httpClient.setHttpConnectionManager(new MultiThreadedHttpConnectionManager());
        httpMethodFactory = new StandardHttpMethodFactoryImpl();
-        jsonErrorSerializer = new ExceptionJsonSerializer();

        // Create an HTTP Proxy Host if appropriate system properties are set
        httpProxyHost = HttpClientHelper.createProxyHost("http.proxyHost", "http.proxyPort", DEFAULT_HTTP_PORT);
@@ -852,7 +850,27 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
     */
    private Throwable rehydrateError(JSONObject errorJSON)
    {
-        return jsonErrorSerializer.deserialize(errorJSON);
+        if (errorJSON == null)
+        {
+            return null;
+        }
+
+        String errorMessage = errorJSON.optString("errorMessage", StringUtils.EMPTY);
+        String errorId = errorJSON.optString("alfrescoMessageId", null);
+
+        Object[] errorParams = new Object[0];
+        JSONArray errorParamArray = errorJSON.optJSONArray("alfrescoMessageParams");
+        if (errorParamArray != null)
+        {
+            int length = errorParamArray.length();
+            errorParams = new Object[length];
+            for (int i = 0; i < length; ++i)
+            {
+                errorParams[i] = errorParamArray.getString(i);
+            }
+        }
+
+        return new TransferException(errorId == null ? errorMessage : errorId, errorParams);
    }

    public void setContentService(ContentService contentService)
@@ -870,11 +888,6 @@ public class HttpClientTransmitterImpl implements TransferTransmitter
        this.httpMethodFactory = httpMethodFactory;
    }

-    public void setJsonErrorSerializer(JsonSerializer<Throwable, JSONObject> jsonErrorSerializer)
-    {
-        this.jsonErrorSerializer = jsonErrorSerializer;
-    }
-
    public void setNodeService(NodeService nodeService)
    {
        this.nodeService = nodeService;
--- a/repository/src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java
+++ b/repository/src/main/java/org/alfresco/util/json/ExceptionJsonSerializer.java
@@ -42,6 +42,7 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb
 {
    private final static Log log = LogFactory.getLog(ExceptionJsonSerializer.class);

+    @Deprecated
    @Override
    public Throwable deserialize(JSONObject errorJSON)
    {
@@ -90,6 +91,9 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb
            {
                errorClass = Exception.class;
            }
+
+            if (Throwable.class.isAssignableFrom(errorClass))
+            {
                Constructor<?> constructor = null;
                try
                {
@@ -122,6 +126,7 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb
                {
                    // We don't need to do anything here. Code below will fix things up
                }
+            }
            if (createdObject == null || !Throwable.class.isAssignableFrom(createdObject.getClass()))
            {
                result = new TransferException(errorId == null ? errorMessage : errorId, errorParams);
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository

 # Schema number
-version.schema=19100
+version.schema=19102

 # Directory configuration
Author	SHA1	Message	Date
alfresco-build	016860e24f	[maven-release-plugin][skip ci] prepare release 23.2.2.3	2024-07-23 11:47:08 +00:00
Tom Page	2acf9a388d	[skip tests] PRODENG-291 Upgrade ya-pmd-scan. (cherry picked from commit `1a7027327e`)	2024-07-23 12:24:46 +01:00
alfresco-build	17f27ed1ea	[maven-release-plugin][skip ci] prepare for next development iteration	2024-07-22 14:18:23 +00:00
alfresco-build	57434af342	[maven-release-plugin][skip ci] prepare release 23.2.2.2	2024-07-22 14:18:21 +00:00
Domenico Sibilio	f33bd81dab	[skip tests] to propagate downstream	2024-07-22 16:16:06 +02:00
Domenico Sibilio	6d52fce26a	ACS-8352 Migrate to Docker Compose v2 (#2799 ) Co-authored-by: Aleksandra Onych <aleksandra.onych@hyland.com>	2024-07-22 15:07:13 +02:00
Sara	5c31515100	Bump SS/IE to 2.0.11 in 23-2 (#2758 )	2024-07-08 09:57:25 +01:00
Piotr Żurek	a1631c858d	ACS-8289 Bump ATS/AIS in ACS 23.2 (#2751 )	2024-07-06 10:14:50 +02:00
Sara	4d9d1cdb39	Merge pull request #2724 from Alfresco/feature/ACS-8287_Bump_SS-IE_in_23-2 ACS-8287 Bump SS/IE to 2.0.11-A6	2024-06-27 13:13:49 +01:00
Sara Aspery	7593e9f3ec	Bump SS/IE to 2.0.11-A6	2024-06-27 10:57:47 +01:00
alfresco-build	e33af3cf6e	[maven-release-plugin][skip ci] prepare for next development iteration	2024-06-20 16:45:24 +00:00
alfresco-build	5dab6b19bd	[maven-release-plugin][skip ci] prepare release 23.2.2.1	2024-06-20 16:45:21 +00:00
Eva Vasques	455b41107c	Trigger release and [skip tests]	2024-06-20 17:42:14 +01:00
Eva Vasques	bc31e818d5	MNT-24321 Transfer Service Exception Handling (#2573 ) (#2702 ) * Mark method deserialize in ExceptionJsonSerializer as deprecated * Remove usage of jsonErrorSerializer (cherry picked from commit `c31158a113`)	2024-06-19 17:44:27 +01:00
kcichonczyk	75f40fcdc3	[ACS-7321] ATS/AIS version bump to java11 compatible	2024-03-28 12:44:31 +01:00
mpichura	cda5e50b2a	Creating hotfix branch release/23.2 for 23.2.1 ACS release [skip ci]	2024-03-01 15:03:59 +01:00
alfresco-build	2f1668244b	[maven-release-plugin][skip ci] prepare release 23.2.0.60	2024-02-26 13:57:12 +00:00
mpichura	0934f94238	ACS-6884: Bump api-explorer version to 23.2.0 (GA)	2024-02-26 14:22:07 +01:00
alfresco-build	c700920627	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-26 07:47:45 +00:00
alfresco-build	a9ce4ea402	[maven-release-plugin][skip ci] prepare release 23.2.0.59	2024-02-26 07:47:42 +00:00
MohinishSah	fa36f29782	updating Gdrive and AOS GA version	2024-02-26 12:42:05 +05:30
alfresco-build	c64494ca05	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-23 17:32:24 +00:00
alfresco-build	52963c5f99	[maven-release-plugin][skip ci] prepare release 23.2.0.58	2024-02-23 17:32:22 +00:00
mpichura	53f5f00274	PRODDEL-7905: Bump api-explorer version to 23.2.0-A1	2024-02-23 17:56:22 +01:00
mpichura	072f475482	PRODDEL-7905: Bump api-explorer version to 23.2.0-A1	2024-02-23 17:51:26 +01:00
alfresco-build	b362029e85	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-23 07:45:52 +00:00
alfresco-build	f5438cece1	[maven-release-plugin][skip ci] prepare release 23.2.0.57	2024-02-23 07:45:50 +00:00
Kacper Magdziarz	e85d73fd26	[ACS-6773] Propagate ATS-4.1.0 (#2470 )	2024-02-23 08:10:48 +01:00
alfresco-build	59506dfe7d	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-21 11:49:34 +00:00
alfresco-build	dea6049bc0	[maven-release-plugin][skip ci] prepare release 23.2.0.56	2024-02-21 11:49:32 +00:00
Domenico Sibilio	7a64964644	Bump org.apache.commons:commons-compress from 1.25.0 to 1.26.0 (#2454 ) (#2464 ) Bumps org.apache.commons:commons-compress from 1.25.0 to 1.26.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-02-21 12:14:44 +01:00
alfresco-build	3d2bfe6b08	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-21 07:54:36 +00:00
alfresco-build	01ec63cf33	[maven-release-plugin][skip ci] prepare release 23.2.0.55	2024-02-21 07:54:33 +00:00
rrajoria	05425e3cbe	Update googledrive to 4.1.0-A2	2024-02-21 12:39:15 +05:30
alfresco-build	2a80d17c9d	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-20 14:09:13 +00:00
alfresco-build	e7ea900096	[maven-release-plugin][skip ci] prepare release 23.2.0.54	2024-02-20 14:09:10 +00:00
Krystian Dabrowski	89847d260d	ACS-6113: Fix secondary parents to never be set to null (#2460 ) (#2461 ) (cherry picked from commit `859492ae1e`)	2024-02-20 14:12:56 +01:00
alfresco-build	0bb31fe4ba	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-20 12:53:37 +00:00
alfresco-build	4e2d3e899a	[maven-release-plugin][skip ci] prepare release 23.2.0.53	2024-02-20 12:53:34 +00:00
Damian Ujma	72965f81a8	ACS-6601 Bump AOS to 3.0.0-A1 (#2458 )	2024-02-20 13:16:46 +01:00
alfresco-build	7d84505c44	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-20 06:34:28 +00:00
alfresco-build	c5a753ebb8	[maven-release-plugin][skip ci] prepare release 23.2.0.52	2024-02-20 06:34:26 +00:00
rrajoria	24236be595	Revert googledrive version to 4.0.0	2024-02-20 11:28:12 +05:30
mpichura	5d0055d9aa	Creating release branch release/stabilization/23.2 for 23.2.0 ACS release [skip ci]	2024-02-19 16:33:50 +01:00