Author: gertv
Date: Tue Apr 19 14:09:04 2011
New Revision: 1095092
URL: http://svn.apache.org/viewvc?rev=1095092&view=rev
Log:
SMX4-810: ODE 1.3.5 is not compatible with Karaf 2.2.x
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1095092&r1=1095091&r2=1095092&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Apr 19 14:09:04 2011
@@ -87,14 +87,6 @@
<classifier>features</classifier>
</dependency>
- <!-- ODE -->
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jbi-karaf</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
<!--Xerces jar to be included in lib/endorsed -->
<dependency>
<groupId>org.apache.xerces</groupId>
@@ -146,7 +138,6 @@
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
<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.ode/ode-jbi-karaf/${ode.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1095092&r1=1095091&r2=1095092&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Tue Apr 19 14:09:04 2011
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
#
# Comma separated list of features to install at startup
