Compare commits

...

22 Commits

Author SHA1 Message Date
alfresco-build
1e82eac4fc [release] 23.4.2-A3
Update upstream versions
    - alfresco-community-repo:   23.4.2.13
    - alfresco-enterprise-share: 23.4.1.5
    - acs-packaging:             23.4.2-A3
    - RELEASE_VERSION:           23.4.2-A3
    - DEVELOPMENT_VERSION:       23.4.2-A4-SNAPSHOT
2025-05-15 14:01:01 +00:00
alfresco-build
dc7f930bba [release] 23.4.2-A2
Update upstream versions
    - alfresco-community-repo:   23.4.2.11
    - alfresco-enterprise-share: 23.4.1.4
    - acs-packaging:             23.4.2-A2
    - RELEASE_VERSION:           23.4.2-A2
    - DEVELOPMENT_VERSION:       23.4.2-A3-SNAPSHOT
2025-04-28 15:00:18 +00:00
alfresco-build
8449d18d1b [maven-release-plugin][skip ci] prepare for next development iteration 2025-02-13 08:12:59 +00:00
alfresco-build
16de010ef4 [maven-release-plugin][skip ci] prepare release 23.4.1 2025-02-13 08:12:57 +00:00
Gerard Olenski
d1bdf3d3a2 ACS-9240 Please [release] 23.4.1 and [publish] 2025-02-13 08:14:43 +01:00
alfresco-build
d9f7d41f46 [maven-release-plugin][skip ci] prepare for next development iteration 2025-02-12 14:45:32 +00:00
alfresco-build
8f57b74a82 [maven-release-plugin][skip ci] prepare release 23.4.1-A2 2025-02-12 14:45:30 +00:00
Gerard Olenski
c0ca9d1b62 ACS-9240 [release] 23.4.1-A2 [skip tests] [skip docker_latest] 2025-02-12 15:32:11 +01:00
Gerard Olenski
ca78ed0b7f ACS-9240 Community release 23.4.1 2025-02-12 14:44:09 +01:00
Gerard Olenski
ff48dd1558 Revert "ACS-9240 Community release 23.4.1"
This reverts commit 8b80678798.
2025-02-12 14:33:38 +01:00
alfresco-build
1328b56c84 [maven-release-plugin][skip ci] prepare for next development iteration 2025-02-12 12:04:53 +00:00
alfresco-build
c1c820096e [maven-release-plugin][skip ci] prepare release 23.4.1-A1 2025-02-12 12:04:51 +00:00
Gerard Olenski
ea73d9333d ACS-9240 [release] 23.4.1-A1 [skip tests] [skip docker_latest] 2025-02-12 12:50:28 +01:00
Gerard Olenski
1c933d744d ACS-9240 Community release 23.4.1 2025-02-12 11:41:52 +01:00
Gerard Olenski
3a72a1b232 Revert "ACS-9240 Community release 23.4.1"
This reverts commit f96351024d.
2025-02-12 11:17:13 +01:00
Gerard Olenski
f96351024d ACS-9240 Community release 23.4.1 2025-02-12 11:06:02 +01:00
Gerard Olenski
247a403a88 ACS-9240 Community release 23.4.1 2025-02-12 10:54:16 +01:00
Gerard Olenski
5be2d6fa62 ACS-9240 Community release 23.4.1 2025-02-12 10:34:59 +01:00
Gerard Olenski
866f5a0eac ACS-9240 Community release 23.4.1 2025-02-12 10:24:24 +01:00
Gerard Olenski
b74b15d62e ACS-9240 Community release 23.4.1 2025-02-12 10:16:40 +01:00
Gerard Olenski
8b80678798 ACS-9240 Community release 23.4.1 2025-02-12 10:01:52 +01:00
Gerard Olenski
07e1b8cbbd ACS-9240 Community release 23.4.1 2025-02-12 09:45:02 +01:00
23 changed files with 46 additions and 46 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 (23.2.0-....) for the docker image to build successfully.
RELEASE_VERSION: 23.4.0
DEVELOPMENT_VERSION: 25.1.0-A1-SNAPSHOT
RELEASE_VERSION: 23.4.2-A3
DEVELOPMENT_VERSION: 23.4.2-A4-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
run: mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=default -DrunBugs=false -Dlicense.skipUpdateLicense
- 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
run: mvn -B -ntp -V clean install -Pags -DskipTests -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense
- name: "Test"
run: mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false
run: mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false -Dlicense.skipUpdateLicense
- 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
run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images -Dlicense.skipUpdateLicense
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<dependencies>
@@ -57,4 +57,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>
@@ -71,4 +71,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>
@@ -320,4 +320,4 @@
</build>
</profile>
</profiles>
</project>
</project>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</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>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>23.4.0.67</version>
<version>23.4.2.13</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>23.4.0.67</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.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>23.4.2.13</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.4.1.5</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.4.2-A3</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.0</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>

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 -Dlicense.failOnNotUptodateHeader=true"
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags"
else
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags"
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 -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -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 -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -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 -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
popd

View File

@@ -116,7 +116,7 @@ function buildUpstreamTag() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V clean package -DskipTests -Dlicense.skipUpdateLicense -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 -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
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
popd
}
@@ -146,7 +146,7 @@ function pullUpstreamTagAndBuildDockerImage() {
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V clean package -DskipTests -Dlicense.skipUpdateLicense -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 -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
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
popd
}

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<modules>
@@ -21,4 +21,4 @@
<properties>
<dependency.org-json.version>20170516</dependency.org-json.version>
</properties>
</project>
</project>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.4.0</version>
<version>23.4.2-A1-SNAPSHOT</version>
</parent>
<developers>