camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/3] camel git commit: Remove references to the jexcelapi lib
Date Thu, 30 Jul 2015 14:33:22 GMT
Remove references to the jexcelapi lib


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

Branch: refs/heads/master
Commit: d9ba90f432ab1b7c817df65457d4a4042ef862f7
Parents: 5b14a3e
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Jul 30 10:28:07 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Jul 30 10:28:07 2015 -0400

----------------------------------------------------------------------
 parent/pom.xml                                                 | 2 --
 platforms/karaf/features/src/main/resources/bundles.properties | 1 -
 platforms/karaf/features/src/main/resources/features.xml       | 5 +++--
 3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 43038c8..ffd8717 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -272,8 +272,6 @@
     <jetty-plugin-version>8.1.16.v20140903</jetty-plugin-version>
     <jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId>
     <jettison-version>1.3.7</jettison-version>
-    <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
-    <jexcelapi-version>2.4.2</jexcelapi-version>
     <jgit-version>4.0.1.201506240215-r</jgit-version>
     <jgroups-version>3.6.4.Final</jgroups-version>
     <jibx-version>1.2.6</jibx-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/platforms/karaf/features/src/main/resources/bundles.properties
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties
index 84cd284..8c7e448 100644
--- a/platforms/karaf/features/src/main/resources/bundles.properties
+++ b/platforms/karaf/features/src/main/resources/bundles.properties
@@ -49,7 +49,6 @@ org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bund
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/jar

http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/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 b3f69b1..9d74e49 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -406,8 +406,9 @@
   <feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>
     <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:net.sf.flatpack/flatpack/${flatpack-version}</bundle>
+    <!-- when flatpack 3.4.3 is released, we can use this as the jexcelapi deps will be
optional.  Tell then, use the latest smx bundle -->
+    <!--bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle-->
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/3.2.0_2</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