Author: davsclaus
Date: Fri Jul 4 11:49:21 2008
New Revision: 674106
URL: http://svn.apache.org/viewvc?rev=674106&view=rev
Log:
CAMEL-672: Upgrade OSGi versions
Modified:
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=674106&r1=674105&r2=674106&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Fri Jul 4 11:49:21 2008
@@ -53,21 +53,16 @@
<version>${spring-osgi-version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>${felix-osgi-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <optional>false</optional>
+ </dependency>
<!-- for parsing the XML -->
<dependency>
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=674106&r1=674105&r2=674106&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Jul 4 11:49:21 2008
@@ -46,7 +46,7 @@
<slf4j-version>1.3.0</slf4j-version>
<openjpa-version>1.1.0</openjpa-version>
<spring-version>2.5.5</spring-version>
- <spring-osgi-version>1.0.2</spring-osgi-version>
+ <spring-osgi-version>1.1.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
<uface-version>1.0-m1</uface-version>
<jaxb-version>2.1.6</jaxb-version>
