Compare commits

...

19 Commits

Author SHA1 Message Date
alfresco-build
a58cc3dc72 [maven-release-plugin][skip ci] prepare release 23.3.0-A12 2024-04-28 02:43:34 +00:00
alfresco-build
e699b6cce5 [release] 23.3.0-A12
Update upstream versions
    - alfresco-community-repo:   23.3.0.28
    - alfresco-enterprise-share: 23.3.0.26
    - acs-packaging:             23.3.0-A12
    - RELEASE_VERSION:           23.3.0-A12
    - DEVELOPMENT_VERSION:       23.3.0-A13-SNAPSHOT
2024-04-28 01:43:09 +00:00
alfresco-build
3e82bb8707 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-21 02:48:11 +00:00
alfresco-build
511d5cafdb [maven-release-plugin][skip ci] prepare release 23.3.0-A11 2024-04-21 02:48:09 +00:00
alfresco-build
23b1718396 [release] 23.3.0-A11
Update upstream versions
    - alfresco-community-repo:   23.3.0.27
    - alfresco-enterprise-share: 23.3.0.25
    - acs-packaging:             23.3.0-A11
    - RELEASE_VERSION:           23.3.0-A11
    - DEVELOPMENT_VERSION:       23.3.0-A12-SNAPSHOT
2024-04-21 01:49:26 +00:00
Wojtek Świętoń
9a70909b6b ACS-6309 Fix reportportal dependencies 2024-04-16 10:46:54 +02:00
alfresco-build
d652dc6d66 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-15 10:59:08 +00:00
alfresco-build
c27b8dfeed [maven-release-plugin][skip ci] prepare release 23.3.0-A10 2024-04-15 10:59:06 +00:00
Domenico Sibilio
5532c6bc57 [skip tests][release] 23.3.0-A10 2024-04-15 12:33:59 +02:00
alfresco-build
10fbf62e00 [release] 23.3.0-A10
Update upstream versions
    - alfresco-community-repo:   23.3.0.25
    - alfresco-enterprise-share: 23.3.0.21
    - acs-packaging:             23.3.0-A10
    - RELEASE_VERSION:           23.3.0-A10
    - DEVELOPMENT_VERSION:       23.3.0-A11-SNAPSHOT
2024-04-15 09:18:29 +00:00
Domenico Sibilio
0a3e5c9770 ACS-7481 Bump IE/SS to 2.0.10 (#1553) 2024-04-12 14:57:56 +02:00
alfresco-build
15bdd187c8 [release] 23.3.0-A9
Update upstream versions
    - alfresco-community-repo:   23.3.0.21
    - alfresco-enterprise-share: 23.3.0.19
    - acs-packaging:             23.3.0-A9
    - RELEASE_VERSION:           23.3.0-A9
    - DEVELOPMENT_VERSION:       23.3.0-A10-SNAPSHOT
2024-04-07 01:22:50 +00:00
Domenico Sibilio
cb8ec03d95 ACS-6961 Bump IE/SS to 2.0.10-A1 (#1550) 2024-04-05 14:10:49 +02:00
kcichonczyk
718f352838 [ACS-7470] migrate to docker compose v2 2024-04-04 11:20:59 +02:00
alfresco-build
c7794747ee [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-04 08:16:32 +00:00
alfresco-build
b7ce513320 [maven-release-plugin][skip ci] prepare release 23.3.0-A8 2024-04-04 08:16:30 +00:00
alfresco-build
da02d4d273 [release] 23.3.0-A8
Update upstream versions
    - alfresco-community-repo:   23.3.0.15
    - alfresco-enterprise-share: 23.3.0.18
    - acs-packaging:             23.3.0-A8
    - RELEASE_VERSION:           23.3.0-A8
    - DEVELOPMENT_VERSION:       23.3.0-A9-SNAPSHOT
2024-04-04 07:17:34 +00:00
alfresco-build
22a27773fd [release] 23.3.0-A7
Update upstream versions
    - alfresco-community-repo:   23.3.0.15
    - alfresco-enterprise-share: 23.3.0.17
    - acs-packaging:             23.3.0-A7
    - RELEASE_VERSION:           23.3.0-A7
    - DEVELOPMENT_VERSION:       23.3.0-A8-SNAPSHOT
2024-04-03 10:24:24 +00:00
alfresco-build
c94e81c198 [maven-release-plugin][skip ci] prepare for next development iteration 2024-03-31 02:30:51 +00:00
26 changed files with 65 additions and 38 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 (23.2.0-....) for the docker image to build successfully.
RELEASE_VERSION: 23.3.0-A6
DEVELOPMENT_VERSION: 23.3.0-A7-SNAPSHOT
RELEASE_VERSION: 23.3.0-A12
DEVELOPMENT_VERSION: 23.3.0-A13-SNAPSHOT
jobs:
tas_tests:

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
@@ -120,13 +120,13 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
## Clean up
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`.
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`.
~~~
^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

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

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

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.10
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>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<dependencies>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</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.3.0-A6</version>
<version>23.3.0-A12</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>23.3.0.15</version>
<version>23.3.0.28</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>23.3.0.15</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.3.0.16</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.3.0-A6</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>23.3.0.28</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.3.0.26</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.3.0-A12</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>23.3.0-A6</tag>
<tag>23.3.0-A12</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<packaging>pom</packaging>

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

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.8.1
SOLR6_TAG=2.0.10
POSTGRES_TAG=15.4
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<developers>
@@ -67,6 +67,11 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<developers>
@@ -33,6 +33,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>email</artifactId>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<developers>
@@ -34,6 +34,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>utility</artifactId>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<developers>
@@ -79,6 +79,11 @@
<version>${dependency.awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.0-A6</version>
<version>23.3.0-A12</version>
</parent>
<developers>
@@ -37,6 +37,11 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>