From 07ecbb1de74c29cf95ae549df493c1927a476772 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 21 Jul 2015 12:18:23 +0000
Subject: [PATCH] Merge WOLF-1 to HEAD 108132: UTF-30 Fix version of share,
 built in Share codebase Fix version of share-po, built in Share codebase
 108130: UTF-30 Fix version of artifacts built in Share codebase + package
 alfresco-platform and share-services AMP instead of share-enabled alfresco
 war 108128: UTF-30 Fix version of artifacts built in Share codebase + package
 alfresco-platform and share-services AMP instead of share-enabled alfresco
 war

107846: EOL-10: Remove JBPM bootstrap.

Removed the JBPM boostrap bean ("workflowScheduler") and the schema validation from bootstrap-context.xml
107842: EOL-4 : Remove JBPM schema bootstrap reference.
107839: EOL-8 : Remove JBPMWorkflowTestSuite and re-instate InviteServiceTest
107823: Temp remove InviteServiceTest
107820: EOL-9: Remove workflow definitions for JBPM workflows
107813: EOL-6: Remove jBPM from MBeans
SVN ignore settings
107810: EOL-8 : Attempt to update Invite service test to use activity.
107794:EOL-5: Remove jBPM from Admin Console
107790: EOL-8 : Remove JBPM Tests
EOL-8 : more JBPM tests removed.
EOL-8 : Remove JBPM tests from Workflow Test Suite
EOL-8 : Remove JBPMEngineTest
AIRWOLF - more enterprise pom work.
UTF-143 - add the update tool JAR to the enterprise distribution.
Airwolf - need to separate dependency.share.version
EOL-8 - Remove system.workflow.engine.jbpm.enabled

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                                                         | 1 +
 .../bitrock/bitrock/alfresco/shared/alfresco-global.properties  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63bf927f39..472b2d98bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr4-distribution</artifactId>
+                                    <version>${dependency.share.version}</version>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/distribution/${alfresco.package.name}-${project.version}/web-server/webapps</outputDirectory>
diff --git a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
index 62dfffac2c..4cb4ddee83 100644
--- a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
+++ b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
@@ -67,5 +67,3 @@ index.subsystem.name=solr4
 dir.keystore=${dir.root}/keystore
 solr.port.ssl=@@BITROCK_TOMCAT_SSL_PORT@@
 
-### BPM Engine ###
-system.workflow.engine.jbpm.enabled=false