You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2020/09/04 18:15:13 UTC
[camel-karaf] 01/02: Merge branch 'release/3.5.0' into
camel-karaf-3.5.x
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch camel-karaf-3.5.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit df4fbbf071257177ac0617a0f6b1a341d83d7def
Merge: e939a47 2b1f380
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Fri Sep 4 10:54:25 2020 -0700
Merge branch 'release/3.5.0' into camel-karaf-3.5.x
bom/camel-karaf-bom/pom.xml | 2 +-
bom/pom.xml | 2 +-
catalog/camel-catalog-provider-karaf/pom.xml | 5 +-
catalog/pom.xml | 2 +-
components/camel-blueprint-main/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 60 ++++++++++------------
components/camel-cxf-blueprint/pom.xml | 2 +-
components/camel-cxf-transport-blueprint/pom.xml | 2 +-
components/camel-eventadmin/pom.xml | 2 +-
components/camel-kura/pom.xml | 2 +-
components/camel-osgi-activator/pom.xml | 6 +--
components/camel-paxlogging/pom.xml | 2 +-
components/camel-servlet-osgi/pom.xml | 2 +-
components/camel-test-blueprint/pom.xml | 2 +-
components/camel-test-karaf/pom.xml | 2 +-
components/pom.xml | 5 +-
core/camel-core-osgi/pom.xml | 2 +-
core/pom.xml | 2 +-
platforms/commands/commands-core/pom.xml | 2 +-
platforms/commands/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 2 +-
platforms/karaf/pom.xml | 2 +-
platforms/pom.xml | 2 +-
pom.xml | 8 +--
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-blueprint-test/pom.xml | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
tests/pom.xml | 2 +-
.../pom.xml | 2 +-
tooling/camel-karaf-docs-maven-plugin/pom.xml | 2 +-
tooling/pom.xml | 2 +-
32 files changed, 64 insertions(+), 74 deletions(-)