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

Tidy up fixes for #461

Browse Source
This commit is contained in:
Ole Hejlskov 2017-06-22 12:13:28 +02:00
parent 37c26cfaa8
commit 1e5db412f7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1561,9 +1561,9 @@ 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 * Matrix for determining the Alfresco WAR Artifact
* 4.2.x Community == alfresco.war * 4.2.x Community == alfresco.war
* 4.2.x Enterprise == alfresco-enterprise.war * 4.2.x Enterprise == alfresco.war
* 5.0.x Community == alfresco.war * 5.0.x Community == alfresco.war
* 5.0.x Enterprise == alfresco-enterprise.war * 5.0.x Enterprise == alfresco-enterprise.war
* 5.1.x Community == alfresco-platform.war * 5.1.x Community == alfresco-platform.war
@ -1578,11 +1578,17 @@ public abstract class AbstractRunMojo extends AbstractMojo {
alfrescoPlatformWarArtifactId = "alfresco"; alfrescoPlatformWarArtifactId = "alfresco";
} }
if (isPlatformVersionGtOrEqTo51() == false && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) { if (isPlatformVersionLtOrEqTo42() == true && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
// We are running version 4.2 or 5.0 in enterprise so use "alfresco-enterprise" // We are running version 4.2 so use "alfresco-enterprise"
alfrescoPlatformWarArtifactId = "alfresco";
}
if (getPlatformVersionNumber() == 50 && alfrescoEdition.equals(ALFRESCO_ENTERPRISE_EDITION)) {
// We are running version 5.0 in enterprise so use "alfresco-enterprise"
alfrescoPlatformWarArtifactId = "alfresco-enterprise"; alfrescoPlatformWarArtifactId = "alfresco-enterprise";
} }
if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) { if (isPlatformVersionGtOrEqTo51() == true && alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) {
// We are running version 5.1 or greater in community so use "alfresco-platform" // We are running version 5.1 or greater in community so use "alfresco-platform"
alfrescoPlatformWarArtifactId = "alfresco-platform"; alfrescoPlatformWarArtifactId = "alfresco-platform";