From 669e4db5a409a66786745ed3cca1c13fd530da89 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Wed, 5 May 2021 21:09:56 +0100
Subject: [PATCH] Remove redundant Maven profiles with project structure
 (modules)

(cherry picked from commit 4d04559a26057198cf62a2fbc9e5a7e59c65ea1e)
---
 packaging/pom.xml               | 34 ++++++---------------------------
 scripts/travis/maven_release.sh |  4 ++--
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/packaging/pom.xml b/packaging/pom.xml
index c15e86b94a..1f0b2754b8 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -10,40 +10,18 @@
         <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
+    <modules>
+        <module>war</module>
+        <module>distribution</module>
+        <module>docker-alfresco</module>
+    </modules>
+
     <profiles>
-        <profile>
-            <id>fullBuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>war</module>
-                <module>distribution</module>
-                <module>docker-alfresco</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>community</id>
-            <modules>
-                <module>war</module>
-                <module>distribution</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>communityDocker</id>
-            <modules>
-                <module>war</module>
-                <module>distribution</module>
-                <module>docker-alfresco</module>
-            </modules>
-        </profile>
         <profile>
             <id>all-tas-tests</id>
             <modules>
-                <module>distribution</module>
                 <module>tests</module>
             </modules>
         </profile>
     </profiles>
-
 </project>
diff --git a/scripts/travis/maven_release.sh b/scripts/travis/maven_release.sh
index b3bd716b5e..936d26204e 100755
--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -12,8 +12,8 @@ git config user.email "${GIT_EMAIL}"
 
 # Run the release plugin - with "[skip ci]" in the release commit message
 mvn -B \
-  -PfullBuild,all-tas-tests \
-  "-Darguments=-Prelease,fullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
+  -Pall-tas-tests \
+  "-Darguments=-Prelease,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
   release:clean release:prepare release:perform \
   -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
   -Dusername="${GIT_USERNAME}" \