Compare commits

...

31 Commits

Author SHA1 Message Date
alfresco-build
cf2aee3bb8 [maven-release-plugin][skip ci] prepare release 7.4.0-M3 2023-03-07 08:58:24 +00:00
alfresco-build
105e605060 [release] 7.4.0-M3
Update upstream versions
    - alfresco-community-repo:   20.90
    - alfresco-enterprise-share: 20.84
    - acs-packaging:             7.4.0-M3
    - RELEASE_VERSION:           7.4.0-M3
    - DEVELOPMENT_VERSION:       7.4.0-A19-SNAPSHOT
2023-03-07 08:19:44 +00:00
alfresco-build
d4f0de607f [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-05 01:49:20 +00:00
alfresco-build
2ee42e98fa [maven-release-plugin][skip ci] prepare release 7.4.0-A18 2023-03-05 01:49:18 +00:00
alfresco-build
77e687ced5 [release] 7.4.0-A18
Update upstream versions
    - alfresco-community-repo:   20.90
    - alfresco-enterprise-share: 20.82
    - acs-packaging:             7.4.0-A18
    - RELEASE_VERSION:           7.4.0-A18
    - DEVELOPMENT_VERSION:       7.4.0-A19-SNAPSHOT
2023-03-05 01:10:43 +00:00
alfresco-build
d1e5759949 [maven-release-plugin][skip ci] prepare for next development iteration 2023-03-02 10:26:16 +00:00
alfresco-build
52d988ba94 [maven-release-plugin][skip ci] prepare release 7.4.0-A17 2023-03-02 10:26:13 +00:00
alfresco-build
bddf020b32 [release] 7.4.0-A17
Update upstream versions
    - alfresco-community-repo:   20.89
    - alfresco-enterprise-share: 20.81
    - acs-packaging:             7.4.0-A17
    - RELEASE_VERSION:           7.4.0-A17
    - DEVELOPMENT_VERSION:       7.4.0-A18-SNAPSHOT
2023-03-02 09:48:42 +00:00
alfresco-build
2607293ad0 [maven-release-plugin][skip ci] prepare for next development iteration 2023-02-27 10:18:28 +00:00
alfresco-build
5501eca6a0 [maven-release-plugin][skip ci] prepare release 7.4.0-A16 2023-02-27 10:18:25 +00:00
alfresco-build
5e0598215b [release] 7.4.0-A16
Update upstream versions
    - alfresco-community-repo:   20.88
    - alfresco-enterprise-share: 20.79
    - acs-packaging:             7.4.0-A16
    - RELEASE_VERSION:           7.4.0-A16
    - DEVELOPMENT_VERSION:       7.4.0-A17-SNAPSHOT
2023-02-27 09:38:54 +00:00
alfresco-build
b6ee5f0b69 [maven-release-plugin][skip ci] prepare for next development iteration 2023-02-27 04:11:01 +00:00
alfresco-build
80451f8f0f [maven-release-plugin][skip ci] prepare release 7.4.0-A15 2023-02-27 04:10:59 +00:00
alfresco-build
7075152c76 [release] 7.4.0-A15
Update upstream versions
    - alfresco-community-repo:   20.88
    - alfresco-enterprise-share: 20.79
    - acs-packaging:             7.4.0-A15
    - RELEASE_VERSION:           7.4.0-A15
    - DEVELOPMENT_VERSION:       7.4.0-A16-SNAPSHOT
2023-02-27 03:32:34 +00:00
alfresco-build
7657d51662 [maven-release-plugin][skip ci] prepare for next development iteration 2023-02-25 17:10:36 +00:00
alfresco-build
a7d56d4a8c [maven-release-plugin][skip ci] prepare release 7.4.0-A14 2023-02-25 17:10:34 +00:00
alfresco-build
95108ed7c0 [release] 7.4.0-A14
Update upstream versions
    - alfresco-community-repo:   20.87
    - alfresco-enterprise-share: 20.77
    - acs-packaging:             7.4.0-A14
    - RELEASE_VERSION:           7.4.0-A14
    - DEVELOPMENT_VERSION:       7.4.0-A15-SNAPSHOT
2023-02-25 16:29:07 +00:00
Damian Ujma
aab83d25f1 ACS-3750 Fix cancelled workflow condition (#1507) 2023-02-23 16:13:30 +01:00
alfresco-build
297605e8a8 [maven-release-plugin][skip ci] prepare for next development iteration 2023-02-22 07:33:37 +00:00
alfresco-build
846732c458 [maven-release-plugin][skip ci] prepare release 7.4.0-A13 2023-02-22 07:33:35 +00:00
alfresco-build
6baeff690f [release] 7.4.0-A13
Update upstream versions
    - alfresco-community-repo:   20.85
    - alfresco-enterprise-share: 20.68
    - acs-packaging:             7.4.0-A13
    - RELEASE_VERSION:           7.4.0-A13
    - DEVELOPMENT_VERSION:       7.4.0-A14-SNAPSHOT
2023-02-22 06:51:22 +00:00
alfresco-build
223133728a [maven-release-plugin][skip ci] prepare for next development iteration 2023-02-21 12:21:49 +00:00
alfresco-build
c4815a4aad [maven-release-plugin][skip ci] prepare release 7.4.0-A12 2023-02-21 12:21:47 +00:00
alfresco-build
f7d5854a19 [release] 7.4.0-A12
Update upstream versions
    - alfresco-community-repo:   20.85
    - alfresco-enterprise-share: 20.63
    - acs-packaging:             7.4.0-A12
    - RELEASE_VERSION:           7.4.0-A12
    - DEVELOPMENT_VERSION:       7.4.0-A13-SNAPSHOT
2023-02-21 10:38:36 +00:00
Domenico Sibilio
4837d2bf23 ACS-3750 Use set Git token instead of cached one (#1505) 2023-02-07 16:41:53 +01:00
Domenico Sibilio
44cb44db9f ACS-3750 Improve branch detection in if conditions (#1503) 2023-02-02 15:47:34 +01:00
Domenico Sibilio
7afc54a81f ACS-4455 Bump alfresco-build-tools to v1.33.0 (#1502) 2023-01-31 14:58:06 +01:00
alfresco-build
929ae95c0f [maven-release-plugin][skip ci] prepare for next development iteration 2023-01-23 21:02:11 +00:00
alfresco-build
4580ed339d [maven-release-plugin][skip ci] prepare release 7.4.0-M2 2023-01-23 21:02:09 +00:00
alfresco-build
c92951f4d1 [release] 7.4.0-M2
Update upstream versions
    - alfresco-community-repo:   20.64
    - alfresco-enterprise-share: 20.45
    - acs-packaging:             7.4.0-M2
    - RELEASE_VERSION:           7.4.0-M2
    - DEVELOPMENT_VERSION:       7.4.0-A12-SNAPSHOT
2023-01-23 19:49:37 +00:00
alfresco-build
6e28c92f35 [maven-release-plugin][skip ci] prepare for next development iteration 2023-01-17 20:14:48 +00:00
23 changed files with 44 additions and 43 deletions

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.4.0-....) for the docker image to build successfully.
RELEASE_VERSION: 7.4.0-A11
DEVELOPMENT_VERSION: 7.4.0-A12-SNAPSHOT
RELEASE_VERSION: 7.4.0-M3
DEVELOPMENT_VERSION: 7.4.0-A19-SNAPSHOT
jobs:
tas_tests:
@@ -79,8 +79,8 @@ jobs:
compose-file: docker-compose-minimal.yml
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -101,8 +101,8 @@ jobs:
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.30.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -121,14 +121,14 @@ jobs:
runs-on: ubuntu-latest
needs: [tas_tests, community_zip_tests]
if: >
!failure() &&
!(failure() || cancelled()) &&
!contains(github.event.head_commit.message, '[skip docker_latest]') &&
(github.ref_name == 'master' || contains(github.ref_name, 'release/')) &&
(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.30.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -145,14 +145,16 @@ jobs:
runs-on: ubuntu-latest
needs: [docker_latest]
if: >
!failure() &&
!(failure() || cancelled()) &&
contains(github.event.head_commit.message, '[release]') &&
(github.ref_name == 'master' || contains(github.ref_name, 'release/')) &&
(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.30.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
with:
persist-credentials: false
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -183,13 +185,13 @@ jobs:
runs-on: ubuntu-latest
needs: [release]
if: >
!failure() &&
!(failure() || cancelled()) &&
contains(github.event.head_commit.message, '[publish]') &&
(github.ref_name == 'master' || contains(github.ref_name, 'release/')) &&
(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.30.0
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- name: "Configure AWS credentials"
uses: aws-actions/configure-aws-credentials@v1
with:

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<dependencies>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</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.4.0-A11</version>
<version>7.4.0-M3</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>20.61</version>
<version>20.90</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>20.61</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>20.43</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.4.0-A11</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>20.90</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>20.84</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.4.0-M3</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.4.0-A11</tag>
<tag>7.4.0-M3</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<packaging>pom</packaging>

View File

@@ -5,7 +5,6 @@ set -vex
pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
# Maven Setup
mkdir -p "${HOME}/.m2" && cp -f .github/.ci.settings.xml "${HOME}/.m2/settings.xml"
find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
# Docker Logins

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0-A11</version>
<version>7.4.0-M3</version>
</parent>
<developers>