You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/09 15:19:37 UTC
[camel] branch master updated (f712653 -> 0c1f770)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f712653 Merge pull request #3394 from tdiesler/CAMEL-14277
add 1879c5e CAMEL-14276: Move camel-core-osgi-activator to components
add d08e3af CAMEL-14274: camel-crypto-cms - Deprecate this component as its hard to maintain
add f198e90 Revert "CAMEL-14268: Upgrade to smallrye-config 1.5. Use the new groupId name"
add 4d288b9 Revert "CAMEL-14268: Upgrade to smallrye-config 1.5"
add 8b019f6 CAMEL-14276: Move camel-core-osgi-activator to components
add 0c1f770 CAMEL-14276: Move camel-core-osgi-activator to components
No new revisions were added by this update.
Summary of changes:
apache-camel/pom.xml | 9 +--
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
bom/camel-bom/pom.xml | 5 --
.../src/main/docs/crypto-cms-component.adoc | 2 +
.../src/main/docs/jcache-component.adoc | 5 +-
components/camel-microprofile-config/pom.xml | 4 +-
.../CamelMicroProfilePropertiesSourceTest.java | 12 +---
.../pom.xml | 38 +++++------
.../src/main/docs/camel-osgi-activator.adoc | 76 ++++++++++-----------
.../camel/osgi/activator/CamelRoutesActivator.java | 14 ++--
components/pom.xml | 1 +
core/camel-core-osgi-activator/pom.xml | 77 ----------------------
.../src/assembly/test-bundles.xml | 37 -----------
core/pom.xml | 1 -
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/camel-osgi-activator.adoc | 77 +++++++++++-----------
.../modules/ROOT/pages/crypto-cms-component.adoc | 2 +
docs/components/modules/ROOT/pages/index.adoc | 4 +-
.../modules/ROOT/pages/jcache-component.adoc | 10 +--
.../modules/ROOT/pages/quartz-component.adoc | 10 +--
parent/pom.xml | 12 ++--
.../camel-spring-boot-dependencies/pom.xml | 5 --
tests/camel-itest-karaf/pom.xml | 5 ++
.../CamelOsgiActivatorTest.java} | 32 +++------
.../karaf/{main => activator}/PaxExamOptions.java | 2 +-
.../maven/packaging/SpringBootStarterMojo.java | 2 +-
26 files changed, 157 insertions(+), 288 deletions(-)
copy components/{camel-eventadmin => camel-osgi-activator}/pom.xml (69%)
copy core/camel-core-osgi-activator/src/main/docs/camel-core-osgi-activator.adoc => components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc (76%)
rename core/camel-core-osgi-activator/src/main/java/org/apache/camel/core/osgi/main/internal/Activator.java => components/camel-osgi-activator/src/main/java/org/apache/camel/osgi/activator/CamelRoutesActivator.java (89%)
delete mode 100644 core/camel-core-osgi-activator/pom.xml
delete mode 100644 core/camel-core-osgi-activator/src/assembly/test-bundles.xml
rename core/camel-core-osgi-activator/src/main/docs/camel-core-osgi-activator.adoc => docs/components/modules/ROOT/pages/camel-osgi-activator.adoc (72%)
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{main/BundleIT.java => activator/CamelOsgiActivatorTest.java} (74%)
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{main => activator}/PaxExamOptions.java (98%)