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/09/25 06:55:02 UTC
[camel] 02/08: CAMEL-13949: Better splitup between camel-core and
camel-core-engine.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13949
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24bbbaecfb80dfde8d9274f11374a768bff5ae6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 06:04:41 2019 +0200
CAMEL-13949: Better splitup between camel-core and camel-core-engine.
---
components/camel-blueprint/pom.xml | 2 +-
components/camel-spring/pom.xml | 4 ++--
core/camel-cloud/pom.xml | 4 ++++
core/camel-core-engine/pom.xml | 7 +++++++
core/camel-core-osgi/pom.xml | 5 +++--
core/camel-core-xml/pom.xml | 4 ----
core/camel-core/pom.xml | 1 -
7 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 1265978..2a3a65d 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -382,7 +382,7 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core/src/main/java">
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
<include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 12d7c68..25d3eb1 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -421,7 +421,7 @@
<include name="org/apache/camel/core/xml/*.java"/>
<include name="org/apache/camel/core/xml/util/**/*.java"/>
</fileset>
- <fileset dir="${basedir}/../../core/camel-core/src/main/java">
+ <fileset dir="${basedir}/../../core/camel-core-engine/src/main/java">
<include name="org/apache/camel/model/**/*.java"/>
<include name="org/apache/camel/ExchangePattern.java"/>
<include name="org/apache/camel/LoggingLevel.java"/>
@@ -612,7 +612,7 @@
<link>http://download.oracle.com/javase/7/docs/api/</link>
<link>http://download.oracle.com/javaee/7/api/</link>
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
- <link>http://camel.apache.org/maven/current/camel-core/apidocs/</link>
+ <link>http://camel.apache.org/maven/current/camel-core-engine/apidocs/</link>
</links>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index 608e97d..a69dd56 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -56,6 +56,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-lrucache</artifactId>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index d29527c..0b07d17 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -89,6 +89,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
+
+ <!-- uses the properties component -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-properties</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index 6f134de..d4fe325 100644
--- a/core/camel-core-osgi/pom.xml
+++ b/core/camel-core-osgi/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: Core OSGi</name>
- <description>Using Camel with OSGi</description>
+ <description>Camel Core OSGi support</description>
<properties>
<camel.osgi.import>
@@ -49,11 +49,12 @@
<dependencies>
- <!-- core required: org.apache.camel.impl, org.apache.camel.impl.converter -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
+
+ <!-- osgi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index 3ec9765..40daddd 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -36,10 +36,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 5a2eafd..3fc9bcc 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -36,7 +36,6 @@
<dependencies>
- <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>