Compare commits

...

27 Commits

Author SHA1 Message Date
alfresco-build
6f005c2123 [maven-release-plugin][skip ci] prepare release 23.1.0-A16 2023-06-19 09:47:08 +00:00
alfresco-build
c21035e27f [release] 23.1.0-A16
Update upstream versions
    - alfresco-community-repo:   23.1.0.141
    - alfresco-enterprise-share: 23.1.0.135
    - acs-packaging:             23.1.0-A16
    - RELEASE_VERSION:           23.1.0-A16
    - DEVELOPMENT_VERSION:       23.1.0-A17-SNAPSHOT
2023-06-19 08:28:04 +00:00
Domenico Sibilio
c892acaa0e ACS-4063 Remove provenance layer from Docker images (#1520)
Addresses https://issues.redhat.com/browse/PROJQUAY-5013
2023-06-12 12:29:04 +02:00
alfresco-build
dc2fd4768b [maven-release-plugin][skip ci] prepare for next development iteration 2023-06-11 02:54:04 +00:00
alfresco-build
4275054845 [maven-release-plugin][skip ci] prepare release 23.1.0-A15 2023-06-11 02:54:01 +00:00
alfresco-build
e964f22a93 [release] 23.1.0-A15
Update upstream versions
    - alfresco-community-repo:   23.1.0.134
    - alfresco-enterprise-share: 23.1.0.131
    - acs-packaging:             23.1.0-A15
    - RELEASE_VERSION:           23.1.0-A15
    - DEVELOPMENT_VERSION:       23.1.0-A16-SNAPSHOT
2023-06-11 01:39:40 +00:00
alfresco-build
b804d7255d [release] 23.1.0-A14
Update upstream versions
    - alfresco-community-repo:   23.1.0.130
    - alfresco-enterprise-share: 23.1.0.127
    - acs-packaging:             23.1.0-A14
    - RELEASE_VERSION:           23.1.0-A14
    - DEVELOPMENT_VERSION:       23.1.0-A15-SNAPSHOT
2023-06-04 01:43:17 +00:00
alfresco-build
b32290c444 [maven-release-plugin][skip ci] prepare for next development iteration 2023-05-28 03:38:31 +00:00
alfresco-build
d1ea01c1c4 [maven-release-plugin][skip ci] prepare release 23.1.0-A13 2023-05-28 03:38:28 +00:00
alfresco-build
c69097a351 [release] 23.1.0-A13
Update upstream versions
    - alfresco-community-repo:   23.1.0.128
    - alfresco-enterprise-share: 23.1.0.121
    - acs-packaging:             23.1.0-A13
    - RELEASE_VERSION:           23.1.0-A13
    - DEVELOPMENT_VERSION:       23.1.0-A14-SNAPSHOT
2023-05-28 01:36:30 +00:00
alfresco-build
a8c765447e [maven-release-plugin][skip ci] prepare for next development iteration 2023-05-21 03:00:27 +00:00
alfresco-build
1809c3fa2a [maven-release-plugin][skip ci] prepare release 23.1.0-A12 2023-05-21 03:00:25 +00:00
alfresco-build
a4b6cdc064 [release] 23.1.0-A12
Update upstream versions
    - alfresco-community-repo:   23.1.0.118
    - alfresco-enterprise-share: 23.1.0.108
    - acs-packaging:             23.1.0-A12
    - RELEASE_VERSION:           23.1.0-A12
    - DEVELOPMENT_VERSION:       23.1.0-A13-SNAPSHOT
2023-05-21 01:34:21 +00:00
dependabot[bot]
381a5e0c08 Bump assertj-core from 3.23.1 to 3.24.2 (#1501)
Bumps assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-18 10:04:07 +02:00
Kacper Magdziarz
662ff67685 [ACS-5192] Upgrade Repository Components to Java 17 (#1517) 2023-05-18 09:54:12 +02:00
dependabot[bot]
fd72a77bb4 Bump groovy from 3.0.12 to 3.0.17 (#1512)
Bumps [groovy](https://github.com/apache/groovy) from 3.0.12 to 3.0.17.
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.codehaus.groovy:groovy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-17 13:53:47 +02:00
dependabot[bot]
52ba2bda17 Bump dependency.sis.version from 1.2 to 1.3 (#1498)
Bumps `dependency.sis.version` from 1.2 to 1.3.

Updates `sis-utility` from 1.2 to 1.3

Updates `sis-metadata` from 1.2 to 1.3

Updates `sis-storage` from 1.2 to 1.3

---
updated-dependencies:
- dependency-name: org.apache.sis.core:sis-utility
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.sis.core:sis-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.sis.storage:sis-storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-17 13:39:14 +02:00
Damian Ujma
d1e245d09f ACS-5087 Add awaitility dependency (#1518) 2023-05-16 16:09:49 +02:00
dependabot[bot]
70850f9c0a Bump maven-model from 3.8.6 to 3.9.2 (#1516)
Bumps [maven-model](https://github.com/apache/maven) from 3.8.6 to 3.9.2.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.6...maven-3.9.2)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-16 13:13:47 +02:00
alfresco-build
9e40d147fb [release] 23.1.0-A11
Update upstream versions
    - alfresco-community-repo:   23.1.0.102
    - alfresco-enterprise-share: 23.1.0.101
    - acs-packaging:             23.1.0-A11
    - RELEASE_VERSION:           23.1.0-A11
    - DEVELOPMENT_VERSION:       23.1.0-A12-SNAPSHOT
2023-05-14 01:48:54 +00:00
alfresco-build
3945b08218 [maven-release-plugin][skip ci] prepare for next development iteration 2023-05-09 18:20:51 +00:00
alfresco-build
3ad42e3259 [maven-release-plugin][skip ci] prepare release 23.1.0-A10 2023-05-09 18:20:48 +00:00
alfresco-build
5aaf16c9ea [release] 23.1.0-A10
Update upstream versions
    - alfresco-community-repo:   23.1.0.100
    - alfresco-enterprise-share: 23.1.0.100
    - acs-packaging:             23.1.0-A10
    - RELEASE_VERSION:           23.1.0-A10
    - DEVELOPMENT_VERSION:       23.1.0-A11-SNAPSHOT
2023-05-09 16:48:24 +00:00
alfresco-build
d21e33def5 [maven-release-plugin][skip ci] prepare for next development iteration 2023-05-07 03:14:44 +00:00
alfresco-build
3f98b66dd9 [maven-release-plugin][skip ci] prepare release 7.4.1-A1 2023-05-07 03:14:42 +00:00
alfresco-build
dbb6099c44 [release] 7.4.1-A1
Update upstream versions
    - alfresco-community-repo:   20.163
    - alfresco-enterprise-share: 20.164
    - acs-packaging:             7.4.1-A1
    - RELEASE_VERSION:           7.4.1-A1
    - DEVELOPMENT_VERSION:       7.4.1-A2-SNAPSHOT
2023-05-07 02:00:39 +00:00
alfresco-build
8e38cf6c7d [maven-release-plugin][skip ci] prepare for next development iteration 2023-05-04 16:26:25 +00:00
23 changed files with 63 additions and 33 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
DEVELOPMENT_VERSION: 7.4.1-A1-SNAPSHOT
RELEASE_VERSION: 23.1.0-A16
DEVELOPMENT_VERSION: 23.1.0-A17-SNAPSHOT
jobs:
tas_tests:

View File

@@ -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-A16</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>

View File

@@ -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-A16</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</version>
<version>23.1.0-A16</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</version>
<version>23.1.0-A16</version>
</parent>
<properties>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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</version>
<version>23.1.0-A16</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.141</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.141</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.1.0.135</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.1.0-A16</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-A16</tag>
</scm>
<distributionManagement>

View File

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

View File

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

View File

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

View File

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

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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>

View File

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

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.4.0</version>
<version>23.1.0-A16</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>

View File

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