Merge branch 'bug/sdk-3-bugfixing' into bug/MNT-19097

README.md

@@ -3,10 +3,13 @@
 This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables Rapid Application Development (RAD) and Test Driven Development (TDD).
 
 ## License
-This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
+This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license. 
+If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
 
 ## News
 
+- 2017-06-23: Alfresco SDK 3.0.1 released, [containing a critical bugfix](https://github.com/Alfresco/alfresco-sdk/issues/461)
+- 2017-04-01: Alfresco SDK 3.0.0 released
 - 2017-03-27: After years of hard work, countless iterations and gathering feedback, SDK 3.0 has finally been merged into the master branch, ready for release in the coming days
 - 2016-02-20: SDK 2.2.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
 - 2015-10-19: SDK 2.1.1 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
@@ -18,16 +21,15 @@ This project is released under the [Apache License, Version 2.0](http://www.apac
 ## User Getting Started
 
 ### Latest Documentation
-To get started with Alfresco SDK 2.2.0 (latest) visit the offical Alfresco Documentation for:
+To get started with **Alfresco SDK 3.0.x** (latest) visit the [Alfresco Documentation](https://docs.alfresco.com/5.2/concepts/sdk-intro.html) 
-
-- [Alfresco Community 5.1 and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
-- [Alfresco Enterprise 5.1 and above](http://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html)
-
-#### Previous versions Documentation
-- Documentation for [Alfresco SDK 2.1](http://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.d Community and 5.0.1 Enterprise)
-- Documentation for [Alfresco SDK 2.0](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.c Community and 5.0.0 Enterprise)
-- Documentation for [Alfresco SDK 1.1.1](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html) (compatible with Alfresco 4.2)
 
+#### Documentation about Previous Versions
+| SDK Version  | Alfresco Enterprise Version       |  Alfresco Community Version       | Documentation  | 
+| ------------- |:-------------:| :-----:|:-----|
+| SDK 2.2   | Alfresco 5.1.x | Alfresco 5.1.x | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html |
+| SDK 2.1   | Alfresco 5.0.1 | Alfresco 5.0.d | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html |
+| SDK 2.0   | Alfresco 5.0.0 | Alfresco 5.0.c | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html |
+| SDK 1.1.1 | Alfresco 4.2.x | Alfresco 4.2.x | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html |
 
 
 
@@ -35,19 +37,22 @@ To get started with Alfresco SDK 2.2.0 (latest) visit the offical Alfresco Docum
 Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open) or join us on the [IRC Channel](http://chat.alfresco.com/).
 
 ## Alfresco Enterprise Customers and Partners Support
-If you are an Alfresco Customer please check the [SDK Support status](http://www.alfresco.com/services/subscription/technical-support/product-support-status) for the version you are using and the [Compatibily Matrix](http://docs.alfresco.com/community/concepts/alfresco-sdk-compatibility.html) for the SDK / Alfresco compatibility. If your version is in Limited or Full Support, you can raise issues via the [Support Portal](http://support.alfresco.com).
+If you are an Alfresco Customer 
+please check the [SDK Support status](http://www.alfresco.com/services/subscription/technical-support/product-support-status) 
+for the version you are using.  If your version is in Limited or Full Support and you need help, visit the [Support Portal](http://support.alfresco.com).
 
 ## Maven repositories
 - As of version 2.0-beta-1, The Alfresco SDK is released in [Maven Central](http://search.maven.org/#search|ga|1|alfresco-sdk). Previous versions are available in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
 - Alfresco (Community and Enterprise) artifacts are  hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
 - Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available.
 
-*NOTE:* For Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [Maven Alfresco Enterprise setup](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-using-enterprise-edition.html).
+*NOTE:* By default the Alfresco SDK will use Community Edition releases but it can be configured to use Enterprise Edition releases.  Enterprise and Premier customers can use the SDK with 
+Enterprise Edition releases by following the process described in [Working with Enterprise](https://docs.alfresco.com/5.2/concepts/sdk-using-enterprise.html)
 
 ### Alfresco Artifacts Repository
 
 #### Alfresco Releases
-You can use the following snippet in your pom.xml to access releases on Alfresco Artifact repository:
+You can use the following snippet in your pom.xml to access releases from the Alfresco Artifact repository:
 
 ```xml
 <repository>

archetypes/activiti-jar-archetype/pom.xml

@@ -6,13 +6,13 @@
   <artifactId>activiti-jar-archetype</artifactId>
 
   <packaging>maven-archetype</packaging>
-  <name>Alfresco SDK - Activiti JAR Archetype</name>
+  <name>DEPRECATED - UNSUPPORTED - EXPERIMENTAL: Alfresco SDK - Activiti JAR Archetype</name>
-  <description>Sample project with full support for lifecycle and rapid development of Activiti JARs</description>
+  <description>DEPRECATED - UNSUPPORTED - EXPERIMENTAL</description>
 
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml

@@ -5,10 +5,15 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>${artifactId} Activiti Jar Module - SDK 3</name>
+    <name>DEPRECATED - UNSUPPORTED - EXPERIMENTAL ${artifactId}  Activiti Jar Module - SDK 3</name>
-    <description>Activiti JAR Module that produces a JAR file with Java extensions such as service task delegates. It also produces an application ZIP with workflow definition, forms etc that can be deployed via /activiti-app - SDK 3</description>
+    <description>DEPRECATED - UNSUPPORTED - EXPERIMENTAL Activiti JAR Module that produces a JAR file with Java extensions such as service task delegates. It also produces an application ZIP with workflow definition, forms etc that can be deployed via /activiti-app - SDK 3</description>
     <packaging>jar</packaging>
 
+    <!-- DEPRECATION NOTICE -->
+    <!-- This archetype has been deprecated in SDK 3.1 and will be removed or replaced in SDK 4.0 -->
+    <!-- This archetype was introduced as experimental support for Activiti 1.5 Enterprise. -->
+    <!-- The archetype and Activiti/APS features present in the SDK is NOT supported, use at your own risk -->
+
     <properties>
         <!-- Alfresco Maven Plugin version to use -->
         <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>

archetypes/alfresco-allinone-archetype/pom.xml

@@ -6,12 +6,12 @@
   <artifactId>alfresco-allinone-archetype</artifactId>
   <packaging>maven-archetype</packaging>
   <name>Alfresco SDK - All-in-One Archetype</name>
-  <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for Platform/Repository JAR and Share JAR</description>
+  <description>Sample multi-module project for All-in-One development on the Alfresco platform. Includes modules for Platform/Repository JAR and Share JAR</description>
   
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/log4j.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-platform-jar-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-share-jar-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml

@@ -35,6 +35,11 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
+        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <file>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <filtered>false</filtered>
+        </file>
     </files>
 
     <fileSets>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j.properties configuration

modules/alfresco-rad/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.html.ftl

@@ -25,7 +25,7 @@
 <#if failures??>
     <#list failures as failure>
     <div id="testHeader"><b>${failure.getTestHeader()?html}</b></div>
-    <div id="message"><a href="#" onclick="showdiv('trace');return false;">${failure.getMessage()?html}</a></div>
+    <div id="message"><a href="#" onclick="showdiv('trace');return false;">${failure.getMessage()!""?html}</a></div>
     <div id="trace" style="display:none;"><pre>${failure.getTrace()?html}</pre></div>
     <br/>
     </#list>

modules/alfresco-rad/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/rad/test/runtest.get.xml.ftl

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <response>
-    <test>${test?html}</test>
+    <test>${test?xml}</test>
-    <result>${result?html}</result>
+    <result>${result?xml}</result>
 <#if failures??>
     <failures>
         <#list failures as failure>
-            <trace>${failure.getTrace()?html}</trace>
+            <trace>${failure.getTrace()?xml}</trace>
-            <exception>${failure.getException()?html}</exception>
+            <exception>${failure.getException()?xml}</exception>
-            <message>${failure.getMessage()?html}</message>
+            <message>${failure.getMessage()!?xml}</message>
-            <testHeader>${failure.getTestHeader()?html}</testHeader>
+            <testHeader>${failure.getTestHeader()?xml}</testHeader>
         </#list>
     </failures>
 </#if>
-    <failureCount>${failureCount?html}</failureCount>
+    <failureCount>${failureCount?xml}</failureCount>
-    <ignoreCount>${ignoreCount?html}</ignoreCount>
+    <ignoreCount>${ignoreCount?xml}</ignoreCount>
-    <runCount>${runCount?html}</runCount>
+    <runCount>${runCount?xml}</runCount>
-    <runTime>${runTime?html}</runTime>
+    <runTime>${runTime?xml}</runTime>
 <#if throwables??>
     <throwables>
         <#list throwables as throwable>
-            <throwable>${throwable?html}</throwable>
+            <throwable>${throwable?xml}</throwable>
         </#list>
     </throwables>
 </#if>

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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

@@ -17,11 +17,13 @@
  */
 package org.alfresco.maven.plugin;
 
+import com.google.common.collect.ImmutableSet;
 import de.schlichtherle.truezip.file.TVFS;
 import de.schlichtherle.truezip.fs.FsSyncException;
 import org.alfresco.maven.plugin.config.ModuleDependency;
 import org.alfresco.maven.plugin.config.TomcatDependency;
 import org.alfresco.maven.plugin.config.TomcatWebapp;
+import org.alfresco.util.Pair;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -42,6 +44,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
 
@@ -69,6 +72,29 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     public static final String ALFRESCO_ENTERPRISE_EDITION = "enterprise";
     public static final String ALFRESCO_COMMUNITY_EDITION = "community";
 
+    private static final String TOMCAT_GROUP_ID = "org.apache.tomcat";
+    private static final String TOMCAT_EMBED_GROUP_ID = "org.apache.tomcat.embed";
+    private static final Set<Pair<String, String>> TOMCAT_DEPENDENCIES = new ImmutableSet.Builder<Pair<String, String>>()
+            .add(new Pair(TOMCAT_EMBED_GROUP_ID,"tomcat-embed-core"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-util"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-coyote"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-api"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-jdbc"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-dbcp"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-servlet-api"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-jsp-api"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-jasper"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-jasper-el"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-el-api"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-catalina"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-tribes"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-catalina-ha"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-annotations-api"))
+            .add(new Pair(TOMCAT_GROUP_ID,"tomcat-juli"))
+            .add(new Pair(TOMCAT_EMBED_GROUP_ID,"tomcat-embed-logging-juli"))
+            .add(new Pair(TOMCAT_EMBED_GROUP_ID,"tomcat-embed-logging-log4j"))
+            .build();
+
     @Component
     protected MavenProject project;
 
@@ -188,6 +214,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     protected boolean enableApiExplorer;
 
     /**
+     * Deprecated as of SDK 3.1
      * Switch to enable/disable Alfresco Activiti Workflow Engine (activiti-app.war) when running embedded Tomcat.
      * This contains the Alfresco Activiti webapp, including the workflow engine.
      * This webapp is also the user interface for people involved in the task and processes
@@ -199,6 +226,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     protected boolean enableActivitiApp;
 
     /**
+     * Deprecated as of SDK 3.1
      * Switch to enable/disable Alfresco Activiti Admin (activiti-admin.war) when running embedded Tomcat.
      * This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your
      * Alfresco Activiti engines.
@@ -244,6 +272,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     protected List<ModuleDependency> shareModules;
 
     /**
+     * Deprecated as of SDK 3.1
      * JARs that should be overlayed/applied to the Activiti App WAR (i.e. activiti-app.war)
      */
     @Parameter(property = "maven.activiti.modules", defaultValue = "")
@@ -298,6 +327,9 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     @Parameter(property = "alfresco.groupId", defaultValue = "org.alfresco")
     protected String alfrescoGroupId;
 
+    /**
+     * Deprecated as of SDK 3.1
+     */
     @Parameter(property = "activiti.groupId", defaultValue = "com.activiti")
     protected String activitiGroupId;
 
@@ -313,9 +345,16 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     @Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer")
     protected String alfrescoApiExplorerArtifactId;
 
+    /**
+     * Deprecated as of SDK 3.1
+     */
+
     @Parameter(property = "activiti.app.war.artifactId", defaultValue = "activiti-app")
     protected String activitiAppWarArtifactId;
 
+    /**
+     * Deprecated as of SDK 3.1
+     */
     @Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin")
     protected String activitiAdminWarArtifactId;
 
@@ -328,6 +367,9 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     @Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e")
     protected String alfrescoApiExplorerVersion;
 
+    /**
+     * Deprecated as of SDK 3.1
+     */
     @Parameter(property = "activiti.version", defaultValue = "1.5.3")
     protected String activitiVersion;
 
@@ -337,6 +379,13 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     @Parameter(property = "solr.home", defaultValue = "${project.basedir}/${alfresco.data.location}/solr")
     protected String solrHome;
 
+    /**
+     * Tomcat version to be used in the Maven Tomcat Plugin. If this parameter is not set, then the
+     * default Tomcat version will be used (it depends on the version of the Tomcat Maven Plugin).
+     */
+    @Parameter(property = "maven.alfresco.tomcat.version")
+    protected String tomcatVersion;
+
     /**
      * Maven GAV properties for customized alfresco.war, share.war, activiti-app.war
      * Used by the Maven Tomcat 7 Plugin
@@ -451,6 +500,35 @@ public abstract class AbstractRunMojo extends AbstractMojo {
         );
     }
 
+    /**
+     * Copy custom solr configuration files over, so a 
+     * developer can overwrite any files needed
+     * 
+     * @throws MojoExecutionException
+     */
+    protected void copySolrCustomConfig() throws MojoExecutionException {
+    	getLog().info("Copying custom Solr config");
+        executeMojo(
+                plugin(
+                        groupId("org.apache.maven.plugins"),
+                        artifactId("maven-resources-plugin"),
+                        version(MAVEN_RESOURCE_PLUGIN_VERSION)
+                ),
+                goal("copy-resources"),
+                configuration(
+                        element(name("outputDirectory"), solrHome),
+                        element(name("overwrite"), "true"),
+                        element(name("resources"),
+                                element(name("resource"),
+                                        element(name("directory"), "src/test/resources/solr"),
+                                        element(name("filtering"), "true")
+                                )
+                        )
+                ),
+                execEnv
+        );
+    }
+    
     /**
      * Replace property placeholders in configuration files for the cores, so the
      * index files can be found for each core when Solr starts up.
@@ -1305,6 +1383,11 @@ public abstract class AbstractRunMojo extends AbstractMojo {
                     dependency("org.postgresql", "postgresql", "9.4-1201-jdbc41"));
         }
 
+        // If a custom version of Tomcat is required add the corresponding dependencies
+        if(StringUtils.isNotBlank(tomcatVersion)) {
+            addTomcatDependencies(tomcatPluginDependencies);
+        }
+
         if (enablePlatform) {
             webapps2Deploy.add(createWebAppElement(
                     runnerAlfrescoGroupId, runnerAlfrescoPlatformWarArtifactId, runnerAlfrescoPlatformVersion,
@@ -1328,6 +1411,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
         }
 
         if (enableActivitiApp) {
+
             webapps2Deploy.add(createWebAppElement(
                     runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion,
                     "/activiti-app", null));
@@ -1751,4 +1835,16 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     private String getWarName(String baseWarName) {
         return baseWarName + "-war";
     }
+
+    /**
+     * Add all the required maven dependencies to execute a specific version of Tomcat set by the property <code>tomcatVersion</code> to the list of
+     * dependencies of the Tomcat Maven Plugin.
+     *
+     * @param tomcatPluginDependencies current list of dependencies of the Tomcat Maven Plugin
+     */
+    private void addTomcatDependencies(List<Dependency> tomcatPluginDependencies) {
+        for(Pair<String, String> tomcatDependency : TOMCAT_DEPENDENCIES) {
+            tomcatPluginDependencies.add(dependency(tomcatDependency.getFirst(),tomcatDependency.getSecond(),tomcatVersion));
+        }
+    }
 }

plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java

@@ -46,9 +46,34 @@ public class RunMojo extends AbstractRunMojo {
                 pluginManager
         );
 
+        if (enableActivitiApp || enableActivitiAdmin) {
+            getLog().warn("*************************************************************************************************************");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*\tWARNING" );
+            getLog().warn("*\tThe Activiti features in SDK 3.x are UNSUPPORTED.");
+            getLog().warn("*\tIt has been marked for deprecation (SDK 3.1) and will be removed in SDK 4.0.");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*");
+            getLog().warn("*************************************************************************************************************");
+
+        }
+
         if (enableSolr) {
             unpackSolrConfig();
             fixSolrHomePath();
+            copySolrCustomConfig();
             replaceSolrConfigProperties();
             installSolr10InLocalRepo();
         }

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
@@ -30,7 +30,7 @@
         <connection>scm:git:${scm.url.base}.git</connection>
         <developerConnection>scm:git:${scm.url.base}</developerConnection>
         <url>${scm.url.base}</url>
-      <tag>alfresco-sdk-aggregator-3.0.1</tag>
+      <tag>alfresco-sdk-aggregator-3.0.0-SNAPSHOT</tag>
   </scm>
 
     <developers>