Compare commits

...

15 Commits

Author SHA1 Message Date
Travis CI User
3ad3cfecf6 [maven-release-plugin][skip ci] prepare for next development iteration 2022-02-17 17:51:23 +00:00
Travis CI User
f5337eb82f [maven-release-plugin][skip ci] prepare release 7.1.0.3 2022-02-17 17:51:19 +00:00
Travis CI User
2f0b91c45b [release][publish] 7.1.0.3
Update upstream versions
    - alfresco-community-repo:   11.143
    - alfresco-enterprise-share: 11.82
    - acs-packaging:             7.1.0.3
    - RELEASE_VERSION:           7.1.0.3
    - DEVELOPMENT_VERSION:       7.1.0.4-SNAPSHOT
2022-02-17 12:51:22 +00:00
alandavis
6fb85d4a44 Fix: Use dependency.alfresco-community-share.version again 2022-02-17 12:10:28 +00:00
alandavis
65b7de1b2e Update upstream versions
- alfresco-enterprise-share: 11.82
2022-02-17 10:51:40 +00:00
alandavis
98b01a07d1 Update upstream versions
- alfresco-community-repo:   11.143
2022-02-15 23:18:00 +00:00
alandavis
995ddb45ec Update upstream versions
- alfresco-community-repo:   11.143
2022-02-15 23:15:16 +00:00
alandavis
8d2d344bc2 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
2022-02-15 18:15:39 +00:00
alandavis
caf86442a9 The community share version bundled in the distribution will be wrong if we do a HF release
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:55:54 +00:00
Tom Page
d7dab837ef [skip tests] Skip license header check when building upstream project.
(cherry picked from commit 5645836ac4)
2022-01-10 15:57:12 +00:00
Travis CI User
3e692abf24 Update upstream versions
- alfresco-community-repo:   11.141
    - alfresco-enterprise-share: 11.78
    - acs-packaging:             7.1.0.1
    - RELEASE_VERSION:           7.1.0.1
    - DEVELOPMENT_VERSION:       7.1.0.2-SNAPSHOT
2021-10-20 17:13:02 +00:00
Travis CI User
9dedb2a14c [maven-release-plugin][skip ci] prepare for next development iteration 2021-10-20 12:47:53 +00:00
Travis CI User
8e62aeaeda [maven-release-plugin][skip ci] prepare release 7.1.0.1 2021-10-20 12:47:51 +00:00
alandavis
7491f0a3cb [release][publish] 7.1.0.1
[skip tests] as we are just repackaging the alfresco-content-services-community-distribution so that it contains the share.war.
2021-10-20 12:35:06 +01:00
alandavis
3e169812da Get the branch ready for HFs
[skip ci]
2021-09-28 22:46:10 +01:00
23 changed files with 33 additions and 32 deletions

View File

@@ -29,8 +29,8 @@ env:
- 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=7.1.0.3
- DEVELOPMENT_VERSION=7.1.0.4-SNAPSHOT
stages:
- name: test

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.0.4-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.0.4-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.0.4-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.0.4-SNAPSHOT</version>
</parent>
<properties>

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.0.4-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.0.4-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.0.4-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.0.4-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.0.4-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.0.4-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.0.4-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.0.4-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>11.140</version>
<version>11.143</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>11.143</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>11.82</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.1.0.3</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.0.4-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

@@ -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

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.2.0-SNAPSHOT</version>
<version>7.1.0.4-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.0.4-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.0.4-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.0.4-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.0.4-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.0.4-SNAPSHOT</version>
</parent>
<developers>