servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject git commit: SM-2288: Add drools feature (closes #7) Thanks to Wim Verreydt for the pull request!
Date Tue, 13 May 2014 20:15:13 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.1.x 8e8499efa -> 5472152f1


SM-2288: Add drools feature (closes #7)
Thanks to Wim Verreydt for the pull request!

(cherry picked from commit ac02c39b85b293322f738ac22c40b901543ef568)


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5472152f
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5472152f
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5472152f

Branch: refs/heads/servicemix-5.1.x
Commit: 5472152f1867b3705a6a692d38743b6270a98a25
Parents: 8e8499e
Author: Wim Verreydt <wim@anova.be>
Authored: Tue May 6 14:17:29 2014 +0200
Committer: Gert Vanthienen <gertv@apache.org>
Committed: Tue May 13 22:01:11 2014 +0200

----------------------------------------------------------------------
 assembly/src/main/filtered-resources/examples.xml |  4 ++--
 assembly/src/main/filtered-resources/features.xml | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/5472152f/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
index 076c2a2..29cad4c 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -88,12 +88,12 @@
     </feature>
     <feature name="examples-camel-drools" version="${version}" resolver="(obr)">
         <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+        <feature version="${drools.version}">drools</feature>
         <bundle>mvn:org.apache.servicemix.examples/camel-drools/${version}</bundle>
     </feature>
     <feature name="examples-camel-drools-blueprint" version="${version}" resolver="(obr)">
         <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+        <feature version="${drools.version}">drools</feature>
         <bundle>mvn:org.apache.servicemix.examples/camel-drools-blueprint/${version}</bundle>
     </feature>
     <feature name="examples-camel-cxf-rest" version="${version}" resolver="(obr)">

http://git-wip-us.apache.org/repos/asf/servicemix/blob/5472152f/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 852f446..34fb47a 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -47,6 +47,7 @@
         <feature version="${aries.transaction.version}">transaction</feature>
         <feature version="${camel.version}">camel</feature>
         <feature version="${spring.version}">spring-orm</feature>
+        <feature version="${drools.version}">drools</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
@@ -55,12 +56,6 @@
         <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
         <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
         <bundle dependency="true">mvn:org.mvel/mvel2/${mvel2.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <!--
-        <bundle dependency="true">mvn:org.drools/drools-core/${drools.version}</bundle>
-        <bundle dependency="true">mvn:org.drools/knowledge-internal-api/${drools.version}</bundle>
-        <bundle dependency="true">mvn:org.drools/knowledge-api/${drools.version}</bundle>
-        -->
         <bundle>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
         <bundle>mvn:org.activiti/activiti-bpmn-converter/${activiti.version}</bundle>
         <bundle>mvn:org.activiti/activiti-spring/${activiti.version}</bundle>
@@ -97,4 +92,8 @@
         <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
    </feature>
 
+    <feature name="drools" version="${drools.version}" resolver="(obr)">
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+    </feature>
+
 </features>


Mime
View raw message