Compare commits

..
29 Commits
Author SHA1 Message Date
alfresco-build 9345081327 [maven-release-plugin][skip ci] prepare release 25.1.0-A.12 2025-02-09 02:59:02 +00:00
alfresco-build 9d810abaa2 [release] 25.1.0-A.12
Update upstream versions
    - alfresco-community-repo:   25.1.0.47
    - alfresco-enterprise-share: 25.1.0.35
    - acs-packaging:             25.1.0-A.12
    - RELEASE_VERSION:           25.1.0-A.12
    - DEVELOPMENT_VERSION:       25.1.0-A.13-SNAPSHOT
2025-02-09 02:03:36 +00:00
alfresco-build e07f6f2f60 [maven-release-plugin][skip ci] prepare for next development iteration 2025-02-02 02:26:19 +00:00
alfresco-build be5b82fc1c [maven-release-plugin][skip ci] prepare release 25.1.0-A.11 2025-02-02 02:26:17 +00:00
alfresco-build 8487068b03 [release] 25.1.0-A.11
Update upstream versions
    - alfresco-community-repo:   25.1.0.43
    - alfresco-enterprise-share: 25.1.0.31
    - acs-packaging:             25.1.0-A.11
    - RELEASE_VERSION:           25.1.0-A.11
    - DEVELOPMENT_VERSION:       25.1.0-A.12-SNAPSHOT
2025-02-02 01:30:27 +00:00
alfresco-build 9764e292a9 [maven-release-plugin][skip ci] prepare for next development iteration 2025-01-28 16:10:46 +00:00
alfresco-build 79ca33f16b [maven-release-plugin][skip ci] prepare release 25.1.0-M1 2025-01-28 16:10:44 +00:00
alfresco-build e61f0e6acd [release] 25.1.0-M1
Update upstream versions
    - alfresco-community-repo:   25.1.0.37
    - alfresco-enterprise-share: 25.1.0.29
    - acs-packaging:             25.1.0-M1
    - RELEASE_VERSION:           25.1.0-M1
    - DEVELOPMENT_VERSION:       25.1.0-A.11-SNAPSHOT
2025-01-28 15:12:53 +00:00
alfresco-build 62c11b4ba3 [maven-release-plugin][skip ci] prepare for next development iteration 2025-01-26 02:23:55 +00:00
alfresco-build 14eb024001 [maven-release-plugin][skip ci] prepare release 25.1.0-A.10 2025-01-26 02:23:53 +00:00
alfresco-build d7880064d5 [release] 25.1.0-A.10
Update upstream versions
    - alfresco-community-repo:   25.1.0.36
    - alfresco-enterprise-share: 25.1.0.28
    - acs-packaging:             25.1.0-A.10
    - RELEASE_VERSION:           25.1.0-A.10
    - DEVELOPMENT_VERSION:       25.1.0-A.11-SNAPSHOT
2025-01-26 01:25:27 +00:00
alfresco-build 10c9b11f21 [maven-release-plugin][skip ci] prepare for next development iteration 2025-01-21 07:44:59 +00:00
alfresco-build 8c096b7203 [maven-release-plugin][skip ci] prepare release 25.1.0-A.9 2025-01-21 07:44:57 +00:00
alfresco-build ccc1ff32b0 [release] 25.1.0-A.9
Update upstream versions
    - alfresco-community-repo:   25.1.0.35
    - alfresco-enterprise-share: 25.1.0.27
    - acs-packaging:             25.1.0-A.9
    - RELEASE_VERSION:           25.1.0-A.9
    - DEVELOPMENT_VERSION:       25.1.0-A.10-SNAPSHOT
2025-01-21 06:48:58 +00:00
Damian Ujma e85aa18487 ACS-9140 Bump IE/SS to 2.0.14-A.1 (#1643) 2025-01-16 16:49:45 +01:00
alfresco-build bd41276881 [maven-release-plugin][skip ci] prepare for next development iteration 2025-01-12 02:52:45 +00:00
alfresco-build 34a495a878 [maven-release-plugin][skip ci] prepare release 25.1.0-A.7 2025-01-12 02:52:42 +00:00
alfresco-build a08cf71ca7 [release] 25.1.0-A.7
Update upstream versions
    - alfresco-community-repo:   25.1.0.27
    - alfresco-enterprise-share: 25.1.0.20
    - acs-packaging:             25.1.0-A.7
    - RELEASE_VERSION:           25.1.0-A.7
    - DEVELOPMENT_VERSION:       25.1.0-A.8-SNAPSHOT
2025-01-12 01:27:07 +00:00
alfresco-build e2d23cda41 [release] 25.1.0-A.6
Update upstream versions
    - alfresco-community-repo:   25.1.0.20
    - alfresco-enterprise-share: 25.1.0.17
    - acs-packaging:             25.1.0-A.6
    - RELEASE_VERSION:           25.1.0-A.6
    - DEVELOPMENT_VERSION:       25.1.0-A.7-SNAPSHOT
2024-12-29 01:31:50 +00:00
alfresco-build d9a26c4f04 [release] 25.1.0-A.5
Update upstream versions
    - alfresco-community-repo:   25.1.0.18
    - alfresco-enterprise-share: 25.1.0.15
    - acs-packaging:             25.1.0-A.5
    - RELEASE_VERSION:           25.1.0-A.5
    - DEVELOPMENT_VERSION:       25.1.0-A.6-SNAPSHOT
2024-12-22 01:34:44 +00:00
alfresco-build 42449efc05 [maven-release-plugin][skip ci] prepare for next development iteration 2024-12-15 02:24:32 +00:00
alfresco-build 3c72804cb2 [maven-release-plugin][skip ci] prepare release 25.1.0-A.4 2024-12-15 02:24:31 +00:00
alfresco-build 2a1618eed1 [release] 25.1.0-A.4
Update upstream versions
    - alfresco-community-repo:   25.1.0.16
    - alfresco-enterprise-share: 25.1.0.14
    - acs-packaging:             25.1.0-A.4
    - RELEASE_VERSION:           25.1.0-A.4
    - DEVELOPMENT_VERSION:       25.1.0-A.5-SNAPSHOT
2024-12-15 01:28:13 +00:00
alfresco-build 8dae776c87 [release] 25.1.0-A.3
Update upstream versions
    - alfresco-community-repo:   25.1.0.11
    - alfresco-enterprise-share: 25.1.0.10
    - acs-packaging:             25.1.0-A.3
    - RELEASE_VERSION:           25.1.0-A.3
    - DEVELOPMENT_VERSION:       25.1.0-A.4-SNAPSHOT
2024-12-08 01:31:51 +00:00
alfresco-build a7e3eb01fb [release] 25.1.0-A.2
Update upstream versions
    - alfresco-community-repo:   25.1.0.7
    - alfresco-enterprise-share: 25.1.0.7
    - acs-packaging:             25.1.0-A.2
    - RELEASE_VERSION:           25.1.0-A.2
    - DEVELOPMENT_VERSION:       25.1.0-A.3-SNAPSHOT
2024-12-01 01:31:03 +00:00
alfresco-build 1db23f2e7d [maven-release-plugin][skip ci] prepare for next development iteration 2024-11-27 21:24:28 +00:00
alfresco-build d917a6856f [maven-release-plugin][skip ci] prepare release 25.1.0-A.1 2024-11-27 21:24:27 +00:00
alfresco-build aa086100c4 [release] 25.1.0-A.1
Update upstream versions
    - alfresco-community-repo:   25.1.0.3
    - alfresco-enterprise-share: 25.1.0.4
    - acs-packaging:             25.1.0-A.1
    - RELEASE_VERSION:           25.1.0-A.1
    - DEVELOPMENT_VERSION:       25.1.0-A.2-SNAPSHOT
2024-11-27 20:14:42 +00:00
alfresco-build a28f7a2e4e [maven-release-plugin][skip ci] prepare for next development iteration 2024-11-20 12:20:20 +00:00
25 changed files with 48 additions and 48 deletions
+6 -6
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 (23.2.0-....) for the docker image to build successfully.
RELEASE_VERSION: 23.4.1
DEVELOPMENT_VERSION: 23.4.2-A1-SNAPSHOT
RELEASE_VERSION: 25.1.0-A.12
DEVELOPMENT_VERSION: 25.1.0-A.13-SNAPSHOT
jobs:
tas_tests:
@@ -91,7 +91,7 @@ jobs:
${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/${{ matrix.compose-file }}
${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
- name: "Test"
run: mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=default -DrunBugs=false -Dlicense.skipUpdateLicense
run: mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=default -DrunBugs=false
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
@@ -110,9 +110,9 @@ jobs:
bash ./scripts/ci/build.sh
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: mvn -B -ntp -V clean install -Pags -DskipTests -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense
run: mvn -B -ntp -V clean install -Pags -DskipTests -Dmaven.javadoc.skip=true
- name: "Test"
run: mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false -Dlicense.skipUpdateLicense
run: mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
@@ -175,7 +175,7 @@ jobs:
bash ./scripts/ci/build.sh -m
- name: "Push Docker images"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images -Dlicense.skipUpdateLicense
run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<build>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<build>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
+1 -1
View File
@@ -25,7 +25,7 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.13
image: alfresco/alfresco-search-services:2.0.14-A.1
mem_limit: 2g
environment:
#Solr needs to know how to register itself with Alfresco
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<dependencies>
@@ -57,4 +57,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<dependencies>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
@@ -71,4 +71,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
@@ -320,4 +320,4 @@
</build>
</profile>
</profiles>
</project>
</project>
+1 -1
View File
@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
</project>
+6 -6
View File
@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>23.4.1.1</version>
<version>25.1.0.47</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>23.4.1.1</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.4.0.46</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.4.1</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>25.1.0.47</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>25.1.0.35</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>25.1.0-A.12</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.4.1</tag>
<tag>25.1.0-A.12</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<packaging>pom</packaging>
+5 -5
View File
@@ -54,9 +54,9 @@ UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
# Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
# Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags"
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
else
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags"
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
fi
SHARE_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-share.version")"
@@ -77,13 +77,13 @@ fi
SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
# Checkout the upstream share project (tag or branch; + build if the latter)
if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
else
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
fi
# Build the current project
mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
popd
+6 -6
View File
@@ -116,7 +116,7 @@ function buildUpstreamTag() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V clean package -DskipTests -Dlicense.skipUpdateLicense -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
popd
}
@@ -129,8 +129,8 @@ function buildSameBranchOnUpstream() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V -q clean install -DskipTests -Dlicense.skipUpdateLicense -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -Dlicense.skipUpdateLicense -f packaging/tests/pom.xml
mvn -B -ntp -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
popd
}
@@ -146,7 +146,7 @@ function pullUpstreamTagAndBuildDockerImage() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V clean package -DskipTests -Dlicense.skipUpdateLicense -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
popd
}
@@ -163,8 +163,8 @@ function pullAndBuildSameBranchOnUpstream() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V -q clean install -DskipTests -Dlicense.skipUpdateLicense -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -Dlicense.skipUpdateLicense -f packaging/tests/pom.xml
mvn -B -ntp -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
popd
}
+1 -1
View File
@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.13
SOLR6_TAG=2.0.14-A.1
POSTGRES_TAG=15.4
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+2 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<modules>
@@ -21,4 +21,4 @@
<properties>
<dependency.org-json.version>20170516</dependency.org-json.version>
</properties>
</project>
</project>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<properties>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.1</version>
<version>25.1.0-A.12</version>
</parent>
<developers>