mirror of
https://github.com/Alfresco/acs-community-packaging.git
synced 2025-09-10 14:12:09 +00:00
[ACS-5934] remove share workaround
This commit is contained in:
@@ -77,20 +77,9 @@ fi
|
|||||||
SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
|
SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
|
||||||
# Checkout the upstream share project (tag or branch; + build if the latter)
|
# Checkout the upstream share project (tag or branch; + build if the latter)
|
||||||
if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
|
if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
|
||||||
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE}"
|
pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
|
||||||
else
|
else
|
||||||
# To handle corresponding problem in acs-packaging https://alfresco.atlassian.net/browse/ACS-5820
|
pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
|
||||||
pullUpstreamTag "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}"
|
|
||||||
|
|
||||||
docker images
|
|
||||||
|
|
||||||
git clone -b "${SHARE_DEPENDENCY_VERSION}" --depth=1 "https://${GIT_USERNAME}:${GIT_PASSWORD}@${SHARE_UPSTREAM_REPO}" /tmp/commrepo
|
|
||||||
mvn -f /tmp/commrepo/pom.xml -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE" -Pags -Dlicense.failOnNotUptodateHeader=true
|
|
||||||
|
|
||||||
docker images
|
|
||||||
|
|
||||||
buildUpstreamTag "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER"
|
|
||||||
#pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build the current project
|
# Build the current project
|
||||||
|
Reference in New Issue
Block a user