Compare commits

...

24 Commits

Author SHA1 Message Date
Vítor Moreira
1eaa2a6483 MNT-22946: update upstream versions to a non-vulnerable spring version (#1476) 2022-05-13 09:55:55 +01:00
alandavis
e4d6fc180e ACS-2553 Alfresco Community Distribution zip does not contain the correct version
Fixing 7.1.0, 7.1.1, 7.1.N - master was fine
Original 7.1.0.1 was fine, but if we were to do another it would also be wrong.

* correction to distribution.xml

(cherry picked from commit 8d2d344bc2)
2022-02-15 18:18:59 +00:00
alandavis
2a1b65f7d2 The community share version bundled in the distribution is wrong
The acs-packaging update_downstream.sh script was trying to update dependency.acs-packaging.version.
Branches older that master use alfresco.share.version so the bundled share version did not change from 7.1.0.1

[skip ci] only gets used on release
2022-02-04 14:47:34 +00:00
alandavis
b04055af9e Update the version to be 7.1.2 on the 7.1.N branch so there is no clash with the 7.1.1 branch
[skip ci] wait for the upstream build to trigger this one.

Note: These are comment or warning message updates - no more
2022-02-04 13:50:48 +00:00
Tom Page
3177ade2e7 [skip ci] ACS-2290 Update after 7.1.1 to use 13.0. 2022-02-03 14:15:36 +00:00
Travis CI User
963bb508c8 [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-02 18:17:20 +00:00
Travis CI User
7d66cb756b [maven-release-plugin][skip ci] prepare release 7.1.1 2022-02-02 18:17:17 +00:00
Travis CI User
ba573688c7 [release][publish] 7.1.1
Update upstream versions
    - alfresco-community-repo:   12.23
    - alfresco-enterprise-share: 12.19
    - acs-packaging:             7.1.1
    - RELEASE_VERSION:           7.1.1
    - DEVELOPMENT_VERSION:       7.1.2-A1-SNAPSHOT
2022-02-02 16:14:15 +00:00
alandavis
64cf42346e ACS-2479 Pick up T-Core 2.5.6
[skip ci] wait for upstream build
2022-01-27 21:56:18 +00:00
alandavis
4ed1e46808 ATS-973 Bump t-core to 2.5.5
[skip ci] wait for upstream build
2022-01-27 09:25:22 +00:00
Travis CI User
e9d22c9d81 [release] 7.1.1-A6
Update upstream versions
    - alfresco-community-repo:   12.20
    - alfresco-enterprise-share: 12.15
    - acs-packaging:             7.1.1-A6
    - RELEASE_VERSION:           7.1.1-A6
    - DEVELOPMENT_VERSION:       7.1.1-A7-SNAPSHOT
2022-01-20 15:45:33 +00:00
Travis CI User
cb6b3c2c94 [maven-release-plugin][skip ci] prepare for next development iteration 2022-01-18 22:11:58 +00:00
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
29 changed files with 83 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
- DEVELOPMENT_VERSION=7.2.0-SNAPSHOT
# Release version has to start with real version (7.1.2-....) for the docker image to build successfully.
- RELEASE_VERSION=7.1.2-A0
- DEVELOPMENT_VERSION=7.1.2-A1-SNAPSHOT
stages:
- name: test

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

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

View File

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

View File

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

View File

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

View File

@@ -6,7 +6,7 @@ version: "2"
services:
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.5.3
image: alfresco/alfresco-transform-core-aio:2.5.6
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.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

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

View File

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

View File

@@ -38,7 +38,7 @@
<!-- Share -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${project.version}</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${dependency.acs-packaging.version}</directory>
<outputDirectory/>
<includes>
<include>web-server/**</include>
@@ -47,7 +47,7 @@
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${project.version}/web-extension-samples</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${dependency.acs-packaging.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet>
</fileSets>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

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

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
</parent>
</project>

12
pom.xml
View File

@@ -3,19 +3,19 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>11.140</version>
<version>13.4</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>11.140</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>11.77</dependency.alfresco-community-share.version>
<alfresco.share.version>7.1.0.1</alfresco.share.version> <!-- Share distribution zip from acs-packaging -->
<dependency.alfresco-community-repo.version>13.4</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>13.3</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.1.1</dependency.acs-packaging.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>
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version>
<version>${dependency.acs-packaging.version}</version>
<type>zip</type>
</dependency>
<dependency>

View File

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

View File

@@ -32,9 +32,9 @@ UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
# Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
# Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-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")"
@@ -56,9 +56,9 @@ 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 -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
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 -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
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

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.2-EA or 7.1.2-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.2-EA or 7.1.2-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.2-EA or 7.1.2-SNAPSHOT)"
exit 1
fi
@@ -16,6 +16,7 @@ git checkout -B "${TRAVIS_BRANCH}"
git config user.email "${GIT_EMAIL}"
mvn -B \
-ntp \
-Prelease,all-tas-tests -Pags \
-DreleaseVersion="${RELEASE_VERSION}" \
-DdevelopmentVersion="${DEVELOPMENT_VERSION}" \

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.2-EA or 7.1.2-SNAPSHOT)"
exit 1
fi

View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.5.3
TRANSFORMERS_TAG=2.5.6
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.2.0-SNAPSHOT</version>
<version>7.1.2-A1-SNAPSHOT</version>
</parent>
<modules>

View File

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

View File

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

View File

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

View File

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

View File

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