Repository: servicemix Updated Branches: refs/heads/servicemix-5.3.x d7c917383 -> 974e0534a
SM-2473: Consistent usage of joda-time bundle Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/ff46cba6 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/ff46cba6 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/ff46cba6 Branch: refs/heads/servicemix-5.3.x Commit: ff46cba6c601df9c1c6ad0cf1abde81c409b86f9 Parents: d7c9173 Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue Mar 10 20:30:29 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Fri Mar 13 21:54:30 2015 +0100 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/features.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/ff46cba6/assembly/src/main/filtered-resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml index 316ef8c..dd3a5bf 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -37,7 +37,7 @@ <feature version="${camel.version}">camel</feature> <feature version="[3.2,3.3)">spring-orm</feature> <feature version="${drools.version}">drools</feature> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle> + <bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle> <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}</bundle> http://git-wip-us.apache.org/repos/asf/servicemix/blob/ff46cba6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9ac5ac1..d27b842 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -57,7 +57,7 @@ <typesafe-config.version>1.0.2</typesafe-config.version> <mvel2.version>2.1.7.Final</mvel2.version> <mybatis.version>3.2.7</mybatis.version> - <jodatime.bundle.version>2.3_1</jodatime.bundle.version> + <jodatime2.bundle.version>2.3</jodatime2.bundle.version> <jpa.version>2.1.0</jpa.version> <servicemix.specs.version>2.4.0</servicemix.specs.version>
