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

Upgraded to Community release 201609 EA and added API Explorer app to AIO and Platform module, #402

parent 50dac567
Loading
Loading
Loading
Loading
+6 −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.a-EA</alfresco.platform.version>
        <alfresco.share.version>5.1.g</alfresco.share.version>
        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
        <alfresco.surf.version>6.5</alfresco.surf.version>
        <alfresco.surf.version>6.6</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.82</aikau.version>
        <aikau.version>1.0.85</aikau.version>

        <!-- Alfresco Repo Database configuration.
           By default it uses a flat file H2 database to be able to run embedded.
@@ -255,6 +255,8 @@
                    <enableSolr>true</enableSolr>
                    <!-- We need Share webapp, so we got a UI for working with the Repo -->
                    <enableShare>true</enableShare>
                    <!-- Enable the REST API Explorer -->
                    <enableApiExplorer>true</enableApiExplorer>

                    <!--
                        JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
+4 −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.a-EA</alfresco.platform.version>
        <alfresco.platform.version>5.2.b-EA</alfresco.platform.version>
        <!-- Alfresco Share version, so we can bring in correct alfresco-share-services artifact -->
        <alfresco.share.version>5.1.g</alfresco.share.version>
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>

        <!-- Alfresco Repo Database configuration.
           By default it uses a flat file H2 database to be able to run embedded.
@@ -115,6 +115,8 @@
                    <enableSolr>true</enableSolr>
                    <!-- We don't need the share.war if we don't have any UI extensions -->
                    <enableShare>false</enableShare>
                    <!-- Enable the REST API Explorer -->
                    <enableApiExplorer>true</enableApiExplorer>

                    <!--
                       JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
+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.1.g</alfresco.share.version>
        <alfresco.share.version>5.2.a-EA</alfresco.share.version>

        <!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
        <alfresco.surf.version>6.5</alfresco.surf.version>
        <alfresco.surf.version>6.6</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.82</aikau.version>
        <aikau.version>1.0.85</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. -->
+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ public class RunMojo extends AbstractMojo {
    @Parameter(property = "alfresco.share.version", defaultValue = "5.1.g")
    protected String alfrescoShareVersion;

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

    /**