You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/02/01 10:07:40 UTC
svn commit: r739719 - in /camel/branches/camel-1.x: ./ camel-core/
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
components/camel-sql/src/test/java/org/apache/camel/component/sql/
Author: ningjiang
Date: Sun Feb 1 09:07:40 2009
New Revision: 739719
URL: http://svn.apache.org/viewvc?rev=739719&view=rev
Log:
Merged revisions 739714 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r739714 | ningjiang | 2009-02-01 16:39:52 +0800 (Sun, 01 Feb 2009) | 1 line
Removed the useless osgi dependency
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/pom.xml
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java (props changed)
camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java (props changed)
Propchange: camel/branches/camel-1.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/pom.xml?rev=739719&r1=739718&r2=739719&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/pom.xml (original)
+++ camel/branches/camel-1.x/camel-core/pom.xml Sun Feb 1 09:07:40 2009
@@ -68,15 +68,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
- </dependency>
-
- <dependency>
- <!-- this is only needed for OSGi environments -->
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ </dependency>
<!-- to allow Spring annotations to be used -->
<dependency>
Propchange: camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
('svn:mergeinfo' removed)