camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: CAMEL-7776: Upgrade to latest flatpack which is an OSGi bundle now.
Date Fri, 05 Sep 2014 14:50:15 GMT
Repository: camel
Updated Branches:
  refs/heads/master 23ea202d3 -> 7688e0cc5


CAMEL-7776: Upgrade to latest flatpack which is an OSGi bundle now.


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

Branch: refs/heads/master
Commit: 7688e0cc5687b9f5f9c1426ffbdb2211666dbd62
Parents: 23ea202
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Sep 5 16:49:49 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Sep 5 16:50:07 2014 +0200

----------------------------------------------------------------------
 components/camel-flatpack/pom.xml               | 29 ++++++++++----------
 parent/pom.xml                                  |  2 +-
 .../features/src/main/resources/features.xml    |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7688e0cc/components/camel-flatpack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index 025ffb6..5e54184 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -43,29 +43,28 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    <!-- Using the servicemix wrapped one as the centrl mvn repo doesn't have one -->
     <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.flatpack</artifactId>
-      <version>${flatpack-bundle-version}</version>
+      <groupId>net.sf.flatpack</groupId>
+      <artifactId>flatpack</artifactId>
+      <version>${flatpack-version}</version>
     </dependency>
-	<dependency> 
-	  <groupId>org.jdom</groupId> 
-	  <artifactId>jdom</artifactId> 
-	  <version>${jdom-version}</version> 
-	</dependency>
+    <dependency> 
+	    <groupId>org.jdom</groupId> 
+	    <artifactId>jdom</artifactId> 
+	    <version>${jdom-version}</version> 
+	  </dependency>
     <dependency> 
       <groupId>jexcelapi</groupId> 
       <artifactId>jxl</artifactId> 
       <version>${jexcelapi-version}</version>
     </dependency>
 
-	<!-- logging -->
-	<dependency>
-		<groupId>org.slf4j</groupId>
-		<artifactId>slf4j-log4j12</artifactId>
-		<scope>test</scope>
-	</dependency>
+	  <!-- logging -->
+	  <dependency>
+		  <groupId>org.slf4j</groupId>
+		  <artifactId>slf4j-log4j12</artifactId>
+		  <scope>test</scope>
+	  </dependency>
 
     <!-- testing -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/7688e0cc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d65521..b24a4dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -140,7 +140,7 @@
     <felix-fileinstall-version>3.2.6</felix-fileinstall-version>
     <felix-framework-version>3.2.2</felix-framework-version>
     <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
-    <flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
+    <flatpack-version>3.4.2</flatpack-version>
     <fop-bundle-version>1.1_1</fop-bundle-version>
     <fop-version>1.1</fop-version>
     <ftpserver-version>1.0.6</ftpserver-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/7688e0cc/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1a9732d..b65dfba 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -336,7 +336,7 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-flatpack/${project.version}</bundle>
   </feature>
   <feature name='camel-fop' version='${project.version}' resolver='(obr)' start-level='50'>


Mime
View raw message