Compare commits

...

37 Commits

Author SHA1 Message Date
Travis CI User
7fccdd0dc5 [maven-release-plugin][skip ci] prepare release 7.1.1-A5 2022-01-18 22:11:56 +00:00
alandavis
a4d58b3454 [release] 7.1.1-A5
[skip tests][skip docker_latest] as we have just run these
2022-01-18 21:52:49 +00:00
Travis CI User
91c69060f3 Update upstream versions
- alfresco-community-repo:   12.20
    - alfresco-enterprise-share: 12.14
    - acs-packaging:             7.1.1-A5
    - RELEASE_VERSION:           7.1.1-A5
    - DEVELOPMENT_VERSION:       7.1.1-A6-SNAPSHOT
2022-01-18 20:20:59 +00:00
Sara
49fa6a4cf0 [skip ci] Update CHANGELOG.md to include 7.1.1 changes (#1462) 2022-01-15 01:51:22 +00:00
Travis CI User
8ee1f0ace9 Update upstream versions
- alfresco-community-repo:   12.17
    - alfresco-enterprise-share: 12.12
    - acs-packaging:             7.1.1-A2
    - RELEASE_VERSION:           7.1.1-A2
    - DEVELOPMENT_VERSION:       7.1.1-SNAPSHOT
2022-01-14 12:20:12 +00:00
Sara
fed63a7c74 MNT-22696 Update CHANGELOG.md (#1460)
[skip ci]
2022-01-13 16:55:55 +00:00
Tom Page
58b795d54e [skip tests] Skip license header check when building upstream project.
(cherry picked from commit 5645836ac4)
2022-01-10 15:56:54 +00:00
Travis CI User
f33f69fe9f Update upstream versions
- alfresco-community-repo:   12.3
    - alfresco-enterprise-share: 12.2
    - acs-packaging:             7.1.1-A1
    - RELEASE_VERSION:           7.1.1-A1
    - DEVELOPMENT_VERSION:       7.1.1-A2-SNAPSHOT
2021-10-20 20:12:34 +00:00
alandavis
d8b1c5f543 prep work 7.1.0 -> 7.1.1 2021-10-01 07:48:28 +01:00
alandavis
191eaaedcf parent pom version must exist
[skip ci]
2021-09-29 05:40:18 +01:00
alandavis
0242f4a3ac Get master ready for 7.1.1 development
[skip ci]
2021-09-28 23:09:36 +01:00
alandavis
3e169812da Get the branch ready for HFs
[skip ci]
2021-09-28 22:46:10 +01:00
Travis CI User
53874729fb [maven-release-plugin][skip ci] prepare for next development iteration 2021-09-28 18:05:09 +00:00
Travis CI User
3615d4630e [maven-release-plugin][skip ci] prepare release 7.1.0 2021-09-28 18:05:06 +00:00
alandavis
30678974aa [release][publish] 7.1.0
[skip tests] as we have just run them
2021-09-28 17:50:37 +01:00
Travis CI User
da07943c0f [maven-release-plugin][skip ci] prepare for next development iteration 2021-09-28 16:21:41 +00:00
Travis CI User
6f6b6edbfd [maven-release-plugin][skip ci] prepare release 7.1.0-A16 2021-09-28 16:21:38 +00:00
alandavis
1db65b1eff [release] 7.1.0-A16
Update upstream versions

    - alfresco-community-repo:  11.140
    - alfresco-enterprise-share: 11.77
    - share 7.1.0.1
2021-09-28 15:36:48 +01:00
Travis CI User
679fb6613f [maven-release-plugin][skip ci] prepare for next development iteration 2021-09-09 08:01:29 +00:00
Travis CI User
321e417edd [maven-release-plugin][skip ci] prepare release 7.1.0-A14 2021-09-09 08:01:27 +00:00
alandavis
beb57dc709 [release] 7.1.0-A14
[skip docker_latest][skip tests] we have just done this

Previous commit did not include the travis.yml file
2021-09-09 08:01:39 +01:00
Travis CI User
bb2c33aab4 [maven-release-plugin][skip ci] prepare for next development iteration 2021-09-08 21:47:28 +00:00
Travis CI User
c8f68468ad [maven-release-plugin][skip ci] prepare release 7.1.0-A13 2021-09-08 21:47:26 +00:00
alandavis
9a8993220b [release] 7.1.0-A14 2021-09-08 20:37:18 +01:00
alandavis
2a259fa0a5 Use alfresco-community-share in comS and comSD aliases
[skip ci]
2021-09-08 17:06:25 +01:00
pzhyland
667a96354e ACS-1961 Use maven-war-plugin version from community repo in tomcat dev env (#1442)
[skip ci]
2021-09-08 17:01:08 +01:00
alandavis
fd09641729 [release] 7.1.0-A13 2021-09-04 15:23:57 +01:00
Ayman Harake
d54b95abee ATS-958: Bump T-core to 2.5.3 (#1441) 2021-09-03 10:26:39 +01:00
alandavis
06e59f5a57 [release] 7.1.0-A12 2021-09-03 08:57:56 +01:00
CezarLeahu
3aba0d8ec0 APPS-1068 Enable docker updates for AGS latest images (#1440)
Enable the updating of AGS-specific images with the tag `latest` from the **master** branch (on Quay only):
* `quay.io/alfresco/alfresco-governance-repository-community`
* `quay.io/alfresco/alfresco-governance-share-community`
2021-08-26 13:59:23 +03:00
Travis CI User
8dbcb3f209 [maven-release-plugin][skip ci] prepare for next development iteration 2021-08-26 10:33:18 +00:00
Travis CI User
5e08726b87 [maven-release-plugin][skip ci] prepare release 7.1.0-A11 2021-08-26 10:33:16 +00:00
rrajoria
8752368c66 [release] 7.1.0-A11 2021-08-26 14:12:42 +05:30
Travis CI User
55f82d8d18 [maven-release-plugin][skip ci] prepare for next development iteration 2021-08-25 11:38:24 +00:00
Travis CI User
f17749e6ff [maven-release-plugin][skip ci] prepare release 7.1.0-A10 2021-08-25 11:38:22 +00:00
cezar.leahu
92c23a23b5 [release] 7.1.0-A10 2021-08-25 12:52:04 +03:00
Eliza Stan
4baa5a8275 APPS-1068 Publish AGS-specific docker images from acs-packaging (#1431)
Co-authored-by: cezar.leahu <cezar.leahu@ness.com>
2021-08-25 10:23:18 +03:00
31 changed files with 395 additions and 39 deletions

View File

@@ -28,9 +28,9 @@ env:
global:
- TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
- TAS_ENVIRONMENT=./tests/environment
# Release version has to start with real version (7.1.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.1.0-A9
- DEVELOPMENT_VERSION=7.1.0-SNAPSHOT
# Release version has to start with real version (7.1.1-....) for the docker image to build successfully.
- RELEASE_VERSION=7.1.1-A5
- DEVELOPMENT_VERSION=7.1.1-A6-SNAPSHOT
stages:
- name: test
@@ -121,7 +121,7 @@ jobs:
- name: "Update latest images"
stage: docker_latest
script: travis_retry travis_wait 30 mvn -B -V clean install -DskipTests -Dmaven.javadoc.skip=true -Ppush-docker-images
script: travis_retry travis_wait 30 mvn -B -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
- name: "Release and Copy to S3 Staging Bucket"
stage: release

View File

@@ -1,3 +1,46 @@
<h1> 7.1.1 Community
</h1>
<h2> New Features
</h2>
<ul>
<li>New REST API Endpoints:
DELETE '/nodes/{nodeId}/renditions/{renditionId}'
DELETE '/nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}'
</li>
</ul>
<h2> Bug
</h2>
<ul>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-22611'>MNT-22611</a>] - Disable rules flag not working correctly in bulk import with ACS v6.x or above
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/ACS-2067'>ACS-2067</a>] - DAU: Live Probe seems to fail with 503 when Direct Access Urls are enabled
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-21706'>MNT-21706</a>] - Change to Node Service permissions breaks setAssociations
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-21883'>MNT-21883</a>] - Documents Shared from a Smart Folder cannot be Unshared
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-18700'>MNT-18700</a>] - Message bundles do not deploy/reload automatically when dynamically deployed
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-22680'>MNT-22680</a>] - Some formatting elements not displaying when viewing a wiki page after ACS v5.2.7.12 installed
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-21953'>MNT-21953</a>] - Configuration for Handling Failed Thumbnail Creation No Longer Works
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-22136'>MNT-22136</a>] - WebDAV PROPFIND returns 302 code instead of 404 when using ACS Repo docker image (eg. via docker-compose)
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-21551'>MNT-21551</a>] - Creating links to Folder does not work when default root node is changed
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-22715'>MNT-22715</a>] - Document Version Issue - Unexpected: current version does not appear to be 1st version in the list
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/MNT-22601'>MNT-22601</a>] - Admin Console functionality becomes unusable in Alfresco v7.0.1.3
</li>
<li>[<a href='https://alfresco.atlassian.net/browse/ACS-2180'>ACS-2180</a>] - Secret Communication for Alfresco/SOLR is not protecting Alfresco Repository endpoints
</li>
</ul>
<h1> 7.1.0 Community
</h1>
<h2>

View File

@@ -19,12 +19,12 @@
#
# Aliases to build projects WITHOUT creating docker images or TAS tests jars
# comR - alfresco-community-repo
# comS - share
# comS - alfresco-community-share
# comP - acs-community-packaging
#
# Aliases to build projects including DOCKER images and TAS tests jars
# comRD - alfresco-community-repo
# comSD - share
# comSD - alfresco-community-share
# comPD - acs-community-packaging
# Aliases to start tomcat in a CLEAN environment - remember to start a docker-compose environment - see envUp
@@ -42,11 +42,11 @@ then
fi
alias comR='(cd alfresco-community-repo && mvn clean install $AMPS -DskipTests=true -Dversion.edition=Community)'
alias comS='(cd share && mvn clean install $AMPS -DskipTests -Dmaven.javadoc.skip=true)'
alias comS='(cd alfresco-community-share && mvn clean install $AMPS -DskipTests -Dmaven.javadoc.skip=true)'
alias comP='(cd acs-community-packaging && mvn clean install $AMPS -Dmaven.javadoc.skip=true)'
alias comRD='(cd alfresco-community-repo && mvn clean install $AMPS -DskipTests=true -Dversion.edition=Community -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest)'
alias comSD='(cd share && mvn clean install $AMPS -DskipTests=true -DskipTests -Dmaven.javadoc.skip=true -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest)'
alias comSD='(cd alfresco-community-share && mvn clean install $AMPS -DskipTests=true -DskipTests -Dmaven.javadoc.skip=true -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest)'
alias comPD='(cd acs-community-packaging && mvn clean install $AMPS -DskipTests=true -Dmaven.javadoc.skip=true -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest -Dshare.image.tag=latest)'
alias comT='(cd acs-community-packaging && mvn clean install -Prun $AMPS -rf dev)'

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<properties>
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<overlays>
<overlay>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<build>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<build>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<properties>

View File

@@ -6,7 +6,7 @@ version: "2"
services:
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.4.0
image: alfresco/alfresco-transform-core-aio:2.5.3
mem_limit: 1536m
environment:
JAVA_OPTS: " -Xms256m -Xmx1536m"

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<properties>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<dependencies>

View File

@@ -0,0 +1,29 @@
### Apply AGS community repo AMP to ACS image
FROM alfresco/alfresco-content-repository-community:${image.tag}
# Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
# The access will be fixed after all operations are done.
USER root
COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/
# Install amps on alfresco.war
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
/usr/local/tomcat/amps \
/usr/local/tomcat/webapps/alfresco -directory -nobackup
### Copy gs-api-explorer war into webapps folder
COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
### Unpack gs-api-explorer.war
RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/webapps/gs-api-explorer && \
jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
# All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
RUN chgrp -R Alfresco /usr/local/tomcat && \
find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
chmod -R g+r /usr/local/tomcat/webapps
# Switching back to alfresco user after having added amps files to run the container as non-root
USER alfresco

View File

@@ -0,0 +1,72 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>content-services-community-docker-ags</artifactId>
<name>Alfresco Content Services Community Docker Image Builder for AGS</name>
<description>Alfresco Governance Services Community Repository Extension</description>
<packaging>pom</packaging>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.1.1-A5</version>
</parent>
<properties>
<image.name>alfresco/alfresco-governance-repository-community</image.name>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-war-files</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
<version>${alfresco.api-explorer.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/war/api-explorer</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-amps</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
<version>${dependency.alfresco-community-repo.version}</version>
<type>war</type>
<destFileName>gs-api-explorer-${dependency.alfresco-community-repo.version}.war</destFileName>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo</artifactId>
<version>${dependency.alfresco-community-repo.version}</version>
<type>amp</type>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -7,11 +7,12 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<properties>
<image.name>alfresco/alfresco-content-repository-community</image.name>
<docker.quay-expires.value>NEVER</docker.quay-expires.value>
</properties>
<build>

View File

@@ -0,0 +1,14 @@
### Apply AGS community share AMP to Share image
FROM alfresco/alfresco-share-base:${share.image.tag}
LABEL quay.expires-after=${docker.quay-expires.value}
### Copy the AMP from build context to amps_share
COPY target/alfresco-governance-services-community-share-*.amp /usr/local/tomcat/amps_share/
### Install AMP on share
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
/usr/local/tomcat/amps_share/alfresco-governance-services-community-share-*.amp /usr/local/tomcat/webapps/share -nobackup
ENTRYPOINT ["/usr/local/tomcat/shared/classes/alfresco/substituter.sh", "catalina.sh run"]
EXPOSE 8000

158
docker-share/ags/pom.xml Normal file
View File

@@ -0,0 +1,158 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>share-community-docker-ags</artifactId>
<packaging>pom</packaging>
<name>Alfresco Share Community Docker Image Builder for AGS</name>
<description>Alfresco Governance Services Share Community Extension</description>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.1.1-A5</version>
</parent>
<properties>
<image.name>alfresco/alfresco-governance-share-community</image.name>
<docker.quay-expires.value>NEVER</docker.quay-expires.value>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-amps</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-share</artifactId>
<version>${dependency.alfresco-community-share.version}</version>
<type>amp</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>build-docker-images</id>
<!-- builds "image:latest" locally -->
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>push-docker-images</id>
<!-- publishes "image:latest" to Quay -->
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<!-- publishes "image:release_version" to DockerHub and Quay -->
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>build-push-image</id>
<phase>deploy</phase>
<configuration combine.self="override">
<images>
<!-- DockerHub image -->
<image>
<name>${image.name}:${project.version}</name>
</image>
</images>
</configuration>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
<execution>
<id>build-push-quay-image</id>
<phase>deploy</phase>
<configuration combine.self="override">
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
</image>
</images>
</configuration>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

12
docker-share/pom.xml Normal file
View File

@@ -0,0 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>share-community-docker</artifactId>
<name>Alfresco Share Community Docker Image Builder</name>
<packaging>pom</packaging>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.1-A5</version>
</parent>
</project>

16
pom.xml
View File

@@ -3,28 +3,29 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>11.86</version>
<version>12.20</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>11.86</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>11.46</dependency.alfresco-community-share.version>
<alfresco.share.version>7.1.0-M2</alfresco.share.version> <!-- Share distribution zip from acs-packaging -->
<dependency.alfresco-community-repo.version>12.20</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>12.14</dependency.alfresco-community-share.version>
<alfresco.share.version>7.1.0.1</alfresco.share.version> <!-- Share distribution zip from acs-packaging -->
<repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
<share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
</properties>
<scm>
<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>HEAD</tag>
<tag>7.1.1-A5</tag>
</scm>
<distributionManagement>
@@ -42,6 +43,7 @@
<module>distribution</module>
<module>public-javadoc</module>
<module>docker-alfresco</module>
<module>docker-share</module>
</modules>
<profiles>
@@ -49,6 +51,8 @@
<id>ags</id>
<modules>
<module>distribution-ags</module>
<module>docker-alfresco/ags</module>
<module>docker-share/ags</module>
</modules>
</profile>
<profile>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<packaging>pom</packaging>

View File

@@ -32,13 +32,37 @@ 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}" "-Pbuild-docker-images -Pags"
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
else
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags"
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
fi
SHARE_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-share.version")"
SHARE_IMAGE=$([[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Dshare.image.tag=latest" || echo)
# Prevent merging of any SNAPSHOT dependencies into the master or the release/* branches
if [[ $(isPullRequestBuild) && "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${TRAVIS_BRANCH}" =~ ^master$|^release/.+$ ]] ; then
printf "PRs with SNAPSHOT dependencies are not allowed into master or release branches\n"
exit 1
fi
# Prevent release jobs from starting when there are SNAPSHOT upstream dependencies
if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
printf "Cannot release project with SNAPSHOT dependencies!\n"
exit 1
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}" "-Pbuild-docker-images -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}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
fi
# Build the current project
mvn -B -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE}
mvn -B -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
popd

View File

@@ -8,7 +8,7 @@ set -vex
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.1-EA or 7.1.1-SNAPSHOT)"
exit 1
fi

View File

@@ -8,7 +8,7 @@ set -vex
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.1-EA or 7.1.1-SNAPSHOT)"
exit 1
fi

View File

@@ -6,7 +6,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.1.1-EA or 7.1.1-SNAPSHOT)"
exit 1
fi

View File

@@ -9,7 +9,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
#
if [ -z "${RELEASE_VERSION}" ]; then
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.1-EA or 7.1.1-SNAPSHOT)"
exit 1
fi

View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.4.0
TRANSFORMERS_TAG=2.5.3
SOLR6_TAG=2.0.2
POSTGRES_TAG=13.3
ACTIVEMQ_TAG=5.16.1

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<modules>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0-SNAPSHOT</version>
<version>7.1.1-A5</version>
</parent>
<developers>