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 2020/10/26 14:35:19 UTC

[camel-karaf] branch master updated: CAMEL-15758: camel-core - Modularize base into base-engine

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b4fb451  CAMEL-15758: camel-core - Modularize base into base-engine
b4fb451 is described below

commit b4fb451b36259ba453170c1eba1b50f9dde2f031
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 26 15:35:04 2020 +0100

    CAMEL-15758: camel-core - Modularize base into base-engine
---
 components/camel-osgi-activator/src/assembly/test-bundles.xml            | 1 +
 .../java/org/apache/camel/component/osgi/activator/PaxExamOptions.java   | 1 +
 platforms/karaf/features/src/main/resources/features.xml                 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/components/camel-osgi-activator/src/assembly/test-bundles.xml b/components/camel-osgi-activator/src/assembly/test-bundles.xml
index 837996a..79dc20c 100644
--- a/components/camel-osgi-activator/src/assembly/test-bundles.xml
+++ b/components/camel-osgi-activator/src/assembly/test-bundles.xml
@@ -32,6 +32,7 @@
       <includes>
         <include>org.apache.camel:camel-api</include>
         <include>org.apache.camel:camel-base</include>
+        <include>org.apache.camel:camel-base-engine</include>
         <include>org.apache.camel:camel-core-reifier</include>
         <include>org.apache.camel:camel-core-model</include>
         <include>org.apache.camel:camel-core-processor</include>
diff --git a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
index b820267..c45f75a 100644
--- a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
+++ b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
@@ -69,6 +69,7 @@ public enum PaxExamOptions {
                 createStreamBundleOption("camel-core-languages.jar"),
                 createStreamBundleOption("camel-api.jar"),
                 createStreamBundleOption("camel-base.jar"),
+                createStreamBundleOption("camel-base-engine.jar"),
                 createStreamBundleOption("camel-management-api.jar"),
                 createStreamBundleOption("camel-support.jar"),
                 createStreamBundleOption("camel-util.jar"),
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index bce4c1b..ab8d8df 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -49,6 +49,7 @@
     <bundle>mvn:org.apache.camel/camel-util-json/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-support/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-base/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-base-engine/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-management/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core-model/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core-reifier/${project.version}</bundle>