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/24 19:52:20 UTC
[camel-karaf] branch master updated: CAMEL-15740: camel-core -
Modularize into core and reifier modules
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 340b8c0 CAMEL-15740: camel-core - Modularize into core and reifier modules
340b8c0 is described below
commit 340b8c054acd70ac087056b2cd3b420d5a783eb5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Oct 24 20:41:31 2020 +0200
CAMEL-15740: camel-core - Modularize into core and reifier modules
---
components/camel-blueprint/pom.xml | 6 +++---
components/camel-osgi-activator/src/assembly/test-bundles.xml | 2 ++
.../org/apache/camel/component/osgi/activator/PaxExamOptions.java | 2 ++
platforms/karaf/features/src/main/resources/features.xml | 2 ++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 2a196b4..6d006d2 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -384,13 +384,13 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-engine</artifactId>
+ <artifactId>camel-core-model</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
<overWrite>true</overWrite>
<excludes>**/*nDefinitionConfigurer.java</excludes>
- <outputDirectory>target/sources/camel-core-engine</outputDirectory>
+ <outputDirectory>target/sources/camel-core-model</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.camel</groupId>
@@ -461,7 +461,7 @@
<include name="org/apache/camel/ShutdownRunningTask.java"/>
<include name="org/apache/camel/WaitForTaskToComplete.java"/>
</fileset>
- <fileset dir="${project.build.directory}/sources/camel-core-engine">
+ <fileset dir="${project.build.directory}/sources/camel-core-model">
<include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/package-info.java"/>
</fileset>
diff --git a/components/camel-osgi-activator/src/assembly/test-bundles.xml b/components/camel-osgi-activator/src/assembly/test-bundles.xml
index 8f1bf78..d0a7862 100644
--- a/components/camel-osgi-activator/src/assembly/test-bundles.xml
+++ b/components/camel-osgi-activator/src/assembly/test-bundles.xml
@@ -32,6 +32,8 @@
<includes>
<include>org.apache.camel:camel-api</include>
<include>org.apache.camel:camel-base</include>
+ <include>org.apache.camel:camel-core-reifier</include>
+ <include>org.apache.camel:camel-core-model</include>
<include>org.apache.camel:camel-core-engine</include>
<include>org.apache.camel:camel-core-languages</include>
<include>org.apache.camel:camel-management-api</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 38f3a8e..7abaaef 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
@@ -62,6 +62,8 @@ public enum PaxExamOptions {
)
),
CAMEL_CORE_OSGI(
+ createStreamBundleOption("camel-core-model.jar"),
+ createStreamBundleOption("camel-core-reifier.jar"),
createStreamBundleOption("camel-core-engine.jar"),
createStreamBundleOption("camel-core-languages.jar"),
createStreamBundleOption("camel-api.jar"),
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 330a543..478f40c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -50,6 +50,8 @@
<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-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>
<bundle>mvn:org.apache.camel/camel-core-engine/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-languages/${project.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-core-osgi/${project.version}</bundle>