You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/12/28 13:40:07 UTC
svn commit: r1426479 - in /camel/trunk: components/camel-servlet/pom.xml
parent/pom.xml
Author: davsclaus
Date: Fri Dec 28 12:40:06 2012
New Revision: 1426479
URL: http://svn.apache.org/viewvc?rev=1426479&view=rev
Log:
Fixed camel-servlet to use osgi compendium dependency instead of felix based (old stuff not released anymore).
Modified:
camel/trunk/components/camel-servlet/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-servlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1426479&r1=1426478&r2=1426479&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Fri Dec 28 12:40:06 2012
@@ -37,23 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${felix-compendium-version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
@@ -61,13 +44,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
<exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi-version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1426479&r1=1426478&r2=1426479&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Dec 28 12:40:06 2012
@@ -111,7 +111,6 @@
<exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
<ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
<fastinfoset-version>1.2.7_4</fastinfoset-version>
- <felix-compendium-version>1.4.0</felix-compendium-version>
<felix-configadmin-version>1.4.0</felix-configadmin-version>
<felix-framework-version>3.2.2</felix-framework-version>
<flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>