Skip to content

Commit

Permalink
Merge branch 'master' into feature/ACS-9025-propagate-new-event-model
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pom.xml
  • Loading branch information
@cezary-witkowski
cezary-witkowski committed Nov 28, 2024
2 parents 185e414 + 37489ef commit f8dede5
Show file tree
Hide file tree
Showing 31 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/master_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
BASE_BUILD_NUMBER: 10000
# Release version has to start with real version (23.2.0-....) for the docker image to build successfully.
RELEASE_VERSION: 25.1.0-A1
DEVELOPMENT_VERSION: 25.1.0-A2-SNAPSHOT
RELEASE_VERSION: 25.1.0-A.1
DEVELOPMENT_VERSION: 25.1.0-A.2-SNAPSHOT

jobs:
run_ci:
Expand Down
2 changes: 1 addition & 1 deletion dev/dev-acs-amps-overlay/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-tomcat-env</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dev/dev-repo-amps-overlay/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-tomcat-env</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion dev/dev-share-amps-overlay/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-tomcat-env</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion dev/dev-tomcat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-tomcat-env</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dev/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion distribution-ags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion distribution-share/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<!-- To replace in share-config-custom.xml -->
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion docker-alfresco/ags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-docker</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>
<properties>
<image.name>alfresco/alfresco-governance-repository-enterprise</image.name>
Expand Down
2 changes: 1 addition & 1 deletion docker-alfresco/aws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-docker</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion docker-alfresco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion docker-share/ags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-docker</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion docker-share/aws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-docker</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion docker-share/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<artifactId>acs-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Packaging</name>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>

<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-enterprise-repo</artifactId>
<relativePath>../alfresco-enterprise-repo/pom.xml</relativePath>
<version>25.1.0.6-SNAPSHOT</version>
<version>25.1.0.5</version>
</parent>

<properties>
<dependency.alfresco-enterprise-repo.version>25.1.0.6-SNAPSHOT</dependency.alfresco-enterprise-repo.version>
<dependency.alfresco-enterprise-share.version>25.1.0.4-SNAPSHOT</dependency.alfresco-enterprise-share.version>
<dependency.alfresco-enterprise-repo.version>25.1.0.5</dependency.alfresco-enterprise-repo.version>
<dependency.alfresco-enterprise-share.version>25.1.0.4</dependency.alfresco-enterprise-share.version>

<alfresco.rm-enterprise-rest-api-explorer.version>3.0.2</alfresco.rm-enterprise-rest-api-explorer.version>

Expand Down
2 changes: 1 addition & 1 deletion tests/pipeline-all-amps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/pipeline-all-amps/repo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>pipeline-all-amps</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<artifactId>alfresco-pipeline-all-amps-repo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/pipeline-all-amps/share/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>pipeline-all-amps</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<artifactId>alfresco-pipeline-all-amps-share</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-all-amps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-cmis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-distribution-zip/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<profiles>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-email/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-mtls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-restapi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-sync-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/tas-webdav/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion tests/testcontainers-env/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-tests</artifactId>
<version>25.1.0-A1-SNAPSHOT</version>
<version>25.1.0-A.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down

0 comments on commit f8dede5

Please sign in to comment.