From 37c26cfaa883a462e9168806acf67be643ebf02c Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 21 Apr 2017 18:21:41 +0200 Subject: [PATCH] Correctly configure the artifact id for alfresco-platform, reported in #461 This also raises questions around the use of since this will never have any effect currently --- .../maven/plugin/AbstractRunMojo.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java index a3416972..9fb3393f 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java @@ -1084,6 +1084,7 @@ public abstract class AbstractRunMojo extends AbstractMojo { // Skip if we are not running a 5.1 version of Alfresco, 'Alfresco Share Services' // was not used in earlier versions if (!isPlatformVersionGtOrEqTo51()) { + getLog().info("Skipping alfresco-share-services, only needed for 5.1+"); continue; } } @@ -1560,18 +1561,38 @@ public abstract class AbstractRunMojo extends AbstractMojo { * Get the Alfresco Platform Webapp artifactId (i.e. for alfresco.war), * it changes from 'alfresco' to 'alfresco-platform' in 5.1. * + * Matrix for determinig the Alfresco WAR Artifact + * 4.2.x Community == alfresco.war + * 4.2.x Enterprise == alfresco-enterprise.war + * 5.0.x Community == alfresco.war + * 5.0.x Enterprise == alfresco-enterprise.war + * 5.1.x Community == alfresco-platform.war + * 5.1.x Enterprise == alfresco-platform-enterprise.war + * * @return the Maven artifactId for Alfresco Platform webapp */ private String getPlatformWarArtifactId() { - // Default alfrescoPlatformWarArtifactId is 'alfresco-platform' - if (isPlatformVersionGtOrEqTo51() == false) { - // We are running version 4.2 or 5.0, so use older artifactId + if (isPlatformVersionGtOrEqTo51() == false && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) { + // We are running version 4.2 or 5.0 in community so use "alfresco" alfrescoPlatformWarArtifactId = "alfresco"; - } else if (alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) { + } + + if (isPlatformVersionGtOrEqTo51() == false && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) { + // We are running version 4.2 or 5.0 in enterprise so use "alfresco-enterprise" alfrescoPlatformWarArtifactId = "alfresco-enterprise"; } + if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) { + // We are running version 5.1 or greater in community so use "alfresco-platform" + alfrescoPlatformWarArtifactId = "alfresco-platform"; + } + + if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) { + // We are running version 5.1 or greater in enterprise so use "alfresco-platform-enterprise" + alfrescoPlatformWarArtifactId = "alfresco-platform-enterprise"; + } + return alfrescoPlatformWarArtifactId; }