Compare commits

..
43 Commits
Author SHA1 Message Date
alfresco-build d5fd219dc5 [maven-release-plugin][skip ci] prepare release 7.4.2 2024-05-23 18:40:31 +00:00
alfresco-build c0d148c223 [release][publish] 7.4.2
Update upstream versions
    - alfresco-community-repo:   22.22
    - alfresco-enterprise-share: 22.17
    - acs-packaging:             7.4.2
    - RELEASE_VERSION:           7.4.2
    - DEVELOPMENT_VERSION:       7.4.3-A1-SNAPSHOT
2024-05-23 17:34:10 +00:00
alfresco-build 8d5db681fe [maven-release-plugin][skip ci] prepare for next development iteration 2024-05-10 11:58:52 +00:00
alfresco-build 84b9bec6be [maven-release-plugin][skip ci] prepare release 7.4.2-A9 2024-05-10 11:58:50 +00:00
alfresco-build 20bfe12ee8 [release] 7.4.2-A9
Update upstream versions
    - alfresco-community-repo:   22.21
    - alfresco-enterprise-share: 22.13
    - acs-packaging:             7.4.2-A9
    - RELEASE_VERSION:           7.4.2-A9
    - DEVELOPMENT_VERSION:       7.4.2-A10-SNAPSHOT
2024-05-10 10:59:36 +00:00
alfresco-build 6edcc627df [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-16 21:39:48 +00:00
alfresco-build ac66d65dc7 [maven-release-plugin][skip ci] prepare release 7.4.2-M1 2024-04-16 21:39:46 +00:00
alfresco-build 450028f253 [release] 7.4.2-M1
Update upstream versions
    - alfresco-community-repo:   22.18
    - alfresco-enterprise-share: 22.11
    - acs-packaging:             7.4.2-M1
    - RELEASE_VERSION:           7.4.2-M1
    - DEVELOPMENT_VERSION:       7.4.2-A9-SNAPSHOT
2024-04-16 20:42:43 +00:00
alfresco-build 0b1d6196a8 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-16 07:17:38 +00:00
alfresco-build 8959e6e722 [maven-release-plugin][skip ci] prepare release 7.4.2-A8 2024-04-16 07:17:37 +00:00
alfresco-build 998c19ecbf [release] 7.4.2-A8
Update upstream versions
    - alfresco-community-repo:   22.18
    - alfresco-enterprise-share: 22.11
    - acs-packaging:             7.4.2-A8
    - RELEASE_VERSION:           7.4.2-A8
    - DEVELOPMENT_VERSION:       7.4.2-A9-SNAPSHOT
2024-04-16 06:19:02 +00:00
Domenico Sibilio a4603d9a22 ACS-7481 Bump IE/SS to 2.0.10 (#1554) 2024-04-12 15:31:47 +02:00
Piotr Żurek ab1c4941e9 Increase available disk space for release and publish jobs (#1552) 2024-04-10 14:54:04 +02:00
alfresco-build c562169343 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-08 12:08:13 +00:00
alfresco-build 027d183f6d [maven-release-plugin][skip ci] prepare release 7.4.2-A7 2024-04-08 12:08:11 +00:00
alfresco-build be892e5965 [release] 7.4.2-A7
Update upstream versions
    - alfresco-community-repo:   22.14
    - alfresco-enterprise-share: 22.7
    - acs-packaging:             7.4.2-A7
    - RELEASE_VERSION:           7.4.2-A7
    - DEVELOPMENT_VERSION:       7.4.2-A8-SNAPSHOT
2024-04-08 11:12:05 +00:00
alfresco-build fe50a471e0 [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-08 09:02:56 +00:00
alfresco-build 7ff003d39f [maven-release-plugin][skip ci] prepare release 7.4.2-A6 2024-04-08 09:02:55 +00:00
alfresco-build 6fe3fef44d [release] 7.4.2-A6
Update upstream versions
    - alfresco-community-repo:   22.14
    - alfresco-enterprise-share: 22.7
    - acs-packaging:             7.4.2-A6
    - RELEASE_VERSION:           7.4.2-A6
    - DEVELOPMENT_VERSION:       7.4.2-A7-SNAPSHOT
2024-04-08 08:06:22 +00:00
alfresco-build 8e31aed2df [maven-release-plugin][skip ci] prepare for next development iteration 2024-04-07 07:47:59 +00:00
alfresco-build a0e390d1e2 [maven-release-plugin][skip ci] prepare release 7.4.2-A5 2024-04-07 07:47:57 +00:00
alfresco-build 5e25b88818 [release] 7.4.2-A5
Update upstream versions
    - alfresco-community-repo:   22.14
    - alfresco-enterprise-share: 22.6
    - acs-packaging:             7.4.2-A5
    - RELEASE_VERSION:           7.4.2-A5
    - DEVELOPMENT_VERSION:       7.4.2-A6-SNAPSHOT
2024-04-07 06:46:58 +00:00
Domenico Sibilio 60210a87db ACS-6961 Bump IE/SS to 2.0.10-A1 (#1551) 2024-04-05 14:11:01 +02:00
alfresco-build 58bcea344b [maven-release-plugin][skip ci] prepare for next development iteration 2024-03-29 09:10:27 +00:00
alfresco-build b8c9d6aa0d [maven-release-plugin][skip ci] prepare release 7.4.2-A4 2024-03-29 09:10:25 +00:00
alfresco-build d33448437b [release] 7.4.2-A4
Update upstream versions
    - alfresco-community-repo:   22.12
    - alfresco-enterprise-share: 22.5
    - acs-packaging:             7.4.2-A4
    - RELEASE_VERSION:           7.4.2-A4
    - DEVELOPMENT_VERSION:       7.4.2-SNAPSHOT
2024-03-29 08:12:57 +00:00
alfresco-build 7782e2bde3 [maven-release-plugin][skip ci] prepare for next development iteration 2024-03-25 08:32:59 +00:00
alfresco-build 4542432bb1 [maven-release-plugin][skip ci] prepare release 7.4.2-A3 2024-03-25 08:32:56 +00:00
alfresco-build 683d8289da [release] 7.4.2-A3
Update upstream versions
    - alfresco-community-repo:   22.8
    - alfresco-enterprise-share: 22.5
    - acs-packaging:             7.4.2-A3
    - RELEASE_VERSION:           7.4.2-A3
    - DEVELOPMENT_VERSION:       7.4.2-SNAPSHOT
2024-03-25 07:30:54 +00:00
alfresco-build 85bf52cb27 [maven-release-plugin][skip ci] prepare for next development iteration 2024-03-22 14:51:03 +00:00
alfresco-build 48ab8cd349 [maven-release-plugin][skip ci] prepare release 7.4.2-A2 2024-03-22 14:51:00 +00:00
alfresco-build c90ad56d5f [release] 7.4.2-A2
Update upstream versions
    - alfresco-community-repo:   22.7
    - alfresco-enterprise-share: 22.4
    - acs-packaging:             7.4.2-A2
    - RELEASE_VERSION:           7.4.2-A2
    - DEVELOPMENT_VERSION:       7.4.2-SNAPSHOT
2024-03-22 13:53:49 +00:00
alfresco-build 8231909512 [maven-release-plugin][skip ci] prepare for next development iteration 2024-03-22 08:33:25 +00:00
alfresco-build 2af58891d8 [maven-release-plugin][skip ci] prepare release 7.4.2-A1 2024-03-22 08:33:23 +00:00
alfresco-build 5d3e5e4be7 [release] 7.4.2-A1
Update upstream versions
    - alfresco-community-repo:   22.4
    - alfresco-enterprise-share: 22.3
    - acs-packaging:             7.4.2-A1
    - RELEASE_VERSION:           7.4.2-A1
    - DEVELOPMENT_VERSION:       7.4.2-SNAPSHOT
2024-03-22 07:33:37 +00:00
mpichura d17f124475 Update ServicePack branch to 7.4.2 [skip ci] 2023-08-09 13:19:28 +02:00
alfresco-build f8c4ca0be4 [maven-release-plugin][skip ci] prepare for next development iteration 2023-08-08 15:11:30 +00:00
alfresco-build 442e4789ca [maven-release-plugin][skip ci] prepare release 7.4.1 2023-08-08 15:11:28 +00:00
alfresco-build fdc5cd4016 [release][publish] 7.4.1
Update upstream versions
    - alfresco-community-repo:   21.14
    - alfresco-enterprise-share: 21.16
    - acs-packaging:             7.4.1
    - RELEASE_VERSION:           7.4.1
    - DEVELOPMENT_VERSION:       7.4.2-A1-SNAPSHOT
2023-08-08 13:50:00 +00:00
alfresco-build 598a1f2f84 [release] 7.4.1-A4
Update upstream versions
    - alfresco-community-repo:   21.14
    - alfresco-enterprise-share: 21.16
    - acs-packaging:             7.4.1-A4
    - RELEASE_VERSION:           7.4.1-A4
    - DEVELOPMENT_VERSION:       7.4.1-A5-SNAPSHOT
2023-08-07 23:32:37 +00:00
alfresco-build fe34b411e7 [release] 7.4.1-A3
Update upstream versions
    - alfresco-community-repo:   21.11
    - alfresco-enterprise-share: 21.12
    - acs-packaging:             7.4.1-A3
    - RELEASE_VERSION:           7.4.1-A3
    - DEVELOPMENT_VERSION:       7.4.1-A4-SNAPSHOT
2023-08-01 14:52:04 +00:00
alfresco-build 6721183427 [release] 7.4.1-A2
Update upstream versions
    - alfresco-community-repo:   21.10
    - alfresco-enterprise-share: 21.11
    - acs-packaging:             7.4.1-A2
    - RELEASE_VERSION:           7.4.1-A2
    - DEVELOPMENT_VERSION:       7.4.1-A3-SNAPSHOT
2023-07-28 20:44:54 +00:00
kmagdziarz 006dac0381 Create ServicePack branch release/7.4.N [skip ci] 2023-05-05 12:39:55 +02:00
25 changed files with 219 additions and 196 deletions
+5 -30
View File
@@ -28,9 +28,9 @@ env:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
TAS_ENVIRONMENT: ./tests/environment
TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
# Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
RELEASE_VERSION: 23.1.0-A24
DEVELOPMENT_VERSION: 23.1.0-A25-SNAPSHOT
# Release version has to start with real version (7.4.2-....) for the docker image to build successfully.
RELEASE_VERSION: 7.4.2
DEVELOPMENT_VERSION: 7.4.3-A1-SNAPSHOT
jobs:
tas_tests:
@@ -116,33 +116,6 @@ jobs:
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
community_test_tomcat_deployment:
name: "Test Tomcat deployment"
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip tests]')"
steps:
- 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
- name: "Init"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
bash ./scripts/ci/init.sh
bash ./scripts/ci/build.sh
- name: "Set up the environment"
run: |
${TAS_SCRIPTS}/start-compose.sh ./dev/docker-compose.yml
${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8983/solr"
- name: "Run tomcat, verify it starts"
id: tests
run: |
(mvn clean install -Prun -rf dev &)
${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8080/alfresco/"
echo "Test Alfresco Repository availability"
curl -Ls -o /dev/null --fail "http://localhost:8080/alfresco"
echo "Test Share availability"
curl -Ls -o /dev/null --fail "http://localhost:8080/share"
docker_latest:
name: Update latest Docker images
runs-on: ubuntu-latest
@@ -189,6 +162,7 @@ jobs:
ports:
- 5000:5000
steps:
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.20.0
- uses: actions/checkout@v3
with:
persist-credentials: false
@@ -231,6 +205,7 @@ jobs:
(github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
github.event_name != 'pull_request'
steps:
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.20.0
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
- name: "Configure AWS credentials"
+161 -96
View File
@@ -7,12 +7,13 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
<dependency.sis.version>1.3</dependency.sis.version>
<dependency.sis.version>1.2</dependency.sis.version>
<tomcat.version>7.0.86</tomcat.version>
<tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
</properties>
@@ -31,116 +32,180 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- Provided dependencies to satisfy Cargo requirement, but not include in built WAR -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId>
<version>${dependency.alfresco-server-root.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
<version>${alfresco.api-explorer.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>dev-community-share-amps-overlay</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<finalName>alfresco</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<container>
<containerId>tomcat9x</containerId>
<type>embedded</type>
<log>target/cargo.log</log>
<systemProperties>
<cargo.tomcat.ajp.port>-1</cargo.tomcat.ajp.port>
<index.subsystem.name>solr6</index.subsystem.name>
<solr.port>${tomcat.default.solr6.port}</solr.port>
<dir.root>${runtime.data.folder}/alf_data</dir.root>
<solr.host>localhost</solr.host>
<solr.base.url>/solr</solr.base.url>
<solr.secureComms>secret</solr.secureComms>
<solr.sharedSecret>secret</solr.sharedSecret>
<encryption.keystore.type>pkcs12</encryption.keystore.type>
<encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
<encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
<metadata-keystore.password>mp6yc0UD9e</metadata-keystore.password>
<metadata-keystore.aliases>metadata</metadata-keystore.aliases>
<metadata-keystore.metadata.password>mp6yc0UD9e</metadata-keystore.metadata.password>
<metadata-keystore.metadata.algorithm>AES</metadata-keystore.metadata.algorithm>
</systemProperties>
</container>
<configuration>
<configfiles>
<configfile>
<file>${runtime.tomcat.conf.folder}/alfresco-context.xml</file>
<todir>conf</todir>
<tofile>context.xml</tofile>
</configfile>
<configfile>
<file>${runtime.tomcat.conf.folder}/tomcat-users.xml</file>
<todir>conf</todir>
<tofile>tomcat-users.xml</tofile>
</configfile>
</configfiles>
<files>
<file>
<file>${runtime.tomcat.conf.folder}/shared</file>
<todir>shared</todir>
</file>
</files>
</configuration>
<deployables>
<deployable>
<overlays>
<overlay>
<groupId>org.alfresco</groupId>
<artifactId>dev-community-repo-amps-overlay</artifactId>
<type>war</type>
</overlay>
</overlays>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
<executions>
<execution>
<id>prepare-exploded-war</id>
<goals>
<goal>exploded</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<systemProperties>
<index.subsystem.name>solr6</index.subsystem.name>
<solr.port>${tomcat.default.solr6.port}</solr.port>
<dir.root>${runtime.data.folder}/alf_data</dir.root>
<solr.host>localhost</solr.host>
<solr.base.url>/solr</solr.base.url>
<solr.secureComms>secret</solr.secureComms>
<solr.sharedSecret>secret</solr.sharedSecret>
<encryption.keystore.type>pkcs12</encryption.keystore.type>
<encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
<encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
<metadata-keystore.password>mp6yc0UD9e</metadata-keystore.password>
<metadata-keystore.aliases>metadata</metadata-keystore.aliases>
<metadata-keystore.metadata.password>mp6yc0UD9e</metadata-keystore.metadata.password>
<metadata-keystore.metadata.algorithm>AES</metadata-keystore.metadata.algorithm>
</systemProperties>
<delegate>false</delegate>
<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
<contextFile>${runtime.tomcat.conf.folder}/alfresco-context.xml</contextFile>
<tomcatUsers>${runtime.tomcat.conf.folder}/tomcat-users.xml</tomcatUsers>
<webapps>
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId>
<version>${dependency.alfresco-server-root.version}</version>
<contextPath>/</contextPath>
<type>war</type>
<properties>
<context>/</context>
</properties>
</deployable>
<deployable>
<asWebapp>true</asWebapp>
<!-- Workaround for https://issues.apache.org/jira/browse/MTOMCAT-269 -->
<!-- tomcat7-maven-plugin does not pick up the context.xml file from META-INF -->
<contextFile>
${project.build.directory}/tomcat/webapps/alfresco-server-root/META-INF/context.xml
</contextFile>
</webapp>
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
<version>${alfresco.api-explorer.version}</version>
<contextPath>/api-explorer</contextPath>
<type>war</type>
<properties>
<context>/api-explorer</context>
</properties>
</deployable>
<deployable>
<asWebapp>true</asWebapp>
</webapp>
<webapp>
<groupId>org.alfresco</groupId>
<artifactId>dev-community-share-amps-overlay</artifactId>
<contextPath>/share</contextPath>
<version>${project.version}</version>
<type>war</type>
<properties>
<context>/share</context>
</properties>
</deployable>
<deployable>
<groupId>org.alfresco</groupId>
<artifactId>dev-acs-community-amps-overlay</artifactId>
<type>war</type>
<properties>
<context>/alfresco</context>
</properties>
</deployable>
</deployables>
<asWebapp>true</asWebapp>
</webapp>
</webapps>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-util</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-tribes</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-log4j</artifactId>
<version>${tomcat.version}</version>
</dependency>
<!-- Workaround required to make Share work after Tika upgrade -->
<dependency>
<groupId>org.apache.sis.core</groupId>
@@ -253,8 +318,8 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<executions>
<execution>
<id>run-exploded-webapp</id>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</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.1.0-A24</version>
<version>7.4.2</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.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context>
<Resources cachingAllowed="true" cacheMaxSize="102400">
<PostResources className="org.apache.catalina.webresources.DirResourceSet"
base="${catalina.home}/shared/classes"
webAppMount="/WEB-INF/classes"/>
</Resources>
<Context docBase="${project.build.directory}/${project.build.finalName}" path="/alfresco">
<Resources className="org.apache.naming.resources.VirtualDirContext"
extraResourcePaths="/=${project.build.directory}/${project.build.finalName}" />
<Loader searchVirtualFirst="true"
className="org.apache.catalina.loader.VirtualWebappLoader"
virtualClasspath="${project.build.outputDirectory};${runtime.tomcat.conf.folder}/shared/classes" />
</Context>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context crossContext="true">
<Environment name="solr/home" type="java.lang.String" value="${solr.solr.home}" override="true"/>
<Environment name="solr/model/dir" type="java.lang.String" value="${solr.solr.model.dir}" override="true"/>
<Environment name="solr/content/dir" type="java.lang.String" value="${solr.solr.content.dir}" override="true"/>
<Resources className="org.apache.naming.resources.VirtualDirContext"
extraResourcePaths="/=${project.build.directory}/tomcat/webapps/alfresco-solr4" />
<Loader searchVirtualFirst="true"
className="org.apache.catalina.loader.VirtualWebappLoader"
virtualClasspath="${project.build.directory}/tomcat/webapps/alfresco-solr4/WEB-INF/classes" />
</Context>
+5 -5
View File
@@ -25,14 +25,14 @@ services:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:2.0.3
image: alfresco/alfresco-search-services:2.0.10
mem_limit: 2g
environment:
#Solr needs to know how to register itself with Alfresco
SOLR_ALFRESCO_HOST: "host.docker.internal"
SOLR_ALFRESCO_HOST: "alfresco"
SOLR_ALFRESCO_PORT: "8080"
#Alfresco needs to know how to call solr
SOLR_SOLR_HOST: "localhost"
SOLR_SOLR_HOST: "solr6"
SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
@@ -44,10 +44,10 @@ services:
"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
ports:
- 8983:8983 #Browser port
- 8083:8983 #Browser port
activemq:
image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
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>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<dependencies>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<dependencies>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
+1 -13
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
@@ -119,9 +119,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -188,9 +185,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -261,9 +255,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -293,9 +284,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
+1 -13
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
@@ -101,9 +101,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -170,9 +167,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -243,9 +237,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
@@ -275,9 +266,6 @@
<platform>linux/amd64</platform>
<platform>linux/arm64</platform>
</platforms>
<attestations>
<provenance>false</provenance>
</attestations>
</buildx>
<dockerFileDir>${project.basedir}</dockerFileDir>
<args>
+1 -1
View File
@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</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.1.0-A24</version>
<version>7.4.2</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>23.1.0.178</version>
<version>22.22</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>23.1.0.178</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>23.1.0.182</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>23.1.0-A24</dependency.acs-packaging.version> <!-- for Share distribution zip -->
<dependency.alfresco-community-repo.version>22.22</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>22.17</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.4.2</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.1.0-A24</tag>
<tag>7.4.2</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<packaging>pom</packaging>
+2 -2
View File
@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.7-A5
SOLR6_TAG=2.0.10
POSTGRES_TAG=14.4
ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<modules>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<developers>
+3 -3
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<properties>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.9.3</version>
<version>3.8.6</version>
</dependency>
</dependencies>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<developers>
+2 -2
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<developers>
@@ -23,7 +23,7 @@
<properties>
<suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
<dependency.groovy.version>3.0.18</dependency.groovy.version>
<dependency.groovy.version>3.0.12</dependency.groovy.version>
</properties>
<dependencies>
+1 -7
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<developers>
@@ -73,12 +73,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${dependency.awaitility.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>23.1.0-A24</version>
<version>7.4.2</version>
</parent>
<developers>