You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2015/07/30 16:36:35 UTC
[1/2] camel git commit: Don't pull in jxl lib
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 440531751 -> a7d295860
Don't pull in jxl lib
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/582c43d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/582c43d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/582c43d3
Branch: refs/heads/camel-2.15.x
Commit: 582c43d32f6962dceb653dabb1aa253fb665af69
Parents: 4405317
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 30 10:24:14 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 30 10:34:58 2015 -0400
----------------------------------------------------------------------
components/camel-flatpack/pom.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/582c43d3/components/camel-flatpack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index 11185b2..dad0259 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -52,14 +52,9 @@
<version>${flatpack-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>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom-version}</version>
</dependency>
<!-- logging -->
[2/2] camel git commit: Remove references to the jexcelapi lib
Posted by dk...@apache.org.
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/a7d29586
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7d29586
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7d29586
Branch: refs/heads/camel-2.15.x
Commit: a7d2958601280ecbc9b897a29ea2014f4e5f456b
Parents: 582c43d
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 30 10:28:07 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 30 10:35:57 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/a7d29586/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b983158..0ec2aa8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -264,8 +264,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>
<jgroups-version>3.4.1.Final</jgroups-version>
<jibx-version>1.2.5</jibx-version>
<jing-bundle-version>20030619_5</jing-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/a7d29586/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/a7d29586/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 2a481dc..22cf60b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -366,8 +366,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'>