Upgrade Quartz to version 2.3.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37f65bc1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37f65bc1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37f65bc1 Branch: refs/heads/master Commit: 37f65bc1a17b749a2cb42c0a0974765634f832ee Parents: 395c33f Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue May 9 09:02:52 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue May 9 09:45:45 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/37f65bc1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 841ccdb..11e9d86 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -266,6 +266,7 @@ <hibernate-validator-version>5.4.1.Final</hibernate-validator-version> <!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. --> <hibernate-version>4.2.20.Final</hibernate-version> + <hikaricp-version>2.3.13</hikaricp-version> <hk2-version>2.3.0</hk2-version> <hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version> <hsqldb-version>2.3.4</hsqldb-version> @@ -526,7 +527,7 @@ <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.3</quartz2-version> + <quartz2-version>2.3.0</quartz2-version> <quickfixj-version>1.6.3</quickfixj-version> <rabbitmq-amqp-client-version>4.1.0</rabbitmq-amqp-client-version> <reactive-streams-version>1.0.0</reactive-streams-version> http://git-wip-us.apache.org/repos/asf/camel/blob/37f65bc1/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 aeb10aa..41c420e 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1478,6 +1478,7 @@ <feature name='camel-quartz2' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>wrap:mvn:com.mchange/c3p0/${c3p0-version}</bundle> <bundle dependency='true'>wrap:mvn:com.mchange/mchange-commons-java/${mchange-commons-java-version}</bundle> + <bundle dependency='true'>mvn:com.zaxxer/HikariCP-java6/${hikaricp-version}</bundle> <bundle dependency='true'>mvn:org.quartz-scheduler/quartz/${quartz2-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-quartz2/${project.version}</bundle>
