Compare commits

..
31 Commits
Author SHA1 Message Date
alfresco-build 1119822c8e [maven-release-plugin][skip ci] prepare release 7.2.2.4 2024-07-26 13:50:46 +00:00
alfresco-build 38a18003fb [release][publish] 7.2.2.4
Update upstream versions
    - alfresco-community-repo:   16.28
    - alfresco-enterprise-share: 16.29
    - acs-packaging:             7.2.2.4
    - RELEASE_VERSION:           7.2.2.4
    - DEVELOPMENT_VERSION:       7.2.2.5-SNAPSHOT
2024-07-26 13:03:15 +00:00
Aleksandra Onych 3b9f2afd9b [ACS-8352] Migrate to docker compose v2 (#1578) 2024-07-10 10:03:38 +02:00
Sara 3c57b029f5 Bump SS/IE to 2.0.11 in 7-2-2 (#1572) 2024-07-08 17:18:06 +01:00
Kacper Magdziarz a6d0b9f695 [ACS-8287] Bump SS/IE to 2.0.11-A6 (#1564) 2024-06-27 14:14:00 +02:00
Kacper Magdziarz d9413ff941 Create HotFix branch for 7.2.2 [skip ci] 2024-05-24 16:23:13 +02:00
alfresco-build 11ea2200df [maven-release-plugin][skip ci] prepare release 7.2.2 2024-05-24 14:17:03 +00:00
alfresco-build 24699e42a2 [release][publish] 7.2.2
Update upstream versions
    - alfresco-community-repo:   16.21
    - alfresco-enterprise-share: 16.22
    - acs-packaging:             7.2.2
    - RELEASE_VERSION:           7.2.2
    - DEVELOPMENT_VERSION:       7.2.3-A2-SNAPSHOT
2024-05-24 13:46:30 +00:00
alfresco-build 61f468eb99 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-20 18:13:06 +00:00
alfresco-build c147eb3c04 [maven-release-plugin][skip ci] prepare release 7.2.2-A4 2024-05-20 18:13:05 +00:00
alfresco-build 7b07535191 [release] 7.2.2-A4
Update upstream versions
    - alfresco-community-repo:   16.21
    - alfresco-enterprise-share: 16.21
    - acs-packaging:             7.2.2-A4
    - RELEASE_VERSION:           7.2.2-A4
    - DEVELOPMENT_VERSION:       7.2.2-A5-SNAPSHOT
2024-05-20 17:41:26 +00:00
Kacper Magdziarz 3f5523b003 [ACS-7896] Bump AIS/ATS 5.1.2/4.1.2 (#1559) 2024-05-20 10:17:15 +02:00
alfresco-build aa4ccdc211 [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-17 15:33:12 +00:00
alfresco-build d9d76980fd [maven-release-plugin][skip ci] prepare release 7.2.2-A1 2024-05-17 15:33:10 +00:00
Sara 53df0b35e2 Please [skip tests] and [release] ACS 7.2.2-A1 (#1560)
* Please [skip tests] and [release] ACS 7.2.2-A1

* Please [skip tests] and [release] ACS 7.2.2-A1
2024-05-17 16:19:13 +01:00
Sara 19a5c04c35 ACS-7886 Change from Travis to GHA for 7.2.2 service pack (#1558)
* ACS-7886 Change from Travis to GHA for 7.2.2 service pack

* ACS-7886 Temporary fix until community share is java 17 compliant

* ACS-7886 Fix tests by allowing reflective access

* ACS-7886 Compile with Java 11

* ACS-7886 No need for fix as now Java 11

* ACS-7886 Try with java 11 in setup-java-build

* ACS-7886 No need for fix as now java 11

* ACS-7886 Use java 11 for all java builds
2024-05-17 14:42:28 +01:00
Kacper Magdziarz 8af0f1aee0 [ACS-7715] Backward compatibility testing of Search and Insight Engine 2.0.10 with ACS 7.2.X (#1557) 2024-05-09 09:07:28 +02:00
mstrankowski bf4716ed3b Builds cleanup trigger 2022-07-26 20:06:08 +02:00
mstrankowski f513532457 [skip tests][skip tas] Clearing up dependencies
Would be cleared up by a release, but I don't think we should block the usage of acs-community-packaging before that release happens
2022-07-26 18:13:46 +02:00
mstrankowski 500aabe993 Update ServicePack branch to 7.2.2 [skip ci] 2022-07-25 20:55:48 +02:00
Travis CI User c4e4ecb0c2 [maven-release-plugin][skip ci] prepare for next development iteration 2022-07-25 17:19:15 +00:00
Travis CI User 4cb4ef2bed [maven-release-plugin][skip ci] prepare release 7.2.1 2022-07-25 17:19:13 +00:00
Travis CI User 21ab328494 [release][publish] 7.2.1
Update upstream versions
    - alfresco-community-repo:   15.9
    - alfresco-enterprise-share: 15.17
    - acs-packaging:             7.2.1
    - RELEASE_VERSION:           7.2.1
    - DEVELOPMENT_VERSION:       7.2.2-A1-SNAPSHOT
2022-07-25 16:12:32 +00:00
Travis CI User 9743d67408 [maven-release-plugin][skip ci] prepare for next development iteration 2022-07-15 11:40:27 +00:00
Travis CI User 13e009194e [maven-release-plugin][skip ci] prepare release 7.2.1-A1 2022-07-15 11:40:25 +00:00
Travis CI User 68d4281199 [release] 7.2.1-A1
Update upstream versions
    - alfresco-community-repo:   15.8
    - alfresco-enterprise-share: 15.15
    - acs-packaging:             7.2.1-A1
    - RELEASE_VERSION:           7.2.1-A1
    - DEVELOPMENT_VERSION:       7.2.1-A2-SNAPSHOT
2022-07-15 10:41:57 +00:00
Vítor Moreira 73035efd62 MNT-22946: update upstream versions to a non-vulnerable spring version (#1477) 2022-05-13 10:20:39 +01:00
alandavis 5e72f50fb1 Update upstream versions
- alfresco-community-repo:   15.2
    - alfresco-enterprise-share: 15.2
2022-03-22 11:59:52 +00:00
alandavis 51d9d16905 Update upstream versions
- alfresco-community-repo:  15.1
    - alfresco-enterprise-share: 14.96 - this was the version in the 7.2.0 release
2022-03-21 16:47:24 +00:00
alandavis 03000d6fff Create release/7.2.N branch
[skip ci] wait for acs-packaging
2022-03-21 10:15:22 +00:00
alandavis c672395883 Create release/7.2.0 HF branch 2022-03-21 09:52:18 +00:00
31 changed files with 59 additions and 63 deletions
+11 -2
View File
@@ -16,6 +16,7 @@ on:
workflow_dispatch:
env:
JAVA_VERSION: "11"
GIT_USERNAME: ${{ secrets.BOT_GITHUB_USERNAME }}
GIT_EMAIL: ${{ secrets.BOT_GITHUB_EMAIL }}
GIT_PASSWORD: ${{ secrets.BOT_GITHUB_TOKEN }}
@@ -29,8 +30,8 @@ env:
TAS_ENVIRONMENT: ./tests/environment
TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
# Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
RELEASE_VERSION: 7.3.2-A5
DEVELOPMENT_VERSION: 7.3.2-SNAPSHOT
RELEASE_VERSION: 7.2.2.4
DEVELOPMENT_VERSION: 7.2.2.5-SNAPSHOT
jobs:
tas_tests:
@@ -81,6 +82,8 @@ jobs:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -103,6 +106,8 @@ jobs:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -130,6 +135,8 @@ jobs:
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -157,6 +164,8 @@ jobs:
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
with:
java-version: ${{ env.JAVA_VERSION }}
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
+4 -4
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
@@ -121,12 +121,12 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
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`.
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
+4 -4
View File
@@ -64,7 +64,7 @@ alias comXS='comS && comP'
# Clean up of docker images and content stores (alf_data directories)
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 envUp='docker compose -f acs-community-packaging/dev/docker-compose.yml up'
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'
+2 -2
View File
@@ -7,11 +7,11 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
<dependency.sis.version>1.2</dependency.sis.version>
<dependency.sis.version>1.1</dependency.sis.version>
<tomcat.version>7.0.86</tomcat.version>
<tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<build>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<build>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
+4 -4
View File
@@ -6,7 +6,7 @@ version: "2"
services:
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
image: alfresco/alfresco-transform-core-aio:2.5.7
mem_limit: 1536m
environment:
JAVA_OPTS: " -Xms256m -Xmx1536m"
@@ -14,7 +14,7 @@ services:
- 8090:8090
postgres:
image: postgres:14.4
image: postgres:13.3
mem_limit: 512m
environment:
- POSTGRES_PASSWORD=alfresco
@@ -25,7 +25,7 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.3
image: alfresco/alfresco-search-services:2.0.11
mem_limit: 2g
environment:
#Solr needs to know how to register itself with Alfresco
@@ -47,7 +47,7 @@ services:
- 8083:8983 #Browser port
activemq:
image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
image: alfresco/alfresco-activemq:5.16.1
mem_limit: 1g
ports:
- 8161:8161 # Web Console
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<dependencies>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<dependencies>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
+1 -1
View File
@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
</project>
+7 -12
View File
@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>19.17</version>
<version>16.28</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>19.17</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>19.9</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.3.2-A5</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>16.28</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>16.29</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.2.2.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>
@@ -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>7.3.2-A5</tag>
<tag>7.2.2.4</tag>
</scm>
<distributionManagement>
@@ -167,12 +167,7 @@
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>cmis</artifactId>
<version>${dependency.alfresco-community-repo.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>cmis</artifactId>
<artifactId>alfresco-community-repo-cmis-test</artifactId>
<version>${dependency.alfresco-community-repo.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<packaging>pom</packaging>
Executable → Regular
View File
Executable → Regular
View File
Executable → Regular
View File
View File
Executable → Regular
View File
-5
View File
@@ -1,5 +0,0 @@
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
+4 -3
View File
@@ -1,3 +1,4 @@
SOLR6_TAG=2.0.3
POSTGRES_TAG=14.4
ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
TRANSFORMERS_TAG=5.1.2
SOLR6_TAG=2.0.11
POSTGRES_TAG=13.3
ACTIVEMQ_TAG=5.16.1
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<modules>
+3 -3
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<developers>
@@ -58,13 +58,13 @@
<dependencies>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>cmis</artifactId>
<artifactId>alfresco-community-repo-cmis-test</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>cmis</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
+3 -3
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<properties>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.23.1</version>
<version>3.22.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.8.6</version>
<version>3.8.4</version>
</dependency>
</dependencies>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<developers>
+2 -4
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<developers>
@@ -23,7 +23,7 @@
<properties>
<suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
<dependency.groovy.version>3.0.12</dependency.groovy.version>
<dependency.groovy.version>3.0.9</dependency.groovy.version>
</properties>
<dependencies>
@@ -114,10 +114,8 @@
<suiteXmlFiles>
<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles>
<!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
<argLine>
--illegal-access=warn
--add-opens=java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
+1 -3
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<developers>
@@ -84,10 +84,8 @@
<suiteXmlFiles>
<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles>
<!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
<argLine>
--illegal-access=warn
--add-opens=java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.3.2-A5</version>
<version>7.2.2.4</version>
</parent>
<developers>