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/10/20 19:16:42 UTC
[camel-karaf] 01/01: Merge branch 'release/3.6.0' into
camel-karaf-3.6.x
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch camel-karaf-3.6.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit f13b19616e751c05e3031b3aefb16e410d3ebbd8
Merge: 13e7e62 775840d
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Tue Oct 20 19:13:45 2020 +0000
Merge branch 'release/3.6.0' into camel-karaf-3.6.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(-)