Compare commits

..
4 Commits
17 changed files with 45 additions and 107 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# For SmartGit
[bugtraq "jira"]
url = https://alfresco.atlassian.net/browse/%BUGID%
url = https://issues.alfresco.com/jira/browse/%BUGID%
logRegex = ([A-Z]+-\\d+)
+4 -4
View File
@@ -30,8 +30,8 @@ env:
- TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
- TAS_ENVIRONMENT=./tests/environment
# Release version has to start with real version (7.0.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.0.0
- DEVELOPMENT_VERSION=7.0.0.1-SNAPSHOT
- RELEASE_VERSION=7.0.0-A27a
- DEVELOPMENT_VERSION=7.0.0-SNAPSHOT
stages:
- name: test
@@ -39,9 +39,9 @@ stages:
- name: docker_latest
if: fork = false AND type != pull_request AND branch = master
- name: release
if: commit_message =~ /\[release\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
if: commit_message =~ /\[release\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/ OR branch = fix/a_releases)
- name: publish
if: commit_message =~ /\[publish\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
if: commit_message =~ /\[publish\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/ OR branch = fix/a_releases)
before_install: travis_retry bash scripts/travis/init.sh
install: travis_retry travis_wait 40 bash scripts/travis/build.sh
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2"
services:
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.10
image: alfresco/alfresco-transform-core-aio:2.3.8
mem_limit: 1536m
environment:
JAVA_OPTS: " -Xms256m -Xmx1536m"
@@ -14,7 +14,7 @@ services:
- 8090:8090
postgres:
image: postgres:13.1
image: postgres:11.7
mem_limit: 512m
environment:
- POSTGRES_PASSWORD=alfresco
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<dependencies>
@@ -13,9 +13,6 @@
<fileSet>
<directory>target/classes</directory>
<outputDirectory></outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</fileSet>
<!-- Licenses -->
<fileSet>
+16 -28
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<properties>
@@ -94,7 +94,7 @@
<profile>
<id>internal</id>
<!-- publishes "image:latest" to Quay -->
<!-- publishes "image:latest" on Quay & DockerHub -->
<build>
<plugins>
<plugin>
@@ -126,41 +126,29 @@
<profile>
<id>release</id>
<!-- publishes "image:release_version" to DockerHub -->
<!-- publishes "image:release_version" on Quay & DockerHub -->
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override">
<images>
<!-- DockerHub image -->
<image>
<name>${image.name}:${project.version}</name>
</image>
<!-- Quay image -->
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
</image>
</images>
</configuration>
<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>
+6 -6
View File
@@ -3,21 +3,21 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<relativePath>../alfresco-community-repo/pom.xml</relativePath>
<version>8.423</version>
<version>8.400</version>
</parent>
<properties>
<dependency.alfresco-community-repo.version>8.423</dependency.alfresco-community-repo.version>
<dependency.alfresco-community-repo.version>8.400</dependency.alfresco-community-repo.version>
<alfresco.share.version>7.0.0</alfresco.share.version>
<alfresco.share.version>7.0.0-A17</alfresco.share.version>
<alfresco.alfresco-share-services.version>${alfresco.share.version}</alfresco.alfresco-share-services.version>
<alfresco.api-explorer.version>7.0.0</alfresco.api-explorer.version>
<alfresco.api-explorer.version>7.0.0-A4</alfresco.api-explorer.version>
<repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
<share.image.tag>${alfresco.share.version}</share.image.tag>
@@ -27,7 +27,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>7.0.0</tag>
<tag>7.0.0-A27a</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<packaging>pom</packaging>
+4 -4
View File
@@ -29,10 +29,10 @@ fi
UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
# For release jobs, check if the upstream dependency is the latest tag on the upstream repository (on the same branch)
if isBranchBuild && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${DEPENDENCY_VERSION}" != "$(retieveLatestTag "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}")" ] ; then
printf "Upstream dependency is not up to date with %s / %s\n" "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}"
exit 1
fi
#if isBranchBuild && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${DEPENDENCY_VERSION}" != "$(retieveLatestTag "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}")" ] ; then
# printf "Upstream dependency is not up to date with %s / %s\n" "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}"
# exit 1
#fi
# 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")
+2 -49
View File
@@ -26,13 +26,7 @@ function cloneRepo() {
}
function retrievePomParentVersion() {
local REPO="${1}"
if [ -z "${REPO}" ]; then
pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
else
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
fi
pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
sed -n '/<parent>/,/<\/parent>/p' pom.xml \
| sed -n '/<version>/,/<\/version>/p' \
@@ -45,13 +39,8 @@ function retrievePomParentVersion() {
function retrievePomProperty() {
local KEY="${1}"
local REPO="${2}"
if [ -z "${REPO}" ]; then
pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
else
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
fi
pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
sed -n '/<properties>/,/<\/properties>/p' pom.xml \
| sed -n "/<${KEY}>/,/<\/${KEY}>/p" \
@@ -105,42 +94,6 @@ function pullUpstreamTag() {
cloneRepo "${UPSTREAM_REPO}" "${TAG}"
}
function pullSameBranch() {
local UPSTREAM_REPO="${1}"
local SOURCE_BRANCH="$(identifyUpstreamSourceBranch "${UPSTREAM_REPO}")"
cloneRepo "${UPSTREAM_REPO}" "${SOURCE_BRANCH}"
}
function buildUpstreamTag() {
local UPSTREAM_REPO="${1}"
local TAG="${2}"
local EXTRA_BUILD_ARGUMENTS="${3}"
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
popd
}
function buildSameBranchOnUpstream() {
local UPSTREAM_REPO="${1}"
local EXTRA_BUILD_ARGUMENTS="${2}"
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
cd "$(basename "${UPSTREAM_REPO%.git}")"
mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
mvn -B -V -q install -DskipTests -f packaging/tests/pom.xml
popd
}
function pullUpstreamTagAndBuildDockerImage() {
local UPSTREAM_REPO="${1}"
local TAG="${2}"
+2 -2
View File
@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.3.10
TRANSFORMERS_TAG=2.3.8
SOLR6_TAG=2.0.1
POSTGRES_TAG=13.1
POSTGRES_TAG=11.7
ACTIVEMQ_TAG=5.16.1
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<modules>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0</version>
<version>7.0.0-A27a</version>
</parent>
<developers>