Deprecate Activiti features. See #481 for more info

This commit is contained in:
Ole Hejlskov
2017-09-22 16:40:51 +02:00
parent 448b5c2929
commit c25417e702
4 changed files with 50 additions and 4 deletions

View File

@@ -6,8 +6,8 @@
<artifactId>activiti-jar-archetype</artifactId> <artifactId>activiti-jar-archetype</artifactId>
<packaging>maven-archetype</packaging> <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> <parent>
<groupId>org.alfresco.maven</groupId> <groupId>org.alfresco.maven</groupId>

View File

@@ -5,10 +5,15 @@
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId> <artifactId>${artifactId}</artifactId>
<version>${version}</version> <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> <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> <properties>
<!-- Alfresco Maven Plugin version to use --> <!-- Alfresco Maven Plugin version to use -->
<alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version> <alfresco.sdk.version>@@alfresco.sdk.parent.version@@</alfresco.sdk.version>

View File

@@ -186,6 +186,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
protected boolean enableApiExplorer; protected boolean enableApiExplorer;
/** /**
* Deprecated as of SDK 3.1
* Switch to enable/disable Alfresco Activiti Workflow Engine (activiti-app.war) when running embedded Tomcat. * 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 contains the Alfresco Activiti webapp, including the workflow engine.
* This webapp is also the user interface for people involved in the task and processes * This webapp is also the user interface for people involved in the task and processes
@@ -197,6 +198,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
protected boolean enableActivitiApp; protected boolean enableActivitiApp;
/** /**
* Deprecated as of SDK 3.1
* Switch to enable/disable Alfresco Activiti Admin (activiti-admin.war) when running embedded Tomcat. * 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 * This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your
* Alfresco Activiti engines. * Alfresco Activiti engines.
@@ -242,6 +244,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
protected List<ModuleDependency> shareModules; 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) * JARs that should be overlayed/applied to the Activiti App WAR (i.e. activiti-app.war)
*/ */
@Parameter(property = "maven.activiti.modules", defaultValue = "") @Parameter(property = "maven.activiti.modules", defaultValue = "")
@@ -296,6 +299,9 @@ public abstract class AbstractRunMojo extends AbstractMojo {
@Parameter(property = "alfresco.groupId", defaultValue = "org.alfresco") @Parameter(property = "alfresco.groupId", defaultValue = "org.alfresco")
protected String alfrescoGroupId; protected String alfrescoGroupId;
/**
* Deprecated as of SDK 3.1
*/
@Parameter(property = "activiti.groupId", defaultValue = "com.activiti") @Parameter(property = "activiti.groupId", defaultValue = "com.activiti")
protected String activitiGroupId; protected String activitiGroupId;
@@ -311,9 +317,16 @@ public abstract class AbstractRunMojo extends AbstractMojo {
@Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer") @Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer")
protected String alfrescoApiExplorerArtifactId; protected String alfrescoApiExplorerArtifactId;
/**
* Deprecated as of SDK 3.1
*/
@Parameter(property = "activiti.app.war.artifactId", defaultValue = "activiti-app") @Parameter(property = "activiti.app.war.artifactId", defaultValue = "activiti-app")
protected String activitiAppWarArtifactId; protected String activitiAppWarArtifactId;
/**
* Deprecated as of SDK 3.1
*/
@Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin") @Parameter(property = "activiti.admin.war.artifactId", defaultValue = "activiti-admin")
protected String activitiAdminWarArtifactId; protected String activitiAdminWarArtifactId;
@@ -326,6 +339,9 @@ public abstract class AbstractRunMojo extends AbstractMojo {
@Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e") @Parameter(property = "alfresco.api.explorer.version", defaultValue = "5.2.e")
protected String alfrescoApiExplorerVersion; protected String alfrescoApiExplorerVersion;
/**
* Deprecated as of SDK 3.1
*/
@Parameter(property = "activiti.version", defaultValue = "1.5.3") @Parameter(property = "activiti.version", defaultValue = "1.5.3")
protected String activitiVersion; protected String activitiVersion;
@@ -1348,6 +1364,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
} }
if (enableActivitiApp) { if (enableActivitiApp) {
webapps2Deploy.add(createWebAppElement( webapps2Deploy.add(createWebAppElement(
runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion, runnerActivitiAppGroupId, runnerActivitiAppWarArtifactId, runnerActivitiAppVersion,
"/activiti-app", null)); "/activiti-app", null));

View File

@@ -46,6 +46,30 @@ public class RunMojo extends AbstractRunMojo {
pluginManager 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) { if (enableSolr) {
unpackSolrConfig(); unpackSolrConfig();
fixSolrHomePath(); fixSolrHomePath();