You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/01/27 16:44:32 UTC

[camel] 06/07: Merge branch 'CAMEL-14444'

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 33631e58707f986a9cd89671a04aaf05ece84acb
Merge: d45cae2 0393d23
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 27 16:49:01 2020 +0100

    Merge branch 'CAMEL-14444'

 .../META-INF/maven/archetype-metadata.xml          |    4 +-
 .../__artifactId__-component/pom.xml               |    7 +-
 .../META-INF/maven/archetype-metadata.xml          |    4 +-
 .../src/main/resources/archetype-resources/pom.xml |    6 +-
 .../META-INF/maven/archetype-metadata.xml          |    4 +-
 .../src/main/resources/archetype-resources/pom.xml |    7 +-
 .../META-INF/maven/archetype-metadata.xml          |    4 +-
 .../src/main/resources/archetype-resources/pom.xml |    7 +-
 archetypes/pom.xml                                 |    2 +-
 catalog/camel-catalog-lucene/pom.xml               |    5 +-
 catalog/camel-catalog-maven/pom.xml                |    5 +-
 catalog/camel-catalog-provider-karaf/pom.xml       |    5 +-
 components/camel-blueprint/pom.xml                 |    4 +-
 .../camel-debezium-maven-plugin/pom.xml            |    4 +-
 components/camel-jasypt/pom.xml                    |    6 +-
 .../camel-salesforce-maven-plugin/pom.xml          |    4 +-
 .../camel-servicenow-maven-plugin/pom.xml          |    4 +-
 components/camel-spring/pom.xml                    |    4 +-
 components/camel-test-karaf/pom.xml                |    4 +-
 components/pom.xml                                 |   57 +-
 core/camel-caffeine-lrucache/pom.xml               |    6 +-
 core/camel-core-engine/pom.xml                     |    4 +-
 core/camel-core/pom.xml                            |    4 +-
 core/pom.xml                                       |   52 +
 .../camel-example-artemis-amqp-blueprint/pom.xml   |    5 +-
 .../pom.xml                                        |    5 +-
 examples/camel-example-fhir-osgi/pom.xml           |    5 +-
 .../camel-example-netty-http/myapp-cdi/pom.xml     |    4 +-
 .../core-rest/pom.xml                              |    4 +-
 .../tika-detect/pom.xml                            |    4 +-
 .../tika-parse/pom.xml                             |    4 +-
 examples/camel-example-ssh-security/pom.xml        |    5 +-
 examples/camel-example-ssh/pom.xml                 |    5 +-
 examples/camel-example-swagger-osgi/pom.xml        |    5 +-
 .../camel-example-transformer-blueprint/pom.xml    |    4 +-
 examples/pom.xml                                   |   57 +-
 parent/pom.xml                                     |   93 +-
 platforms/commands/commands-core/pom.xml           |    5 +-
 platforms/karaf/commands/pom.xml                   |    5 +-
 pom.xml                                            |    3 +-
 tests/test-bundles/pom.xml                         |    5 +-
 tooling/apt/pom.xml                                |    1 +
 tooling/camel-util-json/pom.xml                    |   53 +
 tooling/{ => maven}/camel-bundle-plugin/pom.xml    |   25 +-
 .../org/apache/camel/maven/bundle/CamelPlugin.java |    0
 .../apache/felix/bundleplugin/ManifestPlugin.java  |  548 ++
 .../felix/bundleplugin/VersionCleanerPlugin.java   |   78 +
 .../maven/plugins/javadoc/AbstractJavadocMojo.java | 6820 ++++++++++++++++++++
 .../apache/maven/plugins/javadoc/StaleHelper.java  |  181 +
 .../camel/maven/packaging/PackageJandexMojo.java   |  112 +
 .../camel/maven/packaging/PackageJaxbMojo.java     |   17 +
 .../m2e/lifecycle-mapping-metadata.xml             |    0
 tooling/maven/pom.xml                              |   19 +-
 tooling/meta-annotations/pom.xml                   |   53 +
 tooling/pom.xml                                    |    1 -
 tooling/spi-annotations/pom.xml                    |   53 +
 56 files changed, 8172 insertions(+), 220 deletions(-)