Author: davsclaus
Date: Tue Dec 14 12:51:46 2010
New Revision: 1049070
URL: http://svn.apache.org/viewvc?rev=1049070&view=rev
Log:
CAMEL-3405: Use SMX bundle. Thanks to Jean for patch.
Modified:
camel/trunk/components/camel-netty/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-netty/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/pom.xml?rev=1049070&r1=1049069&r2=1049070&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/pom.xml (original)
+++ camel/trunk/components/camel-netty/pom.xml Tue Dec 14 12:51:46 2010
@@ -36,16 +36,17 @@
org.apache.camel.component.netty.*
</camel.osgi.export.pkg>
</properties>
-
+
+ <!-- disabled jboss repo, as its only used when testing a new netty
upgrade directly from jboss
<repositories>
- <repository>
- <id>jboss</id>
-
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repository>
+ <id>jboss</id>
+
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories> -->
<dependencies>
<dependency>
@@ -53,9 +54,9 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.netty</artifactId>
+ <version>${netty-bundle-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049070&r1=1049069&r2=1049070&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 12:51:46 2010
@@ -104,7 +104,7 @@
<mina-version>1.1.7</mina-version>
<mockito-version>1.8.2</mockito-version>
<mvel-version>2.0.18</mvel-version>
- <netty-version>3.2.3.Final</netty-version>
+ <netty-bundle-version>3.2.3.Final_1</netty-bundle-version>
<ode-version>1.3.3</ode-version>
<ognl-version>2.7.3_3</ognl-version>
<openjpa-version>1.2.2</openjpa-version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1049070&r1=1049069&r2=1049070&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Tue Dec 14 12:51:46 2010
@@ -439,7 +439,7 @@
</feature>
<feature name='camel-netty' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.jboss.org/nexus/content/groups/public!org.jboss.netty/netty/${netty-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-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/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1049070&r1=1049069&r2=1049070&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 14 12:51:46 2010
@@ -442,7 +442,7 @@
</feature>
<feature name='camel-netty' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.jboss.org/nexus/content/groups/public!org.jboss.netty/netty/${netty-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty/${pom.version}</bundle>
</feature>
<feature name='camel-ognl' version='${pom.version}'>
