Compare commits

...

40 Commits

Author SHA1 Message Date
Travis CI User
1143cd1015 [maven-release-plugin][skip ci] prepare release 7.3.0-A5 2022-06-12 02:47:06 +00:00
Travis CI User
d7ce21b3b4 [release] 7.3.0-A5
Update upstream versions
    - alfresco-community-repo:   17.13
    - alfresco-enterprise-share: 17.14
    - acs-packaging:             7.3.0-A5
    - RELEASE_VERSION:           7.3.0-A5
    - DEVELOPMENT_VERSION:       7.3.0-A6-SNAPSHOT
2022-06-12 01:47:03 +00:00
Travis CI User
a94a03cb59 [maven-release-plugin][skip ci] prepare for next development iteration 2022-06-05 02:40:18 +00:00
Travis CI User
54fc25409e [maven-release-plugin][skip ci] prepare release 7.3.0-A4 2022-06-05 02:40:17 +00:00
Travis CI User
ab4bc47a07 [release] 7.3.0-A4
Update upstream versions
    - alfresco-community-repo:   17.11
    - alfresco-enterprise-share: 17.12
    - acs-packaging:             7.3.0-A4
    - RELEASE_VERSION:           7.3.0-A4
    - DEVELOPMENT_VERSION:       7.3.0-A5-SNAPSHOT
2022-06-05 01:41:04 +00:00
Travis CI User
a85d57402c [maven-release-plugin][skip ci] prepare for next development iteration 2022-06-02 17:39:08 +00:00
Travis CI User
c26fb7d27d [maven-release-plugin][skip ci] prepare release 7.3.0-A3 2022-06-02 17:39:06 +00:00
Travis CI User
170dfeeecd [release] 7.3.0-A3
Update upstream versions
    - alfresco-community-repo:   17.10
    - alfresco-enterprise-share: 17.11
    - acs-packaging:             7.3.0-A3
    - RELEASE_VERSION:           7.3.0-A3
    - DEVELOPMENT_VERSION:       7.3.0-A4-SNAPSHOT
2022-06-02 16:39:33 +00:00
Travis CI User
ebe30818e2 [maven-release-plugin][skip ci] prepare for next development iteration 2022-05-30 10:17:20 +00:00
Travis CI User
1d8123d735 [maven-release-plugin][skip ci] prepare release 7.3.0-A2 2022-05-30 10:17:17 +00:00
Travis CI User
cfa9c4886a [release] 7.3.0-A2
Update upstream versions
    - alfresco-community-repo:   17.6
    - alfresco-enterprise-share: 17.9
    - acs-packaging:             7.3.0-A2
    - RELEASE_VERSION:           7.3.0-A2
    - DEVELOPMENT_VERSION:       7.3.0-A3-SNAPSHOT
2022-05-29 01:44:51 +00:00
Travis CI User
de8511e396 [maven-release-plugin][skip ci] prepare for next development iteration 2022-05-23 10:27:53 +00:00
Travis CI User
55368b5254 [maven-release-plugin][skip ci] prepare release 7.3.0-A1 2022-05-23 10:27:51 +00:00
Travis CI User
db4f20e2f5 [release] 7.3.0-A1
Update upstream versions
    - alfresco-community-repo:   17.2
    - alfresco-enterprise-share: 17.3
    - acs-packaging:             7.3.0-A1
    - RELEASE_VERSION:           7.3.0-A1
    - DEVELOPMENT_VERSION:       7.3.0-A2-SNAPSHOT
2022-05-23 09:28:52 +00:00
alandavis
b19f892689 Use 17.1 for ACS 7.3.0 2022-05-23 10:06:46 +01:00
alandavis
34d1221ef7 Stop incrementing version in copy, verify and release scripts [skip ci] 2022-05-19 12:22:46 +01:00
alandavis
c439b51275 Change Master branch to 7.3.0 [skip ci] 2022-05-19 12:09:11 +01:00
Domenico Sibilio
0041f25619 Fix broken 'envUp' alias 2022-05-04 13:00:17 +02:00
Travis CI User
180e3a353a [maven-release-plugin][skip ci] prepare for next development iteration 2022-04-26 16:16:05 +00:00
Travis CI User
dbaa53d12e [maven-release-plugin][skip ci] prepare release 23.1.0-M1 2022-04-26 16:16:03 +00:00
Travis CI User
4e2bca8799 [release] 23.1.0-M1
Update upstream versions
    - alfresco-community-repo:   23.1.0.24
    - alfresco-enterprise-share: 23.1.0.19
    - acs-packaging:             23.1.0-M1
    - RELEASE_VERSION:           23.1.0-M1
    - DEVELOPMENT_VERSION:       23.1.0-SNAPSHOT
2022-04-26 14:31:20 +00:00
alandavis
dfe6a27785 ACS-2768 tidy up start-compose.sh 2022-04-26 12:33:47 +01:00
Travis CI User
120b5df54e [release] 23.1.0-A5
Update upstream versions
    - alfresco-community-repo:   23.1.0.24
    - alfresco-enterprise-share: 23.1.0.18
    - acs-packaging:             23.1.0-A5
    - RELEASE_VERSION:           23.1.0-A5
    - DEVELOPMENT_VERSION:       23.1.0-A6-SNAPSHOT
2022-04-24 03:01:44 +00:00
Kacper Magdziarz
298c55e75c ACS-2768 Fix of Automate update of t-router and t-engine references in repositories (#1473) 2022-04-21 23:36:33 +01:00
Travis CI User
6f604e8b36 [maven-release-plugin][skip ci] prepare for next development iteration 2022-04-15 17:05:57 +00:00
Travis CI User
c6813e5831 [maven-release-plugin][skip ci] prepare release 23.1.0-A4 2022-04-15 17:05:55 +00:00
Travis CI User
455e01276f [release] 23.1.0-A4
Update upstream versions
    - alfresco-community-repo:   23.1.0.17
    - alfresco-enterprise-share: 23.1.0.13
    - acs-packaging:             23.1.0-A4
    - RELEASE_VERSION:           23.1.0-A4
    - DEVELOPMENT_VERSION:       23.1.0-A5-SNAPSHOT
2022-04-15 15:20:21 +00:00
Travis CI User
fe5cffe9eb [maven-release-plugin][skip ci] prepare for next development iteration 2022-04-14 13:35:16 +00:00
Travis CI User
713683fcbe [maven-release-plugin][skip ci] prepare release 23.1.0-A3 2022-04-14 13:35:14 +00:00
Travis CI User
928cab113c [release] 23.1.0-A3
Update upstream versions
    - alfresco-community-repo:   23.1.0.17
    - alfresco-enterprise-share: 23.1.0.12
    - acs-packaging:             23.1.0-A3
    - RELEASE_VERSION:           23.1.0-A3
    - DEVELOPMENT_VERSION:       23.1.0-A4-SNAPSHOT
2022-04-14 11:52:19 +00:00
alandavis
8e3309825d Pick up t-core 2.6.0-A3 2022-04-13 19:45:50 +01:00
alandavis
ce00290c4a ACS-2765 Upgrade to t-core 2.5.7 2022-04-06 12:06:43 +01:00
Travis CI User
4867fc3184 [maven-release-plugin][skip ci] prepare for next development iteration 2022-04-04 13:18:52 +00:00
Travis CI User
dd2e4cef45 [maven-release-plugin][skip ci] prepare release 23.1.0-A2 2022-04-04 13:18:50 +00:00
Travis CI User
e3b92fc5be [release] 23.1.0-A2
Update upstream versions
    - alfresco-community-repo:   23.1.0.6
    - alfresco-enterprise-share: 23.1.0.6
    - acs-packaging:             23.1.0-A2
    - RELEASE_VERSION:           23.1.0-A2
    - DEVELOPMENT_VERSION:       23.1.0-A3-SNAPSHOT
2022-04-04 11:32:48 +00:00
Travis CI User
ab26a06320 [release] 23.1.0-A1
Update upstream versions
    - alfresco-community-repo:   23.1.0.4
    - alfresco-enterprise-share: 23.1.0.3
    - acs-packaging:             23.1.0-A1
    - RELEASE_VERSION:           23.1.0-A1
    - DEVELOPMENT_VERSION:       23.1.0-A2-SNAPSHOT
2022-03-27 04:21:13 +00:00
alandavis
ad3f81a228 Update upstream versions
- alfresco-community-repo:   23.1.0.2
    - alfresco-enterprise-share: 23.1.0.1
2022-03-23 15:00:02 +00:00
alandavis
6542cb450f Switch messages and comments to 23.1.0 from 7.2.0 [skip ci] 2022-03-21 16:00:22 +00:00
alandavis
d0f5c71fbd Switch messages and comments to 23.1.0 from 7.2.0 [skip ci] 2022-03-21 15:59:58 +00:00
alandavis
c80456ab22 Switch master branch ready for 23.1.0 development
[skip ci] wait for manual build
2022-03-21 12:49:47 +00:00
29 changed files with 39 additions and 35 deletions

View File

@@ -28,9 +28,9 @@ env:
global:
- TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
- TAS_ENVIRONMENT=./tests/environment
# Release version has to start with real version (7.2.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.2.0
- DEVELOPMENT_VERSION=23.1.0-A1-SNAPSHOT
# Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.3.0-A5
- DEVELOPMENT_VERSION=7.3.0-A6-SNAPSHOT
stages:
- name: test

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 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'

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -6,7 +6,7 @@ version: "2"
services:
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.5.7
image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
mem_limit: 1536m
environment:
JAVA_OPTS: " -Xms256m -Xmx1536m"

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<dependencies>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</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>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>14.145</version>
<version>17.13</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>14.145</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>14.96</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.2.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>17.13</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>17.14</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.3.0-A5</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>HEAD</tag>
<tag>7.3.0-A5</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<packaging>pom</packaging>

5
scripts/dev/start-compose.sh Executable file
View File

@@ -0,0 +1,5 @@
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

View File

@@ -8,7 +8,7 @@ set -vex
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.2.0-EA or 7.2.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
exit 1
fi

View File

@@ -8,7 +8,7 @@ set -vex
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.2.0-EA or 7.2.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
exit 1
fi

View File

@@ -6,7 +6,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.2.0-EA or 7.2.0-SNAPSHOT)"
echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
exit 1
fi

View File

@@ -9,7 +9,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.2.0-EA or 7.2.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
exit 1
fi

View File

@@ -1,4 +1,3 @@
TRANSFORMERS_TAG=2.5.7
SOLR6_TAG=2.0.3
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>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A1-SNAPSHOT</version>
<version>7.3.0-A5</version>
</parent>
<developers>