Compare commits

..
Author SHA1 Message Date
Travis CI User ddae3ae0ab [maven-release-plugin][skip ci] prepare release 7.2.0-A4 2021-10-20 08:56:26 +00:00
alandavis b4b6ff0d27 Temporary Change: Need to read 'docflex-javadoc' from Alfresco Internal Releases
Revert "settings.xml should reference .../groups/public not .../groups/internal so an account is not needed"

This reverts commit 7362b4c989.

[release] 7.2.0-A4
2021-10-20 00:08:36 +01:00
Travis CI User ac00a34bc4 Update upstream versions
- alfresco-community-repo:   14.14
    - alfresco-enterprise-share: 14.10
    - acs-packaging:             7.2.0-A4
    - RELEASE_VERSION:           7.2.0-A4
    - DEVELOPMENT_VERSION:       7.2.0-A5-SNAPSHOT
2021-10-19 19:48:11 +00:00
alandavis 7362b4c989 settings.xml should reference .../groups/public not .../groups/internal so an account is not needed 2021-10-14 12:59:35 +01:00
alandavis cc86cd2342 Dev tomcat env needs maven-war-plugin < 3.3.0
Versions >= than 3.3.0 were causing ClassNotFoundException: org.springframework.web.context.ContextLoaderListener

[skip ci]
2021-10-13 14:41:12 +01:00
Travis CI User 2c6c14bb62 [maven-release-plugin][skip ci] prepare for next development iteration 2021-10-13 11:07:46 +00:00
Travis CI User dec86c6d94 [maven-release-plugin][skip ci] prepare release 7.2.0-A1 2021-10-13 11:07:43 +00:00
Travis CI User 888433f498 Update upstream versions
- alfresco-community-repo:   14.12
    - alfresco-enterprise-share: 14.9
    - acs-packaging:             7.2.0-A1
    - RELEASE_VERSION:               - RELEASE_VERSION=7.2.0-A1
    - DEVELOPMENT_VERSION:           - DEVELOPMENT_VERSION=7.2.0-SNAPSHOT
2021-10-13 06:48:36 +00:00
alandavis 8cfb437139 Switch to using dependency.acs-packaging.version property
To help update acs-community-packaging properties on release of acs-packaging

[skip ci]
2021-10-12 15:00:53 +01:00
alandavis a5aed73a3f Dependabot: Ignore upstream projects [skip ci] 2021-10-08 17:59:24 +01:00
dependabot-preview[bot] 5cacfb329c Upgrade to GitHub-native Dependabot (#1312)
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-10-08 16:10:09 +01:00
alandavis 0fa84b8499 Use a common property for json-path as it is used in community and enterprise repo and packaging
[skip ci] waiting for upstream build
2021-10-08 15:26:37 +01:00
alandavis b87f0d5c77 prep work 7.1.0 -> 7.2.0 [skip ci] 2021-10-01 07:51:46 +01:00
alandavis 0f3d72179e Update upstream versions
- alfresco-community-repo:  14.5
    - alfresco-enterprise-share: 14.4
2021-10-01 07:37:12 +01:00
alandavis a94d0c474a Get master ready for 7.2.0 development
[skip ci]
2021-09-28 22:58:25 +01:00
28 changed files with 117 additions and 39 deletions
+62
View File
@@ -0,0 +1,62 @@
version: 2
registries:
maven-repository-artifacts-alfresco-com-nexus-content-groups-int:
type: maven-repository
url: https://artifacts.alfresco.com/nexus/content/groups/internal
username: ${{secrets.NEXUS_USERNAME}}
password: ${{secrets.NEXUS_PASSWORD}}
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: "22:00"
timezone: Africa/Abidjan
open-pull-requests-limit: 99
ignore:
# Upstream alfresco-community-repo artifacts
- dependency-name: org.alfresco:alfresco-community-repo
- dependency-name: org.alfresco:alfresco-core
- dependency-name: org.alfresco:alfresco-data-model
- dependency-name: org.alfresco:alfresco-repository
- dependency-name: org.alfresco:alfresco-remote-api
- dependency-name: org.alfresco:content-services-community
- dependency-name: org.alfresco:alfresco-community-repo-distribution
- dependency-name: org.alfresco.tas:alfresco-community-repo-webdav-test:tests
- dependency-name: org.alfresco.tas:alfresco-community-repo-restapi-test:tests
- dependency-name: org.alfresco.tas:alfresco-community-repo-integration-test:tests
- dependency-name: org.alfresco.tas:alfresco-community-repo-email-test:tests
- dependency-name: org.alfresco.tas:alfresco-community-repo-cmis-test:tests
# Used in dev env - Currently using 7.0.86 but have tried higher versions
- dependency-name: org.apache.tomcat.embed
versions:
- "> 7.0.109"
- dependency-name: org.apache.tomcat
versions:
- "> 7.0.109"
# Upstream alfresco-enterprise-share artifacts
- dependency-name: org.alfresco:share:classes
- dependency-name: org.alfresco:alfresco-wcmqs-web:classes
- dependency-name: org.alfresco:alfresco-wcmqs-distribution
- dependency-name: org.alfresco:share
- dependency-name: org.alfresco:alfresco-content-services-share-distribution
- dependency-name: org.alfresco:alfresco-share-services
# Others
- dependency-name: io.fabric8:fabric8-maven-plugin
versions:
- "> 4.4.1"
- dependency-name: org.alfresco:api-explorer
versions:
- "> 6.1.0, < 6.2"
- dependency-name: org.alfresco.integrations:alfresco-googledocs-repo-community
versions:
- "> 3.1.0"
- dependency-name: org.alfresco.integrations:alfresco-googledocs-share-community
versions:
- "> 3.1.0"
- dependency-name: org.apache.maven.plugins:maven-war-plugin
versions:
- ">= 3.a, < 4"
registries:
- maven-repository-artifacts-alfresco-com-nexus-content-groups-int
+3 -3
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.3
- DEVELOPMENT_VERSION=7.1.0.4-SNAPSHOT
# Release version has to start with real version (7.2.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.2.0-A4
- DEVELOPMENT_VERSION=7.2.0-A5-SNAPSHOT
stages:
- name: test
+5
View File
@@ -1,3 +1,8 @@
<h1> 7.2.0 Community
</h1>
<h2>
New Features
</h2>
<h1> 7.1.0 Community
</h1>
<h2>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-dev-community-tomcat-env</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</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.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</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.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
+13 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
@@ -26,4 +26,16 @@
<module>dev-acs-amps-overlay</module>
</modules>
<build>
<pluginManagement>
<plugins>
<!-- Versions higher than 3.3.0 were causing the tomcat dev environment to fail to start with a
ClassNotFoundException: org.springframework.web.context.ContextLoaderListener -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<dependencies>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<dependencies>
+2 -2
View File
@@ -38,7 +38,7 @@
<!-- Share -->
<fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${dependency.acs-packaging.version}</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${project.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-${dependency.acs-packaging.version}/web-extension-samples</directory>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${project.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet>
</fileSets>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community-docker</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>share-community-docker</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<properties>
+1 -1
View File
@@ -7,6 +7,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</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>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>11.143</version>
<version>14.14</version>
</parent>
<properties>
<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 -->
<dependency.alfresco-community-repo.version>14.14</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-share.version>14.10</dependency.alfresco-community-share.version>
<dependency.acs-packaging.version>7.2.0-A4</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>HEAD</tag>
<tag>7.2.0-A4</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<packaging>pom</packaging>
+4 -4
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 -Dlicense.failOnNotUptodateHeader=true"
pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-Pbuild-docker-images -Pags"
else
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags"
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 -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -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}"
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
fi
# Build the current project
+1 -1
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.2.0-EA or 7.2.0-SNAPSHOT)"
exit 1
fi
+1 -1
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.2.0-EA or 7.2.0-SNAPSHOT)"
exit 1
fi
+1 -2
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.2.0-EA or 7.2.0-SNAPSHOT)"
exit 1
fi
@@ -16,7 +16,6 @@ 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}" \
+1 -1
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.2.0-EA or 7.2.0-SNAPSHOT)"
exit 1
fi
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<modules>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<developers>
+2 -2
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<developers>
@@ -101,7 +101,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.5.0</version>
<version>${dependency.jakarta-json-path.version}</version>
</dependency>
</dependencies>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.1.0.4-SNAPSHOT</version>
<version>7.2.0-A4</version>
</parent>
<developers>