mirror of
https://github.com/Alfresco/acs-community-packaging.git
synced 2025-09-10 14:12:09 +00:00
Compare commits
33 Commits
release/7.
...
23.1.0-A18
Author | SHA1 | Date | |
---|---|---|---|
|
0b025df98b | ||
|
f074aac8df | ||
|
a0d711ebac | ||
|
37738c6bcc | ||
|
41b3250838 | ||
|
499cbf222f | ||
|
6f005c2123 | ||
|
c21035e27f | ||
|
c892acaa0e | ||
|
dc2fd4768b | ||
|
4275054845 | ||
|
e964f22a93 | ||
|
b804d7255d | ||
|
b32290c444 | ||
|
d1ea01c1c4 | ||
|
c69097a351 | ||
|
a8c765447e | ||
|
1809c3fa2a | ||
|
a4b6cdc064 | ||
|
381a5e0c08 | ||
|
662ff67685 | ||
|
fd72a77bb4 | ||
|
52ba2bda17 | ||
|
d1e245d09f | ||
|
70850f9c0a | ||
|
9e40d147fb | ||
|
3945b08218 | ||
|
3ad42e3259 | ||
|
5aaf16c9ea | ||
|
d21e33def5 | ||
|
3f98b66dd9 | ||
|
dbb6099c44 | ||
|
8e38cf6c7d |
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 (7.4.0-....) for the docker image to build successfully.
|
||||
RELEASE_VERSION: 7.4.0
|
||||
DEVELOPMENT_VERSION: 7.4.1-A1-SNAPSHOT
|
||||
RELEASE_VERSION: 23.1.0-A18
|
||||
DEVELOPMENT_VERSION: 23.1.0-A19-SNAPSHOT
|
||||
|
||||
jobs:
|
||||
tas_tests:
|
||||
|
@@ -7,11 +7,11 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<dependency.sis.version>1.2</dependency.sis.version>
|
||||
<dependency.sis.version>1.3</dependency.sis.version>
|
||||
|
||||
<tomcat.version>7.0.86</tomcat.version>
|
||||
<tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -47,7 +47,7 @@ services:
|
||||
- 8083:8983 #Browser port
|
||||
|
||||
activemq:
|
||||
image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
|
||||
image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
|
||||
mem_limit: 1g
|
||||
ports:
|
||||
- 8161:8161 # Web Console
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-services-community-docker</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
@@ -119,6 +119,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -185,6 +188,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -255,6 +261,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -284,6 +293,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>share-community-docker</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
@@ -101,6 +101,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -167,6 +170,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -237,6 +243,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
@@ -266,6 +275,9 @@
|
||||
<platform>linux/amd64</platform>
|
||||
<platform>linux/arm64</platform>
|
||||
</platforms>
|
||||
<attestations>
|
||||
<provenance>false</provenance>
|
||||
</attestations>
|
||||
</buildx>
|
||||
<dockerFileDir>${project.basedir}</dockerFileDir>
|
||||
<args>
|
||||
|
@@ -7,6 +7,6 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</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>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-community-repo</artifactId>
|
||||
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
|
||||
<version>20.161</version>
|
||||
<version>23.1.0.144</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<dependency.alfresco-community-repo.version>20.161</dependency.alfresco-community-repo.version>
|
||||
<dependency.alfresco-community-share.version>20.163</dependency.alfresco-community-share.version>
|
||||
<dependency.acs-packaging.version>7.4.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
|
||||
<dependency.alfresco-community-repo.version>23.1.0.144</dependency.alfresco-community-repo.version>
|
||||
<dependency.alfresco-community-share.version>23.1.0.139</dependency.alfresco-community-share.version>
|
||||
<dependency.acs-packaging.version>23.1.0-A18</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</tag>
|
||||
<tag>23.1.0-A18</tag>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
@@ -1,3 +1,3 @@
|
||||
SOLR6_TAG=2.0.7-A5
|
||||
POSTGRES_TAG=14.4
|
||||
ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
|
||||
ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>acs-community-packaging</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
@@ -21,7 +21,7 @@
|
||||
<dependency>
|
||||
<groupId>org.assertj</groupId>
|
||||
<artifactId>assertj-core</artifactId>
|
||||
<version>3.23.1</version>
|
||||
<version>3.24.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -32,7 +32,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-model</artifactId>
|
||||
<version>3.8.6</version>
|
||||
<version>3.9.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
<properties>
|
||||
<suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
|
||||
<dependency.groovy.version>3.0.12</dependency.groovy.version>
|
||||
<dependency.groovy.version>3.0.17</dependency.groovy.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
@@ -73,6 +73,12 @@
|
||||
<artifactId>spring-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.awaitility</groupId>
|
||||
<artifactId>awaitility</artifactId>
|
||||
<version>${dependency.awaitility.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-repository-community-tests</artifactId>
|
||||
<version>7.4.0</version>
|
||||
<version>23.1.0-A18</version>
|
||||
</parent>
|
||||
|
||||
<developers>
|
||||
|
Reference in New Issue
Block a user