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 2010/09/01 08:32:25 UTC

svn commit: r991443 - in /camel/trunk: components/camel-flatpack/pom.xml parent/pom.xml

Author: ningjiang
Date: Wed Sep  1 06:32:24 2010
New Revision: 991443

URL: http://svn.apache.org/viewvc?rev=991443&view=rev
Log:
CAMEL-2966. Upgrade flatpack to ver 3.2.0

Modified:
    camel/trunk/components/camel-flatpack/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-flatpack/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/pom.xml?rev=991443&r1=991442&r2=991443&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/pom.xml (original)
+++ camel/trunk/components/camel-flatpack/pom.xml Wed Sep  1 06:32:24 2010
@@ -44,11 +44,30 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
+    <!-- Using the servicemix wrapped one as the centrl mvn repo doesn't have one -->
     <dependency>
-      <groupId>net.sf.flatpack</groupId>
-      <artifactId>flatpack</artifactId>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.flatpack</artifactId>
       <version>${flatpack-version}</version>
     </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>jexcelapi</groupId>
+      <artifactId>jxl</artifactId>
+      <version>2.4.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
 
     <!-- testing -->
     <dependency>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=991443&r1=991442&r2=991443&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Sep  1 06:32:24 2010
@@ -53,7 +53,7 @@
     <derby-version>10.4.2.0</derby-version>
     <dozer-version>5.2.2</dozer-version>
     <easymock-version>2.5.2</easymock-version>
-    <flatpack-version>3.2.0</flatpack-version>
+    <flatpack-version>3.2.0_1</flatpack-version>
     <ftpserver-version>1.0.3</ftpserver-version>
     <fuse-commons-management-version>1.0</fuse-commons-management-version>
     <freemarker-version>2.3.15</freemarker-version>
@@ -156,7 +156,7 @@
       org.jivesoftware.smack.*;version="[3.0,4)",
       org.ccil.cowan.tagsoup.*;version="[1.2,2)",
       org.mortbay.cometd.*;version="[6.1,7)",
-      net.sf.flatpack.*;version="[3.2.0,4)",
+      net.sf.flatpack.*;version="[3.1.1,4)",
       freemarker.*;version="[2.3.15,3)",
       javax.persistence.*;version="[1.1,2)",
     </camel.osgi.import.defaults>