Author: ningjiang
Date: Fri Apr 2 05:04:24 2010
New Revision: 930165
URL: http://svn.apache.org/viewvc?rev=930165&view=rev
Log:
CAMEL-2596 clean up the camel-netty feature, also upgrade the karaf feature
plugin version to 1.4.0
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/platforms/karaf/pom.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=930165&r1=930164&r2=930165&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Apr 2 05:04:24 2010
@@ -356,7 +356,7 @@
</feature>
<feature name='camel-netty' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>wrap:http://repository.jboss.org/maven2/org/jboss/netty/netty/3.1.5.GA/netty-3.1.5.GA.jar</bundle>
+
<bundle>mvn:http://repository.jboss.org/maven2!org.jboss.netty/netty/${netty-version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty/${pom.version}</bundle>
</feature>
<feature name='camel-ognl' version='${pom.version}'>
Modified: camel/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=930165&r1=930164&r2=930165&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Fri Apr 2 05:04:24 2010
@@ -34,7 +34,7 @@
<name>Camel :: Platforms :: Apache Karaf</name>
<properties>
- <karaf-version>1.2.0</karaf-version>
+ <karaf-version>1.4.0</karaf-version>
</properties>
<modules>
@@ -89,7 +89,18 @@
<enabled>false</enabled>
</snapshots>
</repository>
-
+ <!-- Jboss maven repo -->
+ <repository>
+ <id>jboss</id>
+ <name>Jboss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<!-- Spring milestone repo -->
<repository>
<id>spring-milestone</id>
