mirror of
				https://github.com/Alfresco/alfresco-community-repo.git
				synced 2025-10-29 15:21:53 +00:00 
			
		
		
		
	Compare commits
	
		
			44 Commits
		
	
	
		
			feature/AC
			...
			23.2.2.3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 016860e24f | ||
|  | 2acf9a388d | ||
|  | 17f27ed1ea | ||
|  | 57434af342 | ||
|  | f33bd81dab | ||
|  | 6d52fce26a | ||
|  | 5c31515100 | ||
|  | a1631c858d | ||
|  | 4d9d1cdb39 | ||
|  | 7593e9f3ec | ||
|  | e33af3cf6e | ||
|  | 5dab6b19bd | ||
|  | 455b41107c | ||
|  | bc31e818d5 | ||
|  | 75f40fcdc3 | ||
|  | cda5e50b2a | ||
|  | 2f1668244b | ||
|  | 0934f94238 | ||
|  | c700920627 | ||
|  | a9ce4ea402 | ||
|  | fa36f29782 | ||
|  | c64494ca05 | ||
|  | 52963c5f99 | ||
|  | 53f5f00274 | ||
|  | 072f475482 | ||
|  | b362029e85 | ||
|  | f5438cece1 | ||
|  | e85d73fd26 | ||
|  | 59506dfe7d | ||
|  | dea6049bc0 | ||
|  | 7a64964644 | ||
|  | 3d2bfe6b08 | ||
|  | 01ec63cf33 | ||
|  | 05425e3cbe | ||
|  | 2a80d17c9d | ||
|  | e7ea900096 | ||
|  | 89847d260d | ||
|  | 0bb31fe4ba | ||
|  | 4e2d3e899a | ||
|  | 72965f81a8 | ||
|  | 7d84505c44 | ||
|  | c5a753ebb8 | ||
|  | 24236be595 | ||
|  | 5d0055d9aa | 
							
								
								
									
										22
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -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" | ||||
|   | ||||
| @@ -71,7 +71,7 @@ the _alfresco-internal_ repository: | ||||
|    </snapshots> | ||||
| </repository> | ||||
| ``` | ||||
|   | ||||
|  | ||||
|  | ||||
| For additional instructions you can check the official Maven documentation: | ||||
| * [setting up repositories](https://maven.apache.org/guides/mini/guide-multiple-repositories.html) | ||||
| @@ -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 | ||||
| ``` | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
| # Version label | ||||
| version.major=23 | ||||
| version.minor=2 | ||||
| version.revision=0 | ||||
| version.revision=2 | ||||
| version.label= | ||||
|  | ||||
| # Edition label | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
							
								
								
									
										20
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -41,7 +41,8 @@ import org.json.JSONObject; | ||||
| public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONObject> | ||||
| { | ||||
|     private final static Log log = LogFactory.getLog(ExceptionJsonSerializer.class); | ||||
|      | ||||
|  | ||||
|     @Deprecated | ||||
|     @Override | ||||
|     public Throwable deserialize(JSONObject errorJSON) | ||||
|     { | ||||
| @@ -89,38 +90,42 @@ public class ExceptionJsonSerializer implements JsonSerializer<Throwable, JSONOb | ||||
|             catch (ClassNotFoundException e) | ||||
|             { | ||||
|                 errorClass = Exception.class; | ||||
|             } | ||||
|             Constructor<?> constructor = null; | ||||
|             try | ||||
|             { | ||||
|                 try | ||||
|                 { | ||||
|                     constructor = errorClass.getConstructor(String.class, Object[].class); | ||||
|                     createdObject = constructor.newInstance(errorId, errorParams); | ||||
|                 } | ||||
|                 catch (NoSuchMethodException e) | ||||
|                 { | ||||
|                     try | ||||
|                     { | ||||
|                         constructor = errorClass.getConstructor(String.class); | ||||
|                         createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId); | ||||
|                     } | ||||
|                     catch (NoSuchMethodException e1) | ||||
|                     { | ||||
|                         try | ||||
|                         { | ||||
|                             constructor = errorClass.getConstructor(); | ||||
|                             createdObject = constructor.newInstance(); | ||||
|                         } | ||||
|                         catch (NoSuchMethodException e2) | ||||
|                         { | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|             catch(Exception ex) | ||||
|             { | ||||
|                 //We don't need to do anything here. Code below will fix things up | ||||
|             } | ||||
|  | ||||
|             if (Throwable.class.isAssignableFrom(errorClass)) | ||||
|             { | ||||
|                 Constructor<?> constructor = null; | ||||
|                 try | ||||
|                 { | ||||
|                     try | ||||
|                     { | ||||
|                         constructor = errorClass.getConstructor(String.class, Object[].class); | ||||
|                         createdObject = constructor.newInstance(errorId, errorParams); | ||||
|                     } | ||||
|                     catch (NoSuchMethodException e) | ||||
|                     { | ||||
|                         try | ||||
|                         { | ||||
|                             constructor = errorClass.getConstructor(String.class); | ||||
|                             createdObject = constructor.newInstance(errorId == null ? errorMessage : errorId); | ||||
|                         } | ||||
|                         catch (NoSuchMethodException e1) | ||||
|                         { | ||||
|                             try | ||||
|                             { | ||||
|                                 constructor = errorClass.getConstructor(); | ||||
|                                 createdObject = constructor.newInstance(); | ||||
|                             } | ||||
|                             catch (NoSuchMethodException e2) | ||||
|                             { | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|                 catch (Exception ex) | ||||
|                 { | ||||
|                     // We don't need to do anything here. Code below will fix things up | ||||
|                 } | ||||
|             } | ||||
|             if (createdObject == null || !Throwable.class.isAssignableFrom(createdObject.getClass())) | ||||
|             { | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| repository.name=Main Repository | ||||
|  | ||||
| # Schema number | ||||
| version.schema=19100 | ||||
| version.schema=19102 | ||||
|  | ||||
| # Directory configuration | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user