Commit f5404b9d authored by Martin Bergljung's avatar Martin Bergljung
Browse files

Updated to latest GA 5.2 libs, #439

parent 3031b401
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
        <activiti.admin.war.artifactId>activiti-admin</activiti.admin.war.artifactId> <!-- This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your Alfresco Activiti engines.-->

        <!-- The version of the Alfresco Activiti Enterprise Workflow Engine that the customization will run in -->
        <activiti.version>1.5.1</activiti.version>
        <activiti.version>1.5.3</activiti.version>

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>
+4 −4
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@
        <!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be
             customized and then deployed and run by the tomcat maven plugin when
             executing for example $ mvn clean install alfresco:run -->
        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>
        <alfresco.platform.version>5.2.e</alfresco.platform.version>
        <alfresco.share.version>5.2.d</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
        <alfresco.surf.version>6.6</alfresco.surf.version>
        <alfresco.surf.version>6.11</alfresco.surf.version>

        <!-- Aikau framework version, it is released separately, so it can be useful to be able
             to bring in newer versions with bug fixes etc -->
        <aikau.version>1.0.85</aikau.version>
        <aikau.version>1.0.101.3</aikau.version>

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>
+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@
        <!-- Alfresco Platform webapp version, this is the original Alfresco webapp that will be
            customized and then deployed and run by the tomcat maven plugin when
            executing for example $ mvn clean install alfresco:run -->
        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
        <alfresco.platform.version>5.2.e</alfresco.platform.version>
        <!-- Alfresco Share version, so we can bring in correct alfresco-share-services artifact -->
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>
        <alfresco.share.version>5.2.d</alfresco.share.version>

        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
        <jrebel.version>1.1.6</jrebel.version>
+3 −3
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@
        <!-- Alfresco Share webapp version, this is the original Alfresco webapp that will be
            customized and then deployed and run by the tomcat maven plugin when
            executing for example $ mvn clean install alfresco:run -->
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>
        <alfresco.share.version>5.2.d</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
        <alfresco.surf.version>6.6</alfresco.surf.version>
        <alfresco.surf.version>6.11</alfresco.surf.version>

        <!-- Aikau framework version, it is released separately, so it can be useful to be able
             to bring in newer versions with bug fixes etc -->
        <aikau.version>1.0.85</aikau.version>
        <aikau.version>1.0.101.3</aikau.version>

        <!-- Since alfresco.war (i.e. the Platform/Repository) is already running on port 8080, we run Share.WAR on port 8081.
            If Alfresco Platform is not running, then generate a platform-jar-module and start it up. -->
+4 −4
Original line number Diff line number Diff line
@@ -295,16 +295,16 @@ public class RunMojo extends AbstractMojo {
    @Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin")
    protected String activitiAdminWarArtifactId;

    @Parameter(property = "alfresco.platform.version", defaultValue = "5.2.a-EA")
    @Parameter(property = "alfresco.platform.version", defaultValue = "5.2.e")
    protected String alfrescoPlatformVersion;

    @Parameter(property = "alfresco.share.version", defaultValue = "5.1.g")
    @Parameter(property = "alfresco.share.version", defaultValue = "5.2.d")
    protected String alfrescoShareVersion;

    @Parameter(property = "alfresco.api.explorer.version", defaultValue = "1.2")
    @Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e")
    protected String alfrescoApiExplorerVersion;

    @Parameter(property = "activiti.version", defaultValue = "1.5.1")
    @Parameter(property = "activiti.version", defaultValue = "1.5.3")
    protected String activitiVersion;

    /**