From 1b7f20f0cb234d73fcdc8d2b072a3c75204e0886 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 23 Jun 2021 12:10:06 +0100
Subject: [PATCH] ACS-1710 Let repo developers build the project without having
 to build AGS first. (#1389)

---
 dev/aliases                     | 4 ++--
 pom.xml                         | 7 ++++++-
 scripts/travis/build.sh         | 2 +-
 scripts/travis/maven_release.sh | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev/aliases b/dev/aliases
index 107e388d1..0e1b2bf87 100755
--- a/dev/aliases
+++ b/dev/aliases
@@ -43,11 +43,11 @@ fi
 
 alias  comR='(cd alfresco-community-repo   && mvn clean install $AMPS -DskipTests=true                                       -Dversion.edition=Community)'
 alias  comS='(cd share                     && mvn clean install $AMPS -DskipTests                  -Dmaven.javadoc.skip=true)'
-alias  comP='(cd acs-community-packaging   && mvn clean install                                    -Dmaven.javadoc.skip=true)'
+alias  comP='(cd acs-community-packaging   && mvn clean install $AMPS                              -Dmaven.javadoc.skip=true)'
 
 alias comRD='(cd alfresco-community-repo   && mvn clean install $AMPS -DskipTests=true                                       -Dversion.edition=Community -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest)'
 alias comSD='(cd share                     && mvn clean install $AMPS -DskipTests=true -DskipTests -Dmaven.javadoc.skip=true                             -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest)'
-alias comPD='(cd acs-community-packaging   && mvn clean install       -DskipTests=true             -Dmaven.javadoc.skip=true                             -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest -Dshare.image.tag=latest)'
+alias comPD='(cd acs-community-packaging   && mvn clean install $AMPS -DskipTests=true             -Dmaven.javadoc.skip=true                             -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest -Dshare.image.tag=latest)'
 
 alias      comT='(cd acs-community-packaging  && mvn      clean install -Prun $AMPS -rf dev)'
 alias comTDebug='(cd acs-community-packaging  && mvnDebug clean install -Prun $AMPS -rf dev)'
diff --git a/pom.xml b/pom.xml
index a4fe1296f..842ae36a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,13 +40,18 @@
     </distributionManagement>
 
     <modules>
-        <module>distribution-ags</module>
         <module>distribution</module>
         <module>public-javadoc</module>
         <module>docker-alfresco</module>
     </modules>
 
     <profiles>
+        <profile>
+            <id>ags</id>
+            <modules>
+                <module>distribution-ags</module>
+            </modules>
+        </profile>
         <profile>
             <id>all-tas-tests</id>
             <modules>
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index bde0b5bed..9349bf35a 100644
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -43,7 +43,7 @@ else
 fi
 
 # Build the current project
-mvn -B -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images \
+mvn -B -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags \
   $([[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Drepo.image.tag=latest")
 
 
diff --git a/scripts/travis/maven_release.sh b/scripts/travis/maven_release.sh
index a544583cc..84f9352ea 100755
--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -16,10 +16,10 @@ git checkout -B "${TRAVIS_BRANCH}"
 git config user.email "${GIT_EMAIL}"
 
 mvn -B \
-  -Prelease,all-tas-tests \
+  -Prelease,all-tas-tests -Pags \
   -DreleaseVersion="${RELEASE_VERSION}" \
   -DdevelopmentVersion="${DEVELOPMENT_VERSION}" \
-  "-Darguments=-Prelease,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
+  "-Darguments=-Prelease,all-tas-tests -Pags -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
   release:clean release:prepare release:perform \
   -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
   -Dusername="${GIT_USERNAME}" \