Author: ningjiang
Date: Tue Jul 1 19:56:46 2008
New Revision: 673264
URL: http://svn.apache.org/viewvc?rev=673264&view=rev
Log:
Changed the org.osgi.core's scope to be provided, also added its dependency
version in the camel parent pom
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=673264&r1=673263&r2=673264&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Tue Jul 1 19:56:46 2008
@@ -50,10 +50,10 @@
</dependency>
<dependency>
- <!-- TODO: this is only needed for OSGi environments, we can have it
optional or provided -->
+ <!-- this is only needed for OSGi environments -->
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix-osgi-version}</version>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=673264&r1=673263&r2=673264&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Tue Jul 1 19:56:46 2008
@@ -626,6 +626,13 @@
<version>${log4j-version}</version>
</dependency>
+ <!-- optional dependencies for felix -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix-osgi-version}</version>
+ </dependency>
+
<!-- optional dependencies for JMS -->
<dependency>
<groupId>org.apache.activemq</groupId>
