This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e65d069 [CAMEL-13129] Move osgi out of camel-core
e65d069 is described below
commit e65d06954105e0b74b49735dc892739e1b10cfb1
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jan 31 10:12:38 2019 +0100
[CAMEL-13129] Move osgi out of camel-core
---
camel-core/pom.xml | 7 --
components/camel-blueprint/pom.xml | 78 ----------------------
components/camel-core-osgi/pom.xml | 7 ++
.../apache/camel/core/osgi/impl}/Activator.java | 2 +-
.../org/apache/camel/core/osgi/impl}/package.html | 0
components/camel-spring/pom.xml | 62 -----------------
.../karaf/features/src/main/resources/features.xml | 5 +-
7 files changed, 11 insertions(+), 150 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 1ed38f4..f8c5416 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -63,13 +63,6 @@
org.apache.camel.pollconsumer.quartz2;${camel.osgi.import.strict.version},
net.sf.saxon
</camel.osgi.dynamic>
- <camel.osgi.provide.capability>
- osgi.extender; osgi.extender="org.apache.camel";
uses:="org.apache.camel.impl.osgi";
- version:Version="$(version;==;${camel.osgi.version.clean})"
- </camel.osgi.provide.capability>
- <camel.osgi.activator>
- org.apache.camel.impl.osgi.Activator
- </camel.osgi.activator>
<!-- do not skip any tests by default -->
<platform.skip.tests/>
</properties>
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 1df6410..d834ebb 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -36,27 +36,6 @@
<!-- use by camel-catalog -->
<firstVersion>2.4.0</firstVersion>
<label>java,osgi</label>
-
- <camel.osgi.import>
- !org.apache.camel.blueprint.*,
- !org.apache.camel.util.blueprint.*,
- !org.apache.camel.core.osgi.*,
- !org.apache.camel.core.xml.*,
- org.apache.camel.*;${camel.osgi.import.strict.version},
- org.osgi.service.event*;resolution:=optional,
- org.apache.karaf.bundle.core;version="[4,5)";resolution:=optional,
- org.apache.aries*;version="[1.0,2)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export>
- org.apache.camel.blueprint*;${camel.osgi.version},
- org.apache.camel.util.blueprint*;${camel.osgi.version}
- </camel.osgi.export>
- <camel.osgi.private.pkg>
- org.apache.camel.core.osgi*,
- org.apache.camel.core.xml*
- </camel.osgi.private.pkg>
</properties>
<dependencies>
@@ -148,63 +127,6 @@
</resources>
<plugins>
- <!-- Inline the contents of camel-core-osgi and camel-core-xml into this
bundle. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-osgi</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- add the sources from camel-core-osgi and camel-core-xml as source
code in the camel-blueprint-sources.jar -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${project.build.directory}/schema/camel-blueprint.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- enrich the schemas with documentation -->
<plugin>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-core-osgi/pom.xml
b/components/camel-core-osgi/pom.xml
index 7c263e5..5bed2b8 100644
--- a/components/camel-core-osgi/pom.xml
+++ b/components/camel-core-osgi/pom.xml
@@ -36,6 +36,13 @@
org.osgi.service.event;resolution:=optional,
*
</camel.osgi.import>
+ <camel.osgi.provide.capability>
+ osgi.extender; osgi.extender="org.apache.camel";
uses:="org.apache.camel.core.osgi.impl";
+ version:Version="$(version;==;${camel.osgi.version.clean})"
+ </camel.osgi.provide.capability>
+ <camel.osgi.activator>
+ org.apache.camel.core.osgi.impl.Activator
+ </camel.osgi.activator>
</properties>
<dependencies>
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
similarity index 99%
rename from camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
rename to
components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 27b0f45..ce309ff 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.osgi;
+package org.apache.camel.core.osgi.impl;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/package.html
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/osgi/package.html
rename to
components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/package.html
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 8780171..e0a0097 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -31,40 +31,6 @@
<description>Camel Spring with XML DSL</description>
<packaging>jar</packaging>
- <properties>
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.spring.*,
- !org.apache.camel.component,
- !org.apache.camel.component.event,
- !org.apache.camel.language.spel,
- !org.apache.camel.core.xml*,
- org.apache.camel.model;${camel.osgi.import.strict.version},
- org.apache.camel.model.cloud;${camel.osgi.import.strict.version},
- org.apache.camel.model.config;${camel.osgi.import.strict.version},
- org.apache.camel.model.dataformat;${camel.osgi.import.strict.version},
- org.apache.camel.model.language;${camel.osgi.import.strict.version},
- org.apache.camel.model.loadbalancer;${camel.osgi.import.strict.version},
- org.apache.camel.model.rest;${camel.osgi.import.strict.version},
- org.apache.camel.model.transformer;${camel.osgi.import.strict.version},
- org.apache.camel.model.validator;${camel.osgi.import.strict.version},
- org.apache.camel.*;${camel.osgi.import.strict.version},
- org.springframework*;version="${spring-version-range}",
- org.osgi.service.event;resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export>
- org.apache.camel.spring.*;${camel.osgi.version},
- org.apache.camel.util.spring.*;${camel.osgi.version},
-
org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
-
org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
- </camel.osgi.export>
- <!-- do not skip any tests by default -->
- <platform.skip.tests/>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -77,7 +43,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-xml</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -227,33 +192,6 @@
<plugins>
- <!-- Inline the contents of camel-core-xml into this jar. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- Push the execution order of the maven-bundle-plugin further to the
end. That's why we add it here again. -->
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 05d7dab..b0c71c1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -50,6 +50,7 @@
<bundle>mvn:org.apache.camel/camel-base/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-management-impl/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<!-- core components -->
<bundle>mvn:org.apache.camel/camel-browse/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-controlbus/${project.version}</bundle>
@@ -86,6 +87,7 @@
</feature>
<feature name='camel-blueprint' version='${project.version}'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-core-xml/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle>
<feature>aries-blueprint</feature>
</feature>
@@ -94,6 +96,7 @@
<feature version='${spring-version-range}'>spring</feature>
<feature version='${spring-version-range}'>spring-tx</feature>
<feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-core-xml/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle>
</feature>
@@ -340,7 +343,6 @@
<feature version='${project.version}'>camel-core</feature>
<feature version='${pax-cdi-version}'>pax-cdi</feature>
<feature>eventadmin</feature>
- <bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cdi/${project.version}</bundle>
</feature>
<feature name='camel-chunk' version='${project.version}' start-level='50'>
@@ -1263,7 +1265,6 @@
<feature name='camel-kura' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>scr</feature>
- <bundle
dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-kura/${project.version}</bundle>
</feature>
<feature name='camel-ldap' version='${project.version}' start-level='50'>
