Compare commits

..
Author SHA1 Message Date
alfresco-build 764bf55ae8 [maven-release-plugin][skip ci] prepare for next development iteration 2025-02-06 12:31:06 +00:00
alfresco-build 35cc81c1c0 [maven-release-plugin][skip ci] prepare release 7.3.3-A1 2025-02-06 12:31:01 +00:00
alfresco-build e7e3c9bee8 [release] 7.3.3-A1
Update upstream versions
    - alfresco-community-repo:   19.109
    - alfresco-enterprise-share: 19.105
    - acs-packaging:             7.3.3-A1
    - RELEASE_VERSION:           7.3.3-A1
    - DEVELOPMENT_VERSION:       7.3.3-A2-SNAPSHOT
2025-02-06 11:52:27 +00:00
Aleksandra Onych 5962482c47 ACS-8670 Deal with upcoming GitHub Actions deprecations (#1619) 2024-09-20 11:59:27 +02:00
Aleksandra Onych d65f0fc2b6 [ACS-8352] Migrate to docker compose v2 (#1577) 2024-07-10 10:03:32 +02:00
Sara 6ed8a500be Bump SS/IE to 2.0.11 in 7-3-N (#1570) 2024-07-08 12:01:41 +01:00
Kacper Magdziarz 0ae578427c [ACS-8287] Bump SS/IE to 2.0.11-A6 (#1563) 2024-06-27 14:13:51 +02:00
alfresco-build 4f7e108126 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-24 09:29:57 +00:00
alfresco-build b99955aed5 [maven-release-plugin][skip ci] prepare release 7.3.2 2024-05-24 09:29:55 +00:00
alfresco-build e2100ffc95 [release][publish] 7.3.2
Update upstream versions
    - alfresco-community-repo:   19.18
    - alfresco-enterprise-share: 19.13
    - acs-packaging:             7.3.2
    - RELEASE_VERSION:           7.3.2
    - DEVELOPMENT_VERSION:       7.3.3-A1-SNAPSHOT
2024-05-24 08:45:51 +00:00
alfresco-build e23c80d0e3 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-14 10:15:34 +00:00
alfresco-build 00bb174bab [maven-release-plugin][skip ci] prepare release 7.3.2-A5 2024-05-14 10:15:32 +00:00
alfresco-build 7cba2f668d [release] 7.3.2-A5
Update upstream versions
    - alfresco-community-repo:   19.17
    - alfresco-enterprise-share: 19.9
    - acs-packaging:             7.3.2-A5
    - RELEASE_VERSION:           7.3.2-A5
    - DEVELOPMENT_VERSION:       7.3.2-SNAPSHOT
2024-05-14 09:42:56 +00:00
alfresco-build be5c9b0f94 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-10 12:44:02 +00:00
alfresco-build 110dbd7291 [maven-release-plugin][skip ci] prepare release 7.3.2-A4 2024-05-10 12:44:00 +00:00
alfresco-build ba6bf40ebe [release] 7.3.2-A4
Update upstream versions
    - alfresco-community-repo:   19.17
    - alfresco-enterprise-share: 19.8
    - acs-packaging:             7.3.2-A4
    - RELEASE_VERSION:           7.3.2-A4
    - DEVELOPMENT_VERSION:       7.3.2-SNAPSHOT
2024-05-10 11:41:58 +00:00
alfresco-build 7f35da3159 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-24 11:26:00 +00:00
26 changed files with 55 additions and 55 deletions
+20 -20
View File
@@ -29,8 +29,8 @@ env:
TAS_ENVIRONMENT: ./tests/environment
TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
# Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
RELEASE_VERSION: 7.3.2-A3
DEVELOPMENT_VERSION: 7.3.2-SNAPSHOT
RELEASE_VERSION: 7.3.3-A1
DEVELOPMENT_VERSION: 7.3.3-A2-SNAPSHOT
jobs:
tas_tests:
@@ -78,9 +78,9 @@ jobs:
profiles: all-tas-tests
compose-file: docker-compose-minimal.yml
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
- uses: actions/checkout@v4
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -100,9 +100,9 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip tests]')"
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
- uses: actions/checkout@v4
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -126,10 +126,10 @@ jobs:
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- 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.33.0
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -151,12 +151,12 @@ jobs:
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- 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.33.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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -171,7 +171,7 @@ jobs:
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
- name: "Configure AWS credentials"
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_S3_STAGING_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_S3_STAGING_SECRET_KEY }}
@@ -192,10 +192,10 @@ jobs:
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: actions/checkout@v4
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
- name: "Configure AWS credentials"
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_S3_RELEASE_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_S3_RELEASE_SECRET_ACCESS_KEY }}
+4 -4
View File
@@ -66,9 +66,9 @@ The repository code will need to talk to other ACS components, such as a databas
The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
~~~
# The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
the `docker-compose` command.
the `docker compose` command.
cd acs-community-packaging
docker-compose -f dev/docker-compose.yml up
docker compose -f dev/docker-compose.yml up
Creating dev_activemq_1 ... done
Creating dev_solr6_1 ... done
Creating dev_postgres_1 ... done
@@ -121,12 +121,12 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
When finished, kill the tomcat instance and stop the Docker instances. You will normally also
remove the Docker containers, as you will need a clean database if you are going to issue
another `mvn clean install` command. If you started `docker-compose` in a separate terminal session,
simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`.
simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`.
~~~
^C
... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
docker-compose -f dev/docker-compose.yml rm
docker compose -f dev/docker-compose.yml rm
Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
Are you sure? [yN] y
Removing dev_transform-core-aio_1 ... done
+3 -3
View File
@@ -65,6 +65,6 @@ alias comXS='comS && comP'
alias drm='docker rm -f $(docker ps -q)'
alias arm='rm -rf `find . -name alf_data`'
alias envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
alias envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'
alias envStop='docker compose -f acs-community-packaging/dev/docker-compose.yml stop'
alias envKill='docker compose -f acs-community-packaging/dev/docker-compose.yml kill'
alias envRm='docker compose -f acs-community-packaging/dev/docker-compose.yml rm'
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<build>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<build>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -25,7 +25,7 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.3
image: alfresco/alfresco-search-services:2.0.11
mem_limit: 2g
environment:
#Solr needs to know how to register itself with Alfresco
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<dependencies>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<dependencies>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
</project>
+6 -6
View File
@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>19.8</version>
<version>19.109</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>19.8</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>19.5</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.3.2-A3</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>19.109</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>19.105</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.3.3-A1</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
<share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
@@ -25,7 +25,7 @@
<connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
<url>https://github.com/Alfresco/acs-community-packaging</url>
<tag>7.3.2-A3</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
+1 -1
View File
@@ -2,4 +2,4 @@ set -x
export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
# .env files are picked up from project directory correctly on docker-compose 1.23.0+
docker-compose -f acs-community-packaging/dev/docker-compose.yml up
docker compose -f acs-community-packaging/dev/docker-compose.yml up
+1 -1
View File
@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.3
SOLR6_TAG=2.0.11
POSTGRES_TAG=14.4
ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<modules>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<properties>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A3</version>
<version>7.3.3-A2-SNAPSHOT</version>
</parent>
<developers>