inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-19 17:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly configure the artifact id for alfresco-platform, reported in #461

Browse Source 
This also raises questions around the use of <alfresco.platform.war.artifactId />
since this will never have any effect currently
This commit is contained in:
Ole Hejlskov 2017-04-21 18:21:41 +02:00
parent 1cd4b82037
commit 37c26cfaa8
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
View File

@ -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' // Skip if we are not running a 5.1 version of Alfresco, 'Alfresco Share Services'
// was not used in earlier versions // was not used in earlier versions
if (!isPlatformVersionGtOrEqTo51()) { if (!isPlatformVersionGtOrEqTo51()) {
getLog().info("Skipping alfresco-share-services, only needed for 5.1+");
continue; continue;
} }
} }
@ -1560,18 +1561,38 @@ public abstract class AbstractRunMojo extends AbstractMojo {
* Get the Alfresco Platform Webapp artifactId (i.e. for alfresco.war), * Get the Alfresco Platform Webapp artifactId (i.e. for alfresco.war),
* it changes from 'alfresco' to 'alfresco-platform' in 5.1. * 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 * @return the Maven artifactId for Alfresco Platform webapp
*/ */
private String getPlatformWarArtifactId() { private String getPlatformWarArtifactId() {
// Default alfrescoPlatformWarArtifactId is 'alfresco-platform'
if (isPlatformVersionGtOrEqTo51() == false) { if (isPlatformVersionGtOrEqTo51() == false && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) {
// We are running version 4.2 or 5.0, so use older artifactId // We are running version 4.2 or 5.0 in community so use "alfresco"
alfrescoPlatformWarArtifactId = "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"; 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; return alfrescoPlatformWarArtifactId;
} }