Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into feature/ACS-9045
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pom.xml
  • Loading branch information
@kmagdziarz
kmagdziarz committed Dec 17, 2024
2 parents 64804b2 + 42449ef commit 90902df
Show file tree
Hide file tree
Showing 21 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 25.1.0-A.3
DEVELOPMENT_VERSION: 25.1.0-A.4-SNAPSHOT
RELEASE_VERSION: 25.1.0-A.4
DEVELOPMENT_VERSION: 25.1.0-A.5-SNAPSHOT

jobs:
tas_tests:
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 @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tomcat-env</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tomcat-env</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tomcat-env</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>

<dependencies>
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 @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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 @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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 @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-docker</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>
</project>
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>

<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>25.1.0.11</version>
<version>25.1.0.16</version>
</parent>

<properties>
<dependency.alfresco-community-repo.version>25.1.0.12-SNAPSHOT</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>25.1.0.10</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>25.1.0-A.3</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>25.1.0.16</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>25.1.0.14</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>25.1.0-A.4</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>
Expand Down
2 changes: 1 addition & 1 deletion public-javadoc/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>acs-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>

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 @@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>

<modules>
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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>

<properties>
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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>

<developers>
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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-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-community-tests</artifactId>
<version>25.1.0-A.2-SNAPSHOT</version>
<version>25.1.0-A.5-SNAPSHOT</version>
</parent>

<developers>
Expand Down

0 comments on commit 90902df

Please sign in to comment.