Repository: camel Updated Branches: refs/heads/jdk8-lambdas 55c405583 -> 385ecf58f
CAMEL-9764: Build - Adapt camel-blueprint, camel-cxf and camel-spring builds. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a3ad7a9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a3ad7a9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a3ad7a9 Branch: refs/heads/jdk8-lambdas Commit: 3a3ad7a9ef0d9f0b012120116c949e1067a58680 Parents: 55c4055 Author: Raúl Kripalani <ra...@apache.org> Authored: Wed Mar 30 17:53:05 2016 +0100 Committer: Raúl Kripalani <ra...@apache.org> Committed: Wed Mar 30 17:53:05 2016 +0100 ---------------------------------------------------------------------- components/camel-blueprint/pom.xml | 54 ++++++++++++++++++++++++++++++--- components/camel-cxf/pom.xml | 1 + components/camel-spring/pom.xml | 52 ++++++++++++++++++++++++++++--- parent/pom.xml | 2 +- 4 files changed, 100 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index fe9b62b..b5f7a83 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -33,6 +33,8 @@ <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.aries*;version="[1.0,2)", @@ -43,10 +45,10 @@ 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> + <camel.osgi.private.pkg> + org.apache.camel.core.osgi*, + org.apache.camel.core.xml* + </camel.osgi.private.pkg> </properties> <dependencies> @@ -120,6 +122,39 @@ </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>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> + <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> @@ -165,6 +200,17 @@ </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> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + </execution> + </executions> + </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 08ff58e..55622d3 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -40,6 +40,7 @@ !org.apache.camel.component.cxf.jaxrs, !org.apache.camel.component.cxf.spring, !org.apache.camel.component.cxf.util, + !org.apache.camel.blueprint, javax.activation*;version="[0.0,2)", javax.annotation*;version="[0.0,2)", javax.jws*;version="[0.0,3)", http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index 9e9ace5..5b79d0e 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -37,6 +37,8 @@ !org.apache.camel.component, !org.apache.camel.component.event, !org.apache.camel.language.spel, + !org.apache.camel.core.osgi*, + !org.apache.camel.core.xml*, org.apache.camel.*;${camel.osgi.import.strict.version}, org.springframework.osgi.*;version="[1.2,2)", org.springframework*;version="${spring-dm-version-range}", @@ -51,10 +53,6 @@ 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> - <camel.osgi.private.pkg> - org.apache.camel.core.osgi*, - org.apache.camel.core.xml* - </camel.osgi.private.pkg> <camel.osgi.export.service> org.apache.camel.spi.ComponentResolver;component=spring-event, org.apache.camel.spi.LanguageResolver;language=spel @@ -240,6 +238,52 @@ <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>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> + <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> + + <!-- 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> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b45b804..76501d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3384,7 +3384,7 @@ </execution> <execution> <id>bundle-manifest</id> - <phase>process-classes</phase> + <phase>prepare-package</phase> <goals> <goal>manifest</goal> </goals>
