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 2013/08/28 03:32:59 UTC

git commit: CAMEL-6673 revert the change

Updated Branches:
  refs/heads/master d923d80ff -> 34b6388a1


CAMEL-6673 revert the change


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34b6388a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34b6388a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34b6388a

Branch: refs/heads/master
Commit: 34b6388a18fb4293de66cd83e08dbc76ee4e56a6
Parents: d923d80
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Aug 28 09:24:12 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Aug 28 09:24:40 2013 +0800

----------------------------------------------------------------------
 camel-core/pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/34b6388a/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 3c29f3b..5047b14 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -101,13 +101,12 @@
   <dependencies>
 
     <!-- required dependencies by camel-core -->
-    <!-- which we shade into camel-core so its available for everybody out of the box -->
+    <!-- it will be shade into camel-core by bnd plugin -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>spi-annotations</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
-      <scope>provided</scope>
     </dependency>
 
     <!-- required dependencies by camel-core -->
@@ -115,7 +114,6 @@
     <dependency>
       <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
       <artifactId>concurrentlinkedhashmap-lru</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <!-- required dependencies by camel-core -->
@@ -188,7 +186,6 @@
             <configuration>
               <artifactSet>
                 <includes>
-                  <include>org.apache.camel:spi-annotations</include>
                   <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
                 </includes>
                 <excludes>