You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2016/03/29 01:03:04 UTC
camel git commit: CAMEL-9764: Build - Ability to suppress OSGi bundle
packaging through build property. Fix camel-core-xml not having OSGi exports.
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas e5f2b28e2 -> 55c405583
CAMEL-9764: Build - Ability to suppress OSGi bundle packaging through build property.
Fix camel-core-xml not having OSGi exports.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55c40558
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55c40558
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55c40558
Branch: refs/heads/jdk8-lambdas
Commit: 55c405583c5d8f58ac155f8aff53efd73111eb06
Parents: e5f2b28
Author: Raúl Kripalani <ra...@apache.org>
Authored: Tue Mar 29 00:02:42 2016 +0100
Committer: Raúl Kripalani <ra...@apache.org>
Committed: Tue Mar 29 00:02:42 2016 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 7 -
components/camel-core-xml/pom.xml | 6 +
components/camel-grape/pom.xml | 1 +
components/camel-spring-boot-starter/pom.xml | 4 +
components/camel-spring-boot/pom.xml | 4 +
components/pom.xml | 5 -
examples/camel-example-cdi-metrics/pom.xml | 4 +
examples/camel-example-cdi-test/pom.xml | 4 +
examples/camel-example-cdi/pom.xml | 4 +
examples/camel-example-console/pom.xml | 4 +
examples/camel-example-ftp/pom.xml | 4 +
examples/camel-example-guice-jms/pom.xml | 4 +
examples/camel-example-jms-file/pom.xml | 4 +
examples/camel-example-loadbalancing/pom.xml | 4 +
examples/camel-example-splunk/pom.xml | 4 +
.../camel-example-spring-boot-metrics/pom.xml | 1 +
.../camel-example-spring-boot-starter/pom.xml | 1 +
examples/camel-example-swagger-cdi/pom.xml | 4 +
.../camel-example-twitter-websocket/pom.xml | 4 +
.../camel-example-widget-gadget-cdi/pom.xml | 4 +
.../camel-example-widget-gadget-java/pom.xml | 4 +
.../camel-example-widget-gadget-xml/pom.xml | 4 +
examples/pom.xml | 6 -
parent/pom.xml | 136 +++++++++++--------
platforms/commands/commands-spring-boot/pom.xml | 4 +
platforms/pom.xml | 10 --
tests/pom.xml | 14 +-
tooling/apt/pom.xml | 7 -
tooling/camel-manual/pom.xml | 6 -
tooling/maven/pom.xml | 49 +++----
tooling/pom.xml | 4 +
tooling/spi-annotations/pom.xml | 10 --
32 files changed, 188 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 188f6f0..92abf73 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -213,13 +213,6 @@
</plugins>
</pluginManagement>
<plugins>
-
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
<!-- shade concurrent hashmap for faster Camel and spi-annotations as needed by everybody -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-core-xml/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml
index 7ac2fc2..a7da334 100644
--- a/components/camel-core-xml/pom.xml
+++ b/components/camel-core-xml/pom.xml
@@ -28,6 +28,12 @@
<name>Camel :: Core XML</name>
<description>Camel Core XML support</description>
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.core.xml.*
+ </camel.osgi.export.pkg>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-grape/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 25b66fb..9886c71 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -33,6 +33,7 @@
<groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
<groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
<plexus-compiler-api.version>2.7</plexus-compiler-api.version>
+ <camel.osgi.skip>true</camel.osgi.skip>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml
index 2c71e43..9640e3e 100644
--- a/components/camel-spring-boot-starter/pom.xml
+++ b/components/camel-spring-boot-starter/pom.xml
@@ -29,6 +29,10 @@
<name>Camel :: Spring Boot :: Starter</name>
<description>Spring Boot Apache Camel Starter</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/camel-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 84e1055..ac500f8 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -29,6 +29,10 @@
<artifactId>camel-spring-boot</artifactId>
<description>Camel :: Spring Boot</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 007a782..1e86994 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -269,11 +269,6 @@
<build>
<plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-cdi-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index f1fd5d0..a6c2998 100755
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -31,6 +31,10 @@
<description>Dropwizard Metrics CDI example</description>
<packaging>jar</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- CDI API -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-cdi-test/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 0d060fc..53b183c 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -28,6 +28,10 @@
<name>Camel :: Example :: CDI :: Testing</name>
<description>An example illustrating Camel CDI testing features</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- CDI API -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml
index 8ada908..bc35859 100644
--- a/examples/camel-example-cdi/pom.xml
+++ b/examples/camel-example-cdi/pom.xml
@@ -28,6 +28,10 @@
<name>Camel :: Example :: CDI</name>
<description>An example showing how to work with Camel and CDI for dependency injection</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- CDI API -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-console/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml
index 00f09ec..47d6189 100644
--- a/examples/camel-example-console/pom.xml
+++ b/examples/camel-example-console/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Example :: Console</name>
<description>An example that reads input from the console</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-ftp/pom.xml b/examples/camel-example-ftp/pom.xml
index eaf1474..bbc8490 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Example :: FTP</name>
<description>An example for showing Camel FTP integration</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-guice-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-guice-jms/pom.xml b/examples/camel-example-guice-jms/pom.xml
index 763b5bf..f82665d 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -28,6 +28,10 @@
<name>Camel :: Example :: Guice :: JMS</name>
<description>An example showing how to work with Camel, Guice and JMS</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-jms-file/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-jms-file/pom.xml b/examples/camel-example-jms-file/pom.xml
index 1586586..bfd561e 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -29,6 +29,10 @@
<name>Camel :: Example :: JMS-File</name>
<description>An example that persists messages from JMS to files</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- Camel dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-loadbalancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-loadbalancing/pom.xml b/examples/camel-example-loadbalancing/pom.xml
index f3884ad..8e14cd3 100644
--- a/examples/camel-example-loadbalancing/pom.xml
+++ b/examples/camel-example-loadbalancing/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Example :: Load Balancing</name>
<description>An example that demonstrate load balancing messaging with mina servers (TCP/IP)</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-splunk/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml
index a8764e7..cd2ab3a 100644
--- a/examples/camel-example-splunk/pom.xml
+++ b/examples/camel-example-splunk/pom.xml
@@ -29,6 +29,10 @@
<name>Camel :: Example :: Splunk</name>
<description>An example using Splunk</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-spring-boot-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-metrics/pom.xml b/examples/camel-example-spring-boot-metrics/pom.xml
index 6ee0587..763d37d 100644
--- a/examples/camel-example-spring-boot-metrics/pom.xml
+++ b/examples/camel-example-spring-boot-metrics/pom.xml
@@ -31,6 +31,7 @@
<properties>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
+ <camel.osgi.skip>true</camel.osgi.skip>
</properties>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-starter/pom.xml b/examples/camel-example-spring-boot-starter/pom.xml
index 0601c5f..1abd5ff 100644
--- a/examples/camel-example-spring-boot-starter/pom.xml
+++ b/examples/camel-example-spring-boot-starter/pom.xml
@@ -31,6 +31,7 @@
<properties>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
+ <camel.osgi.skip>true</camel.osgi.skip>
</properties>
<!-- import Spring-Boot and Camel BOM -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-swagger-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-cdi/pom.xml b/examples/camel-example-swagger-cdi/pom.xml
index df69d51..c271881 100644
--- a/examples/camel-example-swagger-cdi/pom.xml
+++ b/examples/camel-example-swagger-cdi/pom.xml
@@ -28,6 +28,10 @@
<name>Camel :: Example :: Swagger CDI</name>
<description>An example using REST DSL and Swagger Java with CDI</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- CDI API -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-twitter-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-websocket/pom.xml b/examples/camel-example-twitter-websocket/pom.xml
index 1bbe6dd..7ec13fc 100644
--- a/examples/camel-example-twitter-websocket/pom.xml
+++ b/examples/camel-example-twitter-websocket/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Example :: Twitter WebSocket</name>
<description>An example that pushes new tweets to a web page using web-socket</description>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-widget-gadget-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-cdi/pom.xml b/examples/camel-example-widget-gadget-cdi/pom.xml
index 359a809..379fd15 100755
--- a/examples/camel-example-widget-gadget-cdi/pom.xml
+++ b/examples/camel-example-widget-gadget-cdi/pom.xml
@@ -31,6 +31,10 @@
<description>The widget and gadget example from the EIP book</description>
<packaging>jar</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- CDI API -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-widget-gadget-java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-java/pom.xml b/examples/camel-example-widget-gadget-java/pom.xml
index cefe464..da4ab93 100755
--- a/examples/camel-example-widget-gadget-java/pom.xml
+++ b/examples/camel-example-widget-gadget-java/pom.xml
@@ -31,6 +31,10 @@
<description>The widget and gadget example from the EIP book</description>
<packaging>jar</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- camel -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/camel-example-widget-gadget-xml/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-xml/pom.xml b/examples/camel-example-widget-gadget-xml/pom.xml
index 397bea1..14e6c5c 100755
--- a/examples/camel-example-widget-gadget-xml/pom.xml
+++ b/examples/camel-example-widget-gadget-xml/pom.xml
@@ -31,6 +31,10 @@
<description>The widget and gadget example from the EIP book</description>
<packaging>jar</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<!-- camel -->
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 027b03f..d45926a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -112,12 +112,6 @@
</resource>
</resources>
<plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index daddc27..b45b804 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -382,7 +382,7 @@
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
<maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version>
<!-- Staying in 2.x because 3.x causes trouble. -->
- <maven-bundle-plugin-version>2.5.4</maven-bundle-plugin-version>
+ <maven-bundle-plugin-version>3.0.1</maven-bundle-plugin-version>
<maven-checkstyle-plugin-version>2.16</maven-checkstyle-plugin-version>
<!-- AtomicException.java causes a problem with Checksyle > 6.6 due to
https://github.com/checkstyle/checkstyle/issues/1903
@@ -2826,16 +2826,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin-version}</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin-version}</version>
@@ -3236,54 +3226,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin-version}</version>
- <extensions>false</extensions>
- <configuration>
- <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
- <instructions>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
- <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <Import-Service>${camel.osgi.import.service}</Import-Service>
- <Export-Service>${camel.osgi.export.service}</Export-Service>
- <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
- <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
- <Implementation-Title>Apache Camel</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
- <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
- <_failok>${camel.osgi.failok}</_failok>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>versions</id>
- <phase>validate</phase>
- <goals>
- <goal>cleanVersions</goal>
- </goals>
- <configuration>
- <versions>
- <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
- </versions>
- </configuration>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
@@ -3378,6 +3320,82 @@
<profiles>
<profile>
+ <id>osgi</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!camel.osgi.skip</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-version}</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin-version}</version>
+ <extensions>false</extensions>
+ <configuration>
+ <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
+ <instructions>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
+ <Export-Package>${camel.osgi.export}</Export-Package>
+ <Import-Package>${camel.osgi.import}</Import-Package>
+ <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
+ <Private-Package>${camel.osgi.private.pkg}</Private-Package>
+ <Import-Service>${camel.osgi.import.service}</Import-Service>
+ <Export-Service>${camel.osgi.export.service}</Export-Service>
+ <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
+ <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
+ <Implementation-Title>Apache Camel</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
+ <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
+ <_failok>${camel.osgi.failok}</_failok>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>versions</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>nochecks</id>
<activation>
<activeByDefault>true</activeByDefault>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/platforms/commands/commands-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-spring-boot/pom.xml b/platforms/commands/commands-spring-boot/pom.xml
index e3c7193..222c9b3 100755
--- a/platforms/commands/commands-spring-boot/pom.xml
+++ b/platforms/commands/commands-spring-boot/pom.xml
@@ -30,6 +30,10 @@
<description>Camel Commands using Spring Boot Shell</description>
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 5f69c84..2665dd6 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -38,14 +38,4 @@
<module>karaf</module>
</modules>
- <build>
- <plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index cef782f..eb83697 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -31,6 +31,10 @@
<description>Camel Integration Tests</description>
<packaging>pom</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<modules>
<module>test-bundles</module>
<module>camel-itest-standalone</module>
@@ -42,16 +46,6 @@
<module>camel-typeconverterscan-test</module>
</modules>
- <build>
- <plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<!-- includes these modules when doing the release -->
<profile>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tooling/apt/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 68a9996..33803c7 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -26,7 +26,6 @@
<version>2.18-SNAPSHOT</version>
</parent>
-
<artifactId>apt</artifactId>
<name>Camel :: Annotation Processor</name>
<description>Processes Camel endpoint source code</description>
@@ -62,12 +61,6 @@
<build>
<plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tooling/camel-manual/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/camel-manual/pom.xml b/tooling/camel-manual/pom.xml
index f567db1..47e5650 100644
--- a/tooling/camel-manual/pom.xml
+++ b/tooling/camel-manual/pom.xml
@@ -84,12 +84,6 @@
</plugins>
</pluginManagement>
<plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tooling/maven/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 28b7d58..6408cca 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -37,30 +37,33 @@
<module>camel-api-component-maven-plugin</module>
</modules>
+ <!-- Apply to children. -->
<build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive combine.self="override">
- <manifestFile/>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive combine.self="override">
+ <manifestFile/>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tooling/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/pom.xml b/tooling/pom.xml
index f070b77..d8d4f01 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -31,6 +31,10 @@
<description>Camel Tooling</description>
<packaging>pom</packaging>
+ <properties>
+ <camel.osgi.skip>true</camel.osgi.skip>
+ </properties>
+
<modules>
<module>parent</module>
<module>spi-annotations</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/55c40558/tooling/spi-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index cfaf05a..6baeb6c 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -37,14 +37,4 @@
<dependencies>
</dependencies>
- <build>
- <plugins>
- <!-- Invoke the maven-jar-plugin from the parent POM. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>