You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/20 10:25:55 UTC
[camel] branch CAMEL-13002 created (now f2458c4)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch CAMEL-13002
in repository https://gitbox.apache.org/repos/asf/camel.git.
at f2458c4 CAMEL-13002 - Fix Karaf features - beginning
This branch includes the following new commits:
new f2458c4 CAMEL-13002 - Fix Karaf features - beginning
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-13002 - Fix Karaf features - beginning
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-13002
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f2458c46c45f0f4820d96a3acc58b9aad56ff8a4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 19 15:36:58 2018 +0100
CAMEL-13002 - Fix Karaf features - beginning
---
camel-api/pom.xml | 11 +++++++++++
camel-core/pom.xml | 17 +++++++++++++++--
camel-management-api/pom.xml | 10 ++++++++++
camel-management-impl/pom.xml | 10 ++++++++++
camel-util/pom.xml | 10 ++++++++++
.../karaf/features/src/main/resources/features.xml | 4 ++++
.../camel-spring-boot-dependencies/pom.xml | 10 +++++-----
7 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/camel-api/pom.xml b/camel-api/pom.xml
index 6875740..2f2af50 100644
--- a/camel-api/pom.xml
+++ b/camel-api/pom.xml
@@ -34,6 +34,17 @@
<name>Camel :: API</name>
<description>The Camel API</description>
+ <properties>
+<camel.osgi.export.pkg>
+ org.apache.camel.*;-noimport:=true
+ !org.apache.camel.support.*
+ </camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.*,
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 6b08aaf..f98f21c 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -37,14 +37,27 @@
<properties>
<camel.osgi.export.pkg>
!org.apache.camel.tools.*,
- org.apache.camel.*;-noimport:=true
+ org.apache.camel.builder.*;-noimport:=true,
+ org.apache.camel.cloud.*;-noimport:=true,
+ org.apache.camel.component.*;-noimport:=true,
+ org.apache.camel.converter.*;-noimport:=true,
+ org.apache.camel.impl.*;-noimport:=true,
+ org.apache.camel.language.*;-noimport:=true,
+ org.apache.camel.main.*;-noimport:=true,
+ org.apache.camel.model.*;-noimport:=true,
+ org.apache.camel.processor.*;-noimport:=true,
+ org.apache.camel.reifier.*;-noimport:=true,
+ org.apache.camel.runtimecatalog.*;-noimport:=true,
+ org.apache.camel.saga.*;-noimport:=true,
+ org.apache.camel.support.*;-noimport:=true,
+ org.apache.camel.throttling.*;-noimport:=true
</camel.osgi.export.pkg>
<camel.osgi.import>
org.apache.camel.tools.*;resolution:=optional,
- !org.apache.camel.*,
!com.github.benmanes.caffeine.cache,
!org.json.simple,
${camel.osgi.import.defaults},
+ org.apache.camel.*,
org.springframework.transaction;resolution:=optional,
org.apache.camel.spring.spi;resolution:=optional,
org.apache.xalan.xsltc.trax;resolution:=optional,
diff --git a/camel-management-api/pom.xml b/camel-management-api/pom.xml
index 67f61c3..71a6487 100644
--- a/camel-management-api/pom.xml
+++ b/camel-management-api/pom.xml
@@ -34,6 +34,16 @@
<name>Camel :: Management API</name>
<description>The Camel Management API</description>
+ <properties>
+<camel.osgi.export.pkg>
+ org.apache.camel.*;-noimport:=true
+ </camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.*,
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/camel-management-impl/pom.xml b/camel-management-impl/pom.xml
index 2881e23..25f345e 100644
--- a/camel-management-impl/pom.xml
+++ b/camel-management-impl/pom.xml
@@ -34,6 +34,16 @@
<name>Camel :: Management Implementation</name>
<description>The Camel Management Implementation</description>
+ <properties>
+<camel.osgi.export.pkg>
+ org.apache.camel.*;-noimport:=true
+ </camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.*,
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/camel-util/pom.xml b/camel-util/pom.xml
index a05e56e..3db8228 100644
--- a/camel-util/pom.xml
+++ b/camel-util/pom.xml
@@ -34,6 +34,16 @@
<name>Camel :: Util</name>
<description>The Camel Utilities</description>
+ <properties>
+<camel.osgi.export.pkg>
+ org.apache.camel.*;-noimport:=true
+ </camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.*,
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<!-- required dependencies by camel-core -->
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c47ebeb..ec2c8ef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -41,6 +41,10 @@
<feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${servicemix-specs-version}'>xml-specs-api</feature>
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-api/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-management-api/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-management-impl/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-util/${project.version}</bundle>
<conditional>
<condition>shell</condition>
<bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 844e4b1..664b2c8 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>com.dropbox.core</groupId>
<artifactId>dropbox-core-sdk</artifactId>
- <version>3.0.10</version>
+ <version>3.0.11</version>
</dependency>
<dependency>
<groupId>com.github.dozermapper</groupId>
@@ -3382,22 +3382,22 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
- <version>2.0.12</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>2.0.12</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-debugger</artifactId>
- <version>2.0.12</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId>
- <version>2.0.12</version>
+ <version>2.0.13</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>