mirror of
https://github.com/Alfresco/acs-community-packaging.git
synced 2025-09-10 14:12:09 +00:00
Compare commits
47 Commits
23.3.0-A8
...
23.3.0-A23
Author | SHA1 | Date | |
---|---|---|---|
|
ee13662274 | ||
|
db8676b73e | ||
|
b363c0341c | ||
|
8606ff3aa2 | ||
|
c7625052ba | ||
|
eb22a74f1f | ||
|
a858c7046e | ||
|
5944ef48c4 | ||
|
f5aa0c93e6 | ||
|
90ffa23561 | ||
|
cca10c3bd4 | ||
|
3a8c21ae48 | ||
|
dfdfbed093 | ||
|
b302eb9714 | ||
|
dd9cb21d5c | ||
|
0dd61c2e0d | ||
|
b5d253d6db | ||
|
da4c4e24c5 | ||
|
32ae60eadf | ||
|
7d28684e55 | ||
|
7eaffbed80 | ||
|
ee5830808e | ||
|
72ca0e34a1 | ||
|
3106d3e7be | ||
|
c1a7f6ffb0 | ||
|
d4f0006825 | ||
|
5af41219a3 | ||
|
e5031aadb4 | ||
|
e8b9b64afc | ||
|
a9975152b7 | ||
|
db5a85fc43 | ||
|
fcedcd878b | ||
|
a58cc3dc72 | ||
|
e699b6cce5 | ||
|
3e82bb8707 | ||
|
511d5cafdb | ||
|
23b1718396 | ||
|
9a70909b6b | ||
|
d652dc6d66 | ||
|
c27b8dfeed | ||
|
5532c6bc57 | ||
|
10fbf62e00 | ||
|
0a3e5c9770 | ||
|
15bdd187c8 | ||
|
cb8ec03d95 | ||
|
718f352838 | ||
|
c7794747ee |
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -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-A8
|
||||
DEVELOPMENT_VERSION: 23.3.0-A9-SNAPSHOT
|
||||
RELEASE_VERSION: 23.3.0-A23
|
||||
DEVELOPMENT_VERSION: 23.3.0-A24-SNAPSHOT
|
||||
|
||||
jobs:
|
||||
tas_tests:
|
||||
|
@@ -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
|
||||
|
@@ -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'
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -25,7 +25,7 @@ services:
|
||||
- 5432:5432
|
||||
|
||||
solr6:
|
||||
image: alfresco/alfresco-search-services:2.0.3
|
||||
image: alfresco/alfresco-search-services:2.0.11-A6
|
||||
mem_limit: 2g
|
||||
environment:
|
||||
#Solr needs to know how to register itself with Alfresco
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-services-community-docker</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>share-community-docker</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,6 +7,6 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
</project>
|
||||
|
12
pom.xml
12
pom.xml
@@ -3,19 +3,19 @@
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>Alfresco Content Services Community Packaging</name>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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.57</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.18</dependency.alfresco-community-share.version>
|
||||
<dependency.acs-packaging.version>23.3.0-A8</dependency.acs-packaging.version> <!-- for Share distribution zip -->
|
||||
<dependency.alfresco-community-repo.version>23.3.0.57</dependency.alfresco-community-repo.version>
|
||||
<dependency.alfresco-community-share.version>23.3.0.68</dependency.alfresco-community-share.version>
|
||||
<dependency.acs-packaging.version>23.3.0-A23</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-A8</tag>
|
||||
<tag>23.3.0-A23</tag>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
@@ -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,3 +1,3 @@
|
||||
SOLR6_TAG=2.0.8.1
|
||||
SOLR6_TAG=2.0.11-A6
|
||||
POSTGRES_TAG=15.4
|
||||
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>23.3.0-A8</version>
|
||||
<version>23.3.0-A23</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>
|
||||
|
Reference in New Issue
Block a user