Compare commits

...

11 Commits

Author SHA1 Message Date
Aleksandra Onych
d6dc495335 [ACS-8670] bump actions to latest version (#1616) 2024-09-20 10:41:35 +02:00
alfresco-build
ebea46410b [maven-release-plugin][skip ci] prepare for next development iteration 2024-07-26 13:50:47 +00:00
alfresco-build
1119822c8e [maven-release-plugin][skip ci] prepare release 7.2.2.4 2024-07-26 13:50:46 +00:00
alfresco-build
38a18003fb [release][publish] 7.2.2.4
Update upstream versions
    - alfresco-community-repo:   16.28
    - alfresco-enterprise-share: 16.29
    - acs-packaging:             7.2.2.4
    - RELEASE_VERSION:           7.2.2.4
    - DEVELOPMENT_VERSION:       7.2.2.5-SNAPSHOT
2024-07-26 13:03:15 +00:00
Aleksandra Onych
3b9f2afd9b [ACS-8352] Migrate to docker compose v2 (#1578) 2024-07-10 10:03:38 +02:00
Sara
3c57b029f5 Bump SS/IE to 2.0.11 in 7-2-2 (#1572) 2024-07-08 17:18:06 +01:00
Kacper Magdziarz
a6d0b9f695 [ACS-8287] Bump SS/IE to 2.0.11-A6 (#1564) 2024-06-27 14:14:00 +02:00
Kacper Magdziarz
d9413ff941 Create HotFix branch for 7.2.2 [skip ci] 2024-05-24 16:23:13 +02:00
alfresco-build
11ea2200df [maven-release-plugin][skip ci] prepare release 7.2.2 2024-05-24 14:17:03 +00:00
alfresco-build
24699e42a2 [release][publish] 7.2.2
Update upstream versions
    - alfresco-community-repo:   16.21
    - alfresco-enterprise-share: 16.22
    - acs-packaging:             7.2.2
    - RELEASE_VERSION:           7.2.2
    - DEVELOPMENT_VERSION:       7.2.3-A2-SNAPSHOT
2024-05-24 13:46:30 +00:00
alfresco-build
61f468eb99 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-20 18:13:06 +00:00
25 changed files with 55 additions and 55 deletions

View File

@@ -30,8 +30,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.2.2-A4
DEVELOPMENT_VERSION: 7.2.2-A5-SNAPSHOT
RELEASE_VERSION: 7.2.2.4
DEVELOPMENT_VERSION: 7.2.2.5-SNAPSHOT
jobs:
tas_tests:
@@ -79,9 +79,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
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
@@ -103,9 +103,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
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
@@ -131,10 +131,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
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
@@ -158,12 +158,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
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
@@ -180,7 +180,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 }}
@@ -201,10 +201,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 }}

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

View File

@@ -64,7 +64,7 @@ alias comXS='comS && comP'
# Clean up of docker images and content stores (alf_data directories)
alias drm='docker rm -f $(docker ps -q)'
alias arm='rm -rf `find . -name alf_data`'
alias envUp='docker-compose -f acs-community-packaging/dev/docker-compose.yml up'
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 envUp='docker compose -f acs-community-packaging/dev/docker-compose.yml up'
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'

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -25,7 +25,7 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.10
image: alfresco/alfresco-search-services:2.0.11
mem_limit: 2g
environment:
#Solr needs to know how to register itself with Alfresco

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
</project>

12
pom.xml
View File

@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>16.21</version>
<version>16.28</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>16.21</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>16.21</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.2.2-A4</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>16.28</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>16.29</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.2.2.4</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.2.2-A4</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>

View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=5.1.2
SOLR6_TAG=2.0.10
SOLR6_TAG=2.0.11
POSTGRES_TAG=13.3
ACTIVEMQ_TAG=5.16.1

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.2.2-A4</version>
<version>7.2.2.5-SNAPSHOT</version>
</parent>
<developers>