Compare commits

..
10 Commits
Author SHA1 Message Date
alfresco-build eb57ffeacd [maven-release-plugin][skip ci] prepare release 23.2.0 2024-02-28 17:42:22 +00:00
alfresco-build d73936551e [release][publish] 23.2.0
Update upstream versions
    - alfresco-community-repo:   23.2.0.60
    - alfresco-enterprise-share: 23.2.0.72
    - acs-packaging:             23.2.0
    - RELEASE_VERSION:           23.2.0
    - DEVELOPMENT_VERSION:       23.2.1-SNAPSHOT
2024-02-28 16:42:34 +00:00
alfresco-build 49922dac1e [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-21 18:11:25 +00:00
alfresco-build ed346951b2 [maven-release-plugin][skip ci] prepare release 23.2.0-A21 2024-02-21 18:11:23 +00:00
alfresco-build 911e67eb38 [release] 23.2.0-A21
Update upstream versions
    - alfresco-community-repo:   23.2.0.56
    - alfresco-enterprise-share: 23.2.0.63
    - acs-packaging:             23.2.0-A21
    - RELEASE_VERSION:           23.2.0-A21
    - DEVELOPMENT_VERSION:       23.2.0-A22-SNAPSHOT
2024-02-21 17:11:37 +00:00
alfresco-build a004cbb7c5 [maven-release-plugin][skip ci] prepare for next development iteration 2024-02-20 18:23:09 +00:00
alfresco-build 1c1d0280ac [maven-release-plugin][skip ci] prepare release 23.2.0-A20 2024-02-20 18:23:06 +00:00
alfresco-build 672585ffcd [release] 23.2.0-A20
Update upstream versions
    - alfresco-community-repo:   23.2.0.54
    - alfresco-enterprise-share: 23.2.0.60
    - acs-packaging:             23.2.0-A20
    - RELEASE_VERSION:           23.2.0-A20
    - DEVELOPMENT_VERSION:       23.2.0-A21-SNAPSHOT
2024-02-20 17:22:07 +00:00
alfresco-build 30a5d3774b [release] 23.2.0-A19
Update upstream versions
    - alfresco-community-repo:   23.2.0.51
    - alfresco-enterprise-share: 23.2.0.58
    - acs-packaging:             23.2.0-A19
    - RELEASE_VERSION:           23.2.0-A19
    - DEVELOPMENT_VERSION:       23.2.0-A20-SNAPSHOT
2024-02-19 16:05:37 +00:00
mpichura 1f608ca037 Creating release branch release/stabilization/23.2 for 23.2.0 ACS release [skip ci] 2024-02-19 16:33:59 +01:00
28 changed files with 54 additions and 81 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.3.24
DEVELOPMENT_VERSION: 23.3.25-SNAPSHOT
RELEASE_VERSION: 23.2.0
DEVELOPMENT_VERSION: 23.2.1-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 -Dlicense.skipUpdateLicense -Pags -Ppush-docker-images
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
+5 -5
View File
@@ -66,9 +66,9 @@ The repository code will need to talk to other ACS components, such as a databas
The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
~~~
# The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
the `docker compose` command.
the `docker-compose` command.
cd acs-community-packaging
docker compose -f dev/docker-compose.yml up
docker-compose -f dev/docker-compose.yml up
Creating dev_activemq_1 ... done
Creating dev_solr6_1 ... done
Creating dev_postgres_1 ... done
@@ -120,13 +120,13 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
## Clean up
When finished, kill the tomcat instance and stop the Docker instances. You will normally also
remove the Docker containers, as you will need a clean database if you are going to issue
another `mvn clean install` command. If you started `docker compose` in a separate terminal session,
simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`.
another `mvn clean install` command. If you started `docker-compose` in a separate terminal session,
simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`.
~~~
^C
... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
docker compose -f dev/docker-compose.yml rm
docker-compose -f dev/docker-compose.yml rm
Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
Are you sure? [yN] y
Removing dev_transform-core-aio_1 ... done
+3 -3
View File
@@ -65,6 +65,6 @@ alias comXS='comS && comP'
alias drm='docker rm -f $(docker ps -q)'
alias arm='rm -rf `find . -name alf_data`'
alias envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
alias envStop='docker compose -f acs-community-packaging/dev/docker-compose.yml stop'
alias envKill='docker compose -f acs-community-packaging/dev/docker-compose.yml kill'
alias envRm='docker compose -f acs-community-packaging/dev/docker-compose.yml rm'
alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
alias envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</version>
</parent>
<properties>
+1 -1
View File
@@ -25,7 +25,7 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.11
image: alfresco/alfresco-search-services:2.0.3
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.3.24</version>
<version>23.2.0</version>
</parent>
<properties>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</version>
</parent>
<dependencies>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</version>
</parent>
<properties>
+2 -2
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</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.3.24</version>
<version>23.2.0</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>23.3.21.5</version>
<version>23.2.0.60</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>23.3.21.5</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.3.1.15</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.3.24</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>23.2.0.60</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.2.0.72</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.2.0</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.3.24</tag>
<tag>23.2.0</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<packaging>pom</packaging>
+1 -1
View File
@@ -83,7 +83,7 @@ else
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 -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense "-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 -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense "-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 -Dmaven.javadoc.skip=true -Dlicense.skipUpdateLicense ${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
@@ -2,4 +2,4 @@ set -x
export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
# .env files are picked up from project directory correctly on docker-compose 1.23.0+
docker compose -f acs-community-packaging/dev/docker-compose.yml up
docker-compose -f acs-community-packaging/dev/docker-compose.yml up
+1 -1
View File
@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.11
SOLR6_TAG=2.0.8.1
POSTGRES_TAG=15.4
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<modules>
+1 -6
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<developers>
@@ -67,11 +67,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
+2 -2
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<properties>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.26.3</version>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
+1 -7
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<developers>
@@ -33,12 +33,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>email</artifactId>
+2 -8
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<developers>
@@ -23,7 +23,7 @@
<properties>
<suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
<dependency.groovy.version>3.0.22</dependency.groovy.version>
<dependency.groovy.version>3.0.19</dependency.groovy.version>
</properties>
<dependencies>
@@ -34,12 +34,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>utility</artifactId>
+1 -6
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<developers>
@@ -79,11 +79,6 @@
<version>${dependency.awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
+1 -6
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.3.24</version>
<version>23.2.0</version>
</parent>
<developers>
@@ -37,11 +37,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.epam.reportportal</groupId>
<artifactId>agent-java-testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>