camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject git commit: CAMEL-7389 camel-quartz component does not define osgi import version for quartz
Date Wed, 23 Apr 2014 13:14:59 GMT
Repository: camel
Updated Branches:
  refs/heads/master 7920a773b -> 7cc63e9d4


CAMEL-7389 camel-quartz component does not define osgi import version for quartz


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

Branch: refs/heads/master
Commit: 7cc63e9d4a57297be0205066143920682b146ec6
Parents: 7920a77
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Wed Apr 23 12:57:52 2014 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Wed Apr 23 15:14:43 2014 +0200

----------------------------------------------------------------------
 components/camel-quartz/pom.xml | 1 +
 parent/pom.xml                  | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7cc63e9d/components/camel-quartz/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index ac88387..3cb8a85 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -38,6 +38,7 @@
       !org.apache.camel.component.quartz.*,
       !org.apache.camel.routepolicy.quartz.*,
       ${camel.osgi.import.defaults},
+      org.quartz.*;version="${quartz-version-range}",
       *
     </camel.osgi.import.pkg>
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quartz</camel.osgi.export.service>

http://git-wip-us.apache.org/repos/asf/camel/blob/7cc63e9d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 942e11a..5284187 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,6 +333,7 @@
     <qpid-version>0.26</qpid-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>
+    <quartz-version-range>[1.8,2)</quartz-version-range>
     <quartz2-version>2.2.1</quartz2-version>
     <quickfix-bundle-version>1.5.3_1</quickfix-bundle-version>
     <rabbitmq-amqp-client-version>3.2.2</rabbitmq-amqp-client-version>


Mime
View raw message