SM-2584: Use overrides.properties to override joda-time version
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/4eb7dafb Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/4eb7dafb Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/4eb7dafb Branch: refs/heads/master Commit: 4eb7dafb9b1a31329765661868fd1a23382ec81b Parents: 3cffa71 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Jun 8 23:16:31 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Jun 8 23:16:31 2015 +0200 ---------------------------------------------------------------------- .../filtered-resources/etc/overrides.properties | 25 ++++++++++++++++++++ .../filtered-resources/startup-obr.properties | 10 ++------ 2 files changed, 27 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/4eb7dafb/assembly/src/main/filtered-resources/etc/overrides.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/overrides.properties b/assembly/src/main/filtered-resources/etc/overrides.properties new file mode 100644 index 0000000..def8d45 --- /dev/null +++ b/assembly/src/main/filtered-resources/etc/overrides.properties @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# workaround for SM-2469 +# +# some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time +# wire to this bundle. Later installation of activiti fails, because it needs higher version of joda-time +# and activiti tries to resolve this bundle via multiple paths. We want to force all features installing +# joda-time/joda-time bundle with range [2,3) to use exactly the version given below to make sure only one +# version of joda-time is installed in the system. +mvn:joda-time/joda-time/${jodatime2.bundle.version};range="[2,3)" http://git-wip-us.apache.org/repos/asf/servicemix/blob/4eb7dafb/assembly/src/main/filtered-resources/startup-obr.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/startup-obr.properties b/assembly/src/main/filtered-resources/startup-obr.properties index c813599..d754e01 100644 --- a/assembly/src/main/filtered-resources/startup-obr.properties +++ b/assembly/src/main/filtered-resources/startup-obr.properties @@ -15,11 +15,5 @@ # limitations under the License. # -# workaround for SM-2469 -# -# some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time -# wire to this bundle. Later installation of activiti fails, because it needs higher version of joda-time -# and activiti tries to resolve this bundle via multiple paths. Starting this bundle as soon as possible -# should force another bundles to wire this bundle (when compatible with the dependency requirements) instead -# of installing another versions -joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10 +# add here bundles you want to install while system startup, e.g. +# joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
