servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [1/2] servicemix git commit: SM-2497 Add features for Drools 6.2 (Closes #20)
Date Sun, 19 Apr 2015 10:02:30 GMT
Repository: servicemix
Updated Branches:
  refs/heads/master 4d126e409 -> 027a0d1a6


SM-2497 Add features for Drools 6.2 (Closes #20)

Thanks to Grzegorz Halajko for the pull request!!!


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

Branch: refs/heads/master
Commit: 5f12f4a9806419c148c11856f8a638bcbc96235f
Parents: 4d126e4
Author: Grzegorz Halajko <gh@linuxpolska.pl>
Authored: Tue Apr 14 12:49:01 2015 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Sun Apr 19 11:37:33 2015 +0200

----------------------------------------------------------------------
 assembly/pom.xml                                |   4 +
 .../etc/org.apache.karaf.features.cfg           |   1 +
 drools/pom.xml                                  |  77 ++++++++++++
 drools/src/main/resources/features.xml          | 117 +++++++++++++++++++
 pom.xml                                         |   2 +
 5 files changed, 201 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/5f12f4a9/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9e84704..d0cd987 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -149,6 +149,7 @@
                                 <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.servicemix.drools/features/${version}/xml/features</descriptor>
                                 <descriptor>file:${basedir}/target/classes/internal.xml</descriptor>
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
                                 <descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
@@ -172,6 +173,9 @@
                                 <feature>camel-blueprint</feature>
                                 <feature>war</feature>
                                 <feature>jaxrs-api</feature>
+                                <feature>kie-aries-blueprint</feature>
+                                <feature>kie-spring</feature>
+                                <feature>kie-camel</feature>
                             </features>
                             <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
                             <repository>target/features-repo</repository>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/5f12f4a9/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 35695b0..3b68c9f 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -42,6 +42,7 @@ featuresRepositories=\
     mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features,\
     mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,\
     mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,\
+    mvn:org.apache.servicemix.drools/features/${version}/xml/features,\
     mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,\
     mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,\
     mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features

http://git-wip-us.apache.org/repos/asf/servicemix/blob/5f12f4a9/drools/pom.xml
----------------------------------------------------------------------
diff --git a/drools/pom.xml b/drools/pom.xml
new file mode 100644
index 0000000..b0d469e
--- /dev/null
+++ b/drools/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
+		contributor license agreements. See the NOTICE file distributed with this 
+		work for additional information regarding copyright ownership. The ASF licenses 
+		this file to You under the Apache License, Version 2.0 (the "License"); you 
+		may not use this file except in compliance with the License. You may obtain 
+		a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
+		required by applicable law or agreed to in writing, software distributed 
+		under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
+		OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+		the specific language governing permissions and limitations under the License. -->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>parent</artifactId>
+		<version>6.0.0-SNAPSHOT</version>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.servicemix.drools</groupId>
+	<artifactId>features</artifactId>
+	<packaging>pom</packaging>
+	<name>Apache ServiceMix :: Drools 6 :: Features</name>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<phase>package</phase>
+						<inherited>false</inherited>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>target/classes/features.xml</file>
+									<type>xml</type>
+									<classifier>features</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/5f12f4a9/drools/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/drools/src/main/resources/features.xml b/drools/src/main/resources/features.xml
new file mode 100644
index 0000000..5060465
--- /dev/null
+++ b/drools/src/main/resources/features.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<features name="servicemix-drools6-${version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+	<repository>mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal</repository>
+
+	<feature name="kie" version="${drools6.version}" description="KIE API"
+		start-level="50">
+		<bundle>mvn:org.kie/kie-api/${drools6.version}</bundle>
+		<bundle>mvn:org.kie/kie-internal/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="drools6-commons" version="${drools6.version}"
+		description="Drools 6 Commons" start-level="50">
+		<feature>pax-cdi</feature>
+		<bundle dependency="true">mvn:org.mvel/mvel2/2.2.4.Final</bundle>
+		<bundle dependency="true">mvn:com.google.protobuf/protobuf-java/2.5.0</bundle>
+		<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/3.5_1</bundle>
+	</feature>
+
+	<feature name="drools6-module" version="${drools6.version}"
+		description="Drools 6 core" start-level="50">
+		<feature version="${drools6.version}">drools6-commons</feature>
+		<feature version="${drools6.version}">kie</feature>
+		<bundle>mvn:org.drools/drools-core/${drools6.version}</bundle>
+		<bundle>mvn:org.drools/drools-compiler/${drools6.version}</bundle>
+		<bundle>mvn:org.drools/drools-osgi-integration/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="kie-aries-blueprint" version="${drools6.version}"
+		description="Drools 6 KIE Blueprint support" start-level="50">
+		<feature version="${drools6.version}">kie</feature>
+		<feature version="${drools6.version}">drools6-jpa</feature>
+		<feature version="${drools6.version}">jbpm</feature>
+		<feature version="${drools6.version}">jbpm-human-task</feature>
+		<bundle>mvn:org.kie/kie-aries-blueprint/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="drools6-jpa" version="${drools6.version}"
+		description="Drools 6 JPA support" start-level="50">
+		<feature version="${drools6.version}">drools6-module</feature>
+		<feature version="[2.0,3.0)">jpa</feature>
+		<bundle>mvn:org.drools/drools-persistence-jpa/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="jbpm" version="${drools6.version}" description="jBPM Engine support"
+		start-level="50">
+		<feature version="${drools6.version}">drools6-module</feature>
+		<feature version="${drools6.version}">drools6-jpa</feature>
+		<feature version="${drools6.version}">jbpm-commons</feature>
+		<feature version="${drools6.version}">jbpm-human-task</feature>
+		<bundle>mvn:org.jbpm/jbpm-flow-builder/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-flow/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-bpmn2/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-audit/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-runtime-manager/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-persistence-jpa/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="jbpm-human-task" version="${drools6.version}"
+		description="jBPM human task support" start-level="50">
+		<feature version="${drools6.version}">jbpm-commons</feature>
+		<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
+		<bundle>mvn:org.jbpm/jbpm-human-task-core/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-human-task-workitems/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-human-task-jpa/${drools6.version}</bundle>
+		<bundle>mvn:org.jbpm/jbpm-human-task-audit/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="jbpm-commons" version="${drools6.version}"
+		description="jBPM Commons" start-level="50">
+		<feature version="[4.2,5.0)">hibernate</feature>
+		<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.6_1</bundle>
+	</feature>
+
+	<feature name="kie-spring" version="${drools6.version}"
+		description="KIE Spring support" start-level="50">
+		<feature version="${drools6.version}">kie</feature>
+		<feature version="${drools6.version}">drools6-jpa</feature>
+		<feature version="${drools6.version}">jbpm</feature>
+		<feature version="${drools6.version}">jbpm-human-task</feature>
+		<feature version="[3.1,4.0)">spring</feature>
+		<feature version="[3.1,4.0)">spring-orm</feature>
+		<bundle>mvn:org.kie/kie-spring/${drools6.version}</bundle>
+	</feature>
+
+	<feature name="kie-camel" version="${drools6.version}"
+		description="KIE Camel support" start-level="50">
+		<feature version="${drools6.version}">kie-spring</feature>
+		<feature version="${drools6.version}">jbpm</feature>
+		<feature version="${camel.version}">camel-core</feature>
+		<feature version="${camel.version}">camel-spring</feature>
+		<feature version="${camel.version}">camel-cxf</feature>
+
+		<feature version="${cxf.version}">cxf-specs</feature>
+		<feature version="${cxf.version}">cxf-core</feature>
+		<feature version="${cxf.version}">cxf-jaxrs</feature>
+
+		<bundle>mvn:org.kie/kie-camel/${drools6.version}</bundle>
+	</feature>
+</features>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/5f12f4a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 50609ec..2ba29c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <module>parent</module>
         <module>activemq</module>
         <module>activiti</module>
+        <module>drools</module>
         <module>branding</module>
         <module>logging</module>
         <module>examples</module>
@@ -125,6 +126,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
         <drools.version>5.6.0.Final</drools.version>
+        <drools6.version>6.2.0.Final</drools6.version>
         <felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
         <h2.version>1.3.170</h2.version>
         <xerces.version>2.11.0</xerces.version>


Mime
View raw message