You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2022/12/08 12:57:59 UTC
[camel] 03/08: Remove OSGi support
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55e462f8c8cdc14cb4efafe7a8e1e5006ba99aaa
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 21:54:52 2022 +0100
Remove OSGi support
---
bom/pom.xml | 1 -
camel-dependencies/pom.xml | 25 -
catalog/camel-catalog-console/pom.xml | 4 -
catalog/camel-catalog-lucene/pom.xml | 4 -
catalog/pom.xml | 18 -
components/camel-amqp/pom.xml | 6 -
components/camel-asterisk/pom.xml | 3 -
components/camel-atmosphere-websocket/pom.xml | 13 -
components/camel-atom/pom.xml | 3 -
components/camel-attachments/pom.xml | 3 -
.../camel-azure/camel-azure-cosmosdb/pom.xml | 6 -
.../camel-azure/camel-azure-eventhubs/pom.xml | 6 -
.../camel-azure/camel-azure-servicebus/pom.xml | 6 -
components/camel-bonita/pom.xml | 3 -
components/camel-box/camel-box-api/pom.xml | 3 -
components/camel-braintree/pom.xml | 1 -
components/camel-caffeine-lrucache/pom.xml | 29 --
components/camel-cmis/pom.xml | 3 -
components/camel-cometd/pom.xml | 5 -
components/camel-cxf/camel-cxf-common/pom.xml | 32 --
components/camel-cxf/camel-cxf-rest/pom.xml | 35 --
components/camel-cxf/camel-cxf-soap/pom.xml | 35 --
.../camel-cxf/camel-cxf-spring-common/pom.xml | 32 --
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 36 --
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 35 --
.../camel-cxf/camel-cxf-spring-transport/pom.xml | 21 +-
components/camel-cxf/camel-cxf-transport/pom.xml | 20 +-
.../camel-debezium-maven-plugin/pom.xml | 17 -
components/camel-fhir/camel-fhir-component/pom.xml | 4 -
components/camel-flatpack/pom.xml | 3 -
components/camel-freemarker/pom.xml | 3 -
components/camel-ftp/pom.xml | 3 -
.../camel-google/camel-google-calendar/pom.xml | 1 -
components/camel-google/camel-google-drive/pom.xml | 1 -
components/camel-google/camel-google-mail/pom.xml | 1 -
.../camel-google/camel-google-pubsub/pom.xml | 1 -
.../camel-google/camel-google-sheets/pom.xml | 1 -
components/camel-gora/pom.xml | 4 -
components/camel-groovy/pom.xml | 11 -
components/camel-hazelcast/pom.xml | 3 -
components/camel-hdfs/pom.xml | 14 -
components/camel-hl7/pom.xml | 3 -
components/camel-http-common/pom.xml | 4 -
components/camel-http/pom.xml | 3 -
components/camel-ical/pom.xml | 5 -
components/camel-jackson-avro/pom.xml | 3 -
components/camel-jackson-protobuf/pom.xml | 3 -
components/camel-jackson/pom.xml | 3 -
components/camel-jacksonxml/pom.xml | 3 -
components/camel-jasypt/pom.xml | 9 -
components/camel-jaxb/pom.xml | 5 -
components/camel-jclouds/pom.xml | 3 -
components/camel-jetty-common/pom.xml | 4 -
components/camel-jetty/pom.xml | 5 -
components/camel-jms/pom.xml | 2 -
components/camel-jmx/pom.xml | 4 -
components/camel-jpa/pom.xml | 8 -
components/camel-jsch/pom.xml | 3 -
components/camel-jsonpath/pom.xml | 5 -
components/camel-kubernetes/pom.xml | 4 -
components/camel-leveldb/pom.xml | 8 -
components/camel-lucene/pom.xml | 3 -
components/camel-mail/pom.xml | 3 -
components/camel-milo/pom.xml | 4 -
components/camel-mina/pom.xml | 1 -
components/camel-mybatis/pom.xml | 3 -
components/camel-olingo2/camel-olingo2-api/pom.xml | 3 -
.../camel-olingo2/camel-olingo2-component/pom.xml | 1 -
components/camel-olingo4/camel-olingo4-api/pom.xml | 3 -
.../camel-olingo4/camel-olingo4-component/pom.xml | 1 -
components/camel-openapi-java/pom.xml | 4 -
components/camel-protobuf/pom.xml | 3 -
components/camel-quickfix/pom.xml | 4 -
components/camel-rest-openapi/pom.xml | 4 -
.../camel-salesforce-codegen/pom.xml | 17 -
.../camel-salesforce-component/pom.xml | 6 -
.../camel-salesforce-maven-plugin/pom.xml | 17 -
components/camel-saxon/pom.xml | 3 -
.../camel-servicenow-component/pom.xml | 3 -
.../camel-servicenow-maven-plugin/pom.xml | 17 -
components/camel-servlet/pom.xml | 4 -
components/camel-sjms/pom.xml | 4 -
components/camel-sjms2/pom.xml | 1 -
components/camel-soap/pom.xml | 5 -
components/camel-solr/pom.xml | 6 -
components/camel-splunk/pom.xml | 3 -
components/camel-spring-batch/pom.xml | 2 -
components/camel-spring-integration/pom.xml | 4 -
components/camel-spring-ldap/pom.xml | 4 -
components/camel-spring-security/pom.xml | 2 -
components/camel-spring-ws/pom.xml | 8 -
components/camel-spring-xml/pom.xml | 14 -
components/camel-stax/pom.xml | 4 -
components/camel-swagger-java/pom.xml | 3 -
components/camel-syslog/pom.xml | 4 -
components/camel-twilio/pom.xml | 1 -
components/camel-undertow/pom.xml | 3 -
.../camel-vertx-kafka-maven-plugin/pom.xml | 17 -
components/camel-websocket-jsr356/pom.xml | 6 -
components/camel-websocket/pom.xml | 7 -
components/camel-wordpress/pom.xml | 3 -
components/camel-xslt-saxon/pom.xml | 3 -
components/camel-xstream/pom.xml | 3 -
components/camel-zookeeper-master/pom.xml | 5 -
components/pom.xml | 58 ---
core/camel-api/pom.xml | 6 -
core/camel-core-engine/pom.xml | 26 --
core/camel-core-model/pom.xml | 14 -
core/camel-core-processor/pom.xml | 14 -
core/camel-core-reifier/pom.xml | 14 -
core/camel-core-xml/pom.xml | 4 -
core/camel-core/pom.xml | 21 -
core/camel-xml-jaxb/pom.xml | 13 -
core/pom.xml | 51 ---
dsl/camel-endpointdsl/pom.xml | 4 -
dsl/pom.xml | 49 --
init/camel-bundle-plugin/pom.xml | 82 ----
.../org/apache/camel/maven/bundle/CamelPlugin.java | 65 ---
.../apache/felix/bundleplugin/ManifestPlugin.java | 506 ---------------------
.../org/apache/felix/bundleplugin/PatchedLog.java | 116 -----
.../felix/bundleplugin/VersionCleanerPlugin.java | 67 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/META-INF/NOTICE.txt | 14 -
init/pom.xml | 61 ---
parent/pom.xml | 40 --
pom.xml | 1 -
tests/pom.xml | 17 -
tests/test-bundles/mock-javamail_1.7/pom.xml | 13 -
tests/test-bundles/pom.xml | 32 --
tooling/camel-tooling-model/pom.xml | 54 ---
tooling/camel-tooling-util/pom.xml | 54 ---
tooling/camel-util-json/pom.xml | 54 ---
tooling/maven/pom.xml | 15 -
tooling/openapi-rest-dsl-generator/pom.xml | 52 ---
tooling/pom.xml | 1 -
tooling/spi-annotations/pom.xml | 55 ---
tooling/swagger-rest-dsl-generator/pom.xml | 52 ---
138 files changed, 2 insertions(+), 2584 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 470dfa18529..34e6b6b6a9d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -38,7 +38,6 @@
</modules>
<properties>
- <camel.osgi.export.pkg />
</properties>
<build>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 37fcca96eb7..ae8959886c4 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -60,7 +60,6 @@
<atlassian-fugue-version>3.0.0</atlassian-fugue-version>
<atmos-client-version>3.2.1</atmos-client-version>
<atmosphere-version>2.6.4</atmosphere-version>
- <atmosphere-version-range>[2.6,3.0)</atmosphere-version-range>
<avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
<avro-version>1.11.1</avro-version>
@@ -82,28 +81,11 @@
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
<camel.osgi.activator></camel.osgi.activator>
<camel.osgi.dynamic></camel.osgi.dynamic>
- <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
- <camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
- <camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
- <camel.osgi.failok>false</camel.osgi.failok>
- <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
<camel.osgi.import.additional></camel.osgi.import.additional>
<camel.osgi.import.before.defaults></camel.osgi.import.before.defaults>
- <camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
- <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
<camel.osgi.import.defaults></camel.osgi.import.defaults>
- <camel.osgi.import.pkg>org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.before.defaults},
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- *</camel.osgi.import.pkg>
- <camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
- <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
<camel.osgi.provide.capability></camel.osgi.provide.capability>
<camel.osgi.require.capability></camel.osgi.require.capability>
- <camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
- <camel.osgi.version>version=${project.version}</camel.osgi.version>
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
<camel.surefire.forkCount>1</camel.surefire.forkCount>
<camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
@@ -152,7 +134,6 @@
<curator-version>4.3.0</curator-version>
<cxf-codegen-plugin-version>3.5.4</cxf-codegen-plugin-version>
<cxf-version>3.5.4</cxf-version>
- <cxf-version-range>[3.5,3.6)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.2</cxf-xjc-utils-version>
<cxf.codegen.jvmArgs></cxf.codegen.jvmArgs>
@@ -294,7 +275,6 @@
<javapoet-version>1.11.1</javapoet-version>
<javassist-version>3.28.0-GA</javassist-version>
<javax-activation-version>1.2.0</javax-activation-version>
- <javax-activation-version-range>[0,2)</javax-activation-version-range>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
<javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
@@ -311,7 +291,6 @@
<jbpm-version>7.64.0.Final</jbpm-version>
<jcache-bundle-version>1.1.1_1</jcache-bundle-version>
<jclouds-google-guava-version>27.1-jre</jclouds-google-guava-version>
- <jclouds-google-guava-version-range>[27.0,28.0)</jclouds-google-guava-version-range>
<jclouds-version>2.5.0</jclouds-version>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
@@ -380,7 +359,6 @@
<log4j2-version>2.18.0</log4j2-version>
<logback-version>1.2.11</logback-version>
<lucene-version>8.11.1</lucene-version>
- <lucene-version-range>[8,9)</lucene-version-range>
<mapstruct-version>1.5.2.Final</mapstruct-version>
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
@@ -486,7 +464,6 @@
<scala-datasonnet-version>2.13.9</scala-datasonnet-version>
<scala-version>2.11.12</scala-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
- <servlet-version-range>[3,4)</servlet-version-range>
<shiro-version>1.9.1</shiro-version>
<shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
<shrinkwrap-maven-version>3.6.3</shrinkwrap-maven-version>
@@ -504,7 +481,6 @@
<snakeyaml-version>1.33</snakeyaml-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
<solr-version>8.11.2</solr-version>
- <solr-version-range>[8,9)</solr-version-range>
<solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<spark-version>3.2.2</spark-version>
<splunk-version>1.9.0_1</splunk-version>
@@ -517,7 +493,6 @@
<spring-security-version>5.7.5</spring-security-version>
<spring-vault-core-version>2.3.2</spring-vault-core-version>
<spring-version>${spring5-version}</spring-version>
- <spring-version-range>[5,6)</spring-version-range>
<spring-ws-version>3.1.4</spring-ws-version>
<spring5-version>5.3.24</spring5-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index b867f87ee32..570b4bbc905 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -81,10 +81,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
diff --git a/catalog/camel-catalog-lucene/pom.xml b/catalog/camel-catalog-lucene/pom.xml
index a4058848702..3b8ea6e580f 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -84,10 +84,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index fda78ce3314..f8643d0992e 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -51,24 +51,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 6a87c35fb02..289e975cb6a 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -35,12 +35,6 @@
<properties>
<!-- Wrapped qpid-jms-client requires invalid version of the package.
Remove this after migration to ServiceMix bundles. -->
- <camel.osgi.import>
- org.apache.qpid.jms,
- javax.jms;version="[1.1,3)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 73701052b6b..9e018eebc46 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Asterisk to interact with an Asterisk PBX Server</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.asteriskjava.*;version="[1.0,4)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 85461df8e3b..be86b000280 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -33,19 +33,6 @@
<description>Camel Atmosphere WebSocket Servlet</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.atmosphere.websocket.*,
- javax.activation.*;version="${javax-activation-version-range}",
- javax.servlet.*;version="${servlet-version-range}",
- org.atmosphere.*;version="${atmosphere-version-range}",
- org.apache.catalina;resolution:=optional,
- org.apache.catalina.comet;resolution:=optional,
- org.eclipse.jetty.continuation;version="[9,10)";resolution:=optional,
- org.eclipse.jetty.server;version="[9,10)";resolution:=optional,
- org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 6dd7dc3862b..eaf33249e5d 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Atom support</description>
<properties>
- <camel.osgi.import.additional>
- org.apache.abdera.*;version="[0.4,2)"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index a70bdcdfb19..12dc142b1c7 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -33,9 +33,6 @@
<description>Support for attachments on Camel messages</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}"
- </camel.osgi.import.before.defaults>
<firstVersion>3.0.0</firstVersion>
<label>core</label>
</properties>
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index 0544f4ef601..70889290db4 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -33,12 +33,6 @@
<description>Camel Azure CosmosDB Component</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.azure.cosmosdb*,
- reactor*;version="[3,4)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 270cd38b5f8..cdcc06ee058 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -33,12 +33,6 @@
<description>Camel Azure Event Hubs Component</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.azure.eventhubs*,
- reactor*;version="[3,4)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml
index c0f6eb55f6b..675753ab0ad 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -33,12 +33,6 @@
<description>Camel Azure ServiceBus Component</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.azure.eventhubs*,
- reactor*;version="[3,4)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index d0bf116bb39..5226723b384 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -35,9 +35,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <camel.osgi.import.additional>
- org.apache.cxf.*;version="${cxf-version-range}"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 91ce77abfee..f3747a53f0c 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -37,9 +37,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<firstVersion>2.19.0</firstVersion>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 2eee50da955..f5fb90be0ad 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -41,7 +41,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-caffeine-lrucache/pom.xml b/components/camel-caffeine-lrucache/pom.xml
index 83e2ef2b5d8..805c86d54dc 100644
--- a/components/camel-caffeine-lrucache/pom.xml
+++ b/components/camel-caffeine-lrucache/pom.xml
@@ -66,35 +66,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <extensions>false</extensions>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
- <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
- <Fragment-Host>org.apache.camel.camel-support</Fragment-Host>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 9ed6d731080..3dda21041cf 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -32,9 +32,6 @@
<description>Camel CMIS which is based on Apache Chemistry support</description>
<properties>
- <camel.osgi.import>
- !org.apache.chemistry.opencmis.client.runtime,*
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 85e88b2bbf3..ee7b7a7cd92 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -32,11 +32,6 @@
<description>Camel Cometd support based on Jetty</description>
<properties>
- <camel.osgi.import.pkg>
- org.eclipse.jetty.*;version="[9.4,10)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index 5cca062f82b..04e2e075464 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -33,38 +33,6 @@
<description>Camel CXF Common</description>
<properties>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !org.apache.camel.component.cxf.jaxrs,
- !org.apache.camel.component.cxf.spring,
- !org.apache.camel.component.cxf.util,
- !org.apache.camel.blueprint,
- !org.apache.camel.test,
- javax.xml.soap*;version="[1.3,2)";resolution:=optional,
- javax.xml.stream*;version="[0.0,2)";resolution:=optional,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.failok>true</camel.osgi.failok>
<camel-prepare-component>false</camel-prepare-component>
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index b2a8123727e..29babefc081 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -33,41 +33,6 @@
<description>Camel CXF REST support</description>
<properties>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !org.apache.camel.component.cxf.jaxrs,
- !org.apache.camel.component.cxf.spring,
- !org.apache.camel.blueprint,
- javax.activation.*;version="${javax-activation-version-range}",
- javax.jws*;version="[0.0,3)";resolution:=optional,
- javax.ws.rs*;version="[0.0,3)",
- javax.xml.soap*;version="[1.3,2)";resolution:=optional,
- javax.xml.stream*;version="[0.0,2)";resolution:=optional,
- javax.xml.ws*;version="[0.0,3.0)";resolution:=optional,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.private.pkg />
- <camel.osgi.failok>true</camel.osgi.failok>
</properties>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index 39b9e651bd2..f69dcac0d6e 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -33,41 +33,6 @@
<description>Camel CXF SOAP support</description>
<properties>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !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="${javax-activation-version-range}",
- javax.jws*;version="[0.0,3)",
- javax.ws.rs*;version="[0.0,3)",
- javax.xml.soap*;version="[1.3,2)",
- javax.xml.stream*;version="[0.0,2)",
- javax.xml.ws*;version="[0.0,3.0)",
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.failok>true</camel.osgi.failok>
</properties>
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index 6bdd6142abe..3b58c7287ac 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -33,38 +33,6 @@
<description>Camel CXF Spring Common</description>
<properties>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !org.apache.camel.component.cxf.jaxrs,
- !org.apache.camel.component.cxf.spring,
- !org.apache.camel.component.cxf.util,
- !org.apache.camel.blueprint,
- javax.xml.soap*;version="[1.3,2)";resolution:=optional,
- javax.xml.stream*;version="[0.0,2)";resolution:=optional,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.springframework*;version="${spring-version-range}";resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.failok>true</camel.osgi.failok>
<camel-prepare-component>false</camel-prepare-component>
diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
index 6a53451a6cd..5f5e42444cc 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
@@ -34,42 +34,6 @@
<properties>
<firstVersion>3.18.0</firstVersion>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !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="${javax-activation-version-range}",
- javax.jws*;version="[0.0,3)";resolution:=optional,
- javax.ws.rs*;version="[0.0,3)",
- javax.xml.soap*;version="[1.3,2)";resolution:=optional,
- javax.xml.stream*;version="[0.0,2)";resolution:=optional,
- javax.xml.ws*;version="[0.0,3.0)";resolution:=optional,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.springframework*;version="${spring-version-range}";resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.failok>true</camel.osgi.failok>
</properties>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 689373d39f1..1d6fa588574 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -34,41 +34,6 @@
<properties>
<firstVersion>3.18.0</firstVersion>
- <camel.osgi.import.defaults />
- <camel.osgi.import>
- !org.springframework.boot.*,
- !org.springframework.context.annotation.*;resolution:=optional,
- !org.apache.camel.component.cxf,
- !org.apache.camel.component.cxf.blueprint,
- !org.apache.camel.component.cxf.converter,
- !org.apache.camel.component.cxf.feature,
- !org.apache.camel.component.cxf.interceptors,
- !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="${javax-activation-version-range}",
- javax.jws*;version="[0.0,3)",
- javax.ws.rs*;version="[0.0,3)",
- javax.xml.soap*;version="[1.3,2)",
- javax.xml.stream*;version="[0.0,2)",
- javax.xml.ws*;version="[0.0,3.0)",
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.osgi.service.blueprint;resolution:=optional,
- org.osgi.service.blueprint.container;resolution:=optional,
- org.osgi.service.blueprint.reflect;resolution:=optional,
- org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
- org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
- org.apache.camel.blueprint;resolution:=optional,
- *
- </camel.osgi.import>
- <camel.osgi.failok>true</camel.osgi.failok>
</properties>
diff --git a/components/camel-cxf/camel-cxf-spring-transport/pom.xml b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
index b1e8db3b312..dca5cc21f37 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
@@ -37,26 +37,7 @@
<label>soap,webservice</label>
<title>CXF Transport</title>
- <camel.osgi.import>
- !org.apache.camel.component.cxf.*,
- !META-INF.cxf.camel,
- javax.servlet.*;version="${servlet-version-range}",
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.transport.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.springframework*;version="${spring-version-range}";resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.apache.aries.blueprint*;resolution:=optional,
- org.osgi.service.blueprint*;resolution:=optional,
- *
- </camel.osgi.import>
-
- <camel.osgi.export>
- org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
- '=META-INF.cxf.camel'
- </camel.osgi.export>
- <camel.osgi.failok>true</camel.osgi.failok>
+
</properties>
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index af73a54c718..2d1a67a23ba 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -37,25 +37,7 @@
<label>soap,webservice</label>
<title>CXF Transport</title>
- <camel.osgi.import>
- !org.apache.camel.component.cxf.*,
- !META-INF.cxf.camel,
- javax.servlet.*;version="${servlet-version-range}",
- org.apache.camel.*;${camel.osgi.import.camel.version},
- org.apache.camel.component.cxf.transport.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
- org.apache.cxf.*;version="${cxf-version-range}",
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- org.apache.aries.blueprint*;resolution:=optional,
- org.osgi.service.blueprint*;resolution:=optional,
- *
- </camel.osgi.import>
-
- <camel.osgi.export>
- org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
- '=META-INF.cxf.camel'
- </camel.osgi.export>
- <camel.osgi.failok>true</camel.osgi.failok>
+
</properties>
diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
index 2d4f2e7f39b..a91ecb4a461 100644
--- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
+++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
@@ -98,23 +98,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 52a8c53f803..8ced1876810 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -37,10 +37,6 @@
<schemeName>fhir</schemeName>
<componentPackage>org.apache.camel.component.fhir</componentPackage>
<outPackage>org.apache.camel.component.fhir.internal</outPackage>
- <camel.osgi.dynamic>
- org.hl7.fhir.*
- </camel.osgi.dynamic>
- <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index cca2ffa7bcf..918f0caf332 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -32,9 +32,6 @@
<description>Camel FlatPack support</description>
<properties>
- <camel.osgi.import.additional>
- net.sf.flatpack.*;version="[4,5)"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml
index 9fb1275feae..43e470be93a 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Freemarker support</description>
<properties>
- <camel.osgi.import.additional>
- freemarker.*;version="[2.3.15,3)"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 910d955b84d..d7bfddf0522 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -32,9 +32,6 @@
<description>Camel FTP support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.jcraft.jsch.*;version="[0.2,1)"
- </camel.osgi.import.before.defaults>
<camel.failsafe.parallel.factor>0.5</camel.failsafe.parallel.factor>
</properties>
diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml
index 0b4ae679daa..eb8f2a03a7f 100644
--- a/components/camel-google/camel-google-calendar/pom.xml
+++ b/components/camel-google/camel-google-calendar/pom.xml
@@ -37,7 +37,6 @@
<componentName>GoogleCalendar</componentName>
<componentPackage>org.apache.camel.component.google.calendar</componentPackage>
<outPackage>org.apache.camel.component.google.calendar.internal</outPackage>
- <camel.osgi.private.pkg>org.apache.camel.component.google.calendar.internal</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml
index e1868efd413..a0a54ec0f83 100644
--- a/components/camel-google/camel-google-drive/pom.xml
+++ b/components/camel-google/camel-google-drive/pom.xml
@@ -37,7 +37,6 @@
<componentName>GoogleDrive</componentName>
<componentPackage>org.apache.camel.component.google.drive</componentPackage>
<outPackage>org.apache.camel.component.google.drive.internal</outPackage>
- <camel.osgi.private.pkg>org.apache.camel.component.google.drive.internal</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 522b0a22e93..833dd43c5e3 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -37,7 +37,6 @@
<componentName>GoogleMail</componentName>
<componentPackage>org.apache.camel.component.google.mail</componentPackage>
<outPackage>org.apache.camel.component.google.mail.internal</outPackage>
- <camel.osgi.private.pkg>org.apache.camel.component.google.mail.internal</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 8e9167cc9d0..56b7f12fafe 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -36,7 +36,6 @@
<schemeName>google-pubsub</schemeName>
<componentName>GooglePubSub</componentName>
<componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
- <camel.osgi.import>com.google.common*;version="${google-cloud-guava-version-prefix}",*</camel.osgi.import>
</properties>
<dependencyManagement>
diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml
index b4d69545531..f1954abd943 100644
--- a/components/camel-google/camel-google-sheets/pom.xml
+++ b/components/camel-google/camel-google-sheets/pom.xml
@@ -37,7 +37,6 @@
<componentName>GoogleSheets</componentName>
<componentPackage>org.apache.camel.component.google.sheets</componentPackage>
<outPackage>org.apache.camel.component.google.sheets.internal</outPackage>
- <camel.osgi.private.pkg>org.apache.camel.component.google.sheets.internal</camel.osgi.private.pkg>
<spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version>
</properties>
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 30a76dd9554..364c402b900 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -33,10 +33,6 @@
<description>Gora Component for Apache Camel</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.google.common.base;version="[11,14)",
- org.apache.hadoop.conf;version="[1,2)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 9402e403148..9e3da63666a 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -33,17 +33,6 @@
<description>Camel Groovy support</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.groovy.*,
- org.codehaus.groovy.runtime.callsite,
- org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
- <camel.osgi.dynamic>
- groovy.*,
- org.codehaus.groovy.*
- </camel.osgi.dynamic>
</properties>
<dependencies>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 8a4641449c1..82815a47c81 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -32,9 +32,6 @@
<description>Camel HazelCast based work queue implementation</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.hazelcast.*;version="[5,6)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index c092ee764e2..56f913a852c 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -32,20 +32,6 @@
<description>Camel HDFS support with Hadoop 3.x libraries</description>
<properties>
- <camel.osgi.import.additional>
- org.apache.hadoop.hdfs,
- org.apache.hadoop.hdfs.client,
- org.apache.hadoop.hdfs.protocolPB,
- org.apache.hadoop.hdfs.util,
- org.apache.hadoop.hdfs.net,
- org.apache.hadoop.hdfs.security.token.block,
- org.apache.hadoop.hdfs.security.token.delegation,
- org.apache.hadoop.hdfs.protocol,
- org.apache.hadoop.hdfs.protocol.proto,
- org.apache.hadoop.hdfs.protocol.datatransfer,
- org.apache.hadoop.net,
- org.apache.hadoop.ipc
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 9b54aced79d..c9092fc5e1b 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -32,9 +32,6 @@
<description>Camel HL7 support</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.apache.mina.*;version="[2,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 7e958711681..83b78299a67 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -33,10 +33,6 @@
<description>Camel HTTP common</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}",
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
<firstVersion>2.16.0</firstVersion>
</properties>
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 491e7dc0a9a..41f8817b81d 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -33,9 +33,6 @@
<description>Camel HTTP support</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.apache.http.*;version="[4.4,5)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index f2a4d31e7fe..efb63e1873f 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -33,11 +33,6 @@
<description>Camel iCal component</description>
<properties>
- <camel.osgi.import>
- !org.apache.camel.ical.*,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-jackson-avro/pom.xml b/components/camel-jackson-avro/pom.xml
index dbd3cba1a97..7a2254ec6f0 100644
--- a/components/camel-jackson-avro/pom.xml
+++ b/components/camel-jackson-avro/pom.xml
@@ -33,9 +33,6 @@
<properties>
<firstVersion>3.10.0</firstVersion>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jackson-protobuf/pom.xml b/components/camel-jackson-protobuf/pom.xml
index eac1572d30b..2c42c759cd0 100644
--- a/components/camel-jackson-protobuf/pom.xml
+++ b/components/camel-jackson-protobuf/pom.xml
@@ -33,9 +33,6 @@
<properties>
<firstVersion>3.10.0</firstVersion>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index a12bf45bbeb..70495cef642 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -33,9 +33,6 @@
<description>Camel Jackson support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml
index 89c0fdc7c1d..30b29fc04ea 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Jackson XML support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index c0723d66057..08191d94756 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -36,7 +36,6 @@
<firstVersion>2.5.0</firstVersion>
<label>security</label>
- <camel.osgi.import.before.defaults>org.jasypt.encryption.*;version="[1.9,2)"</camel.osgi.import.before.defaults>
</properties>
<dependencies>
@@ -88,14 +87,6 @@
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <versionRange>${project.version}</versionRange>
- <goals>
- <goal>manifest</goal>
- </goals>
- </pluginExecutionFilter>
<action>
<ignore />
</action>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 75e71746867..9fac8fd10f9 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -33,11 +33,6 @@
<description>Camel JAXB support</description>
<properties>
- <camel.osgi.import>
- com.sun.xml.bind.marshaller;resolution:=optional;version="[2.2,3)",
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
<camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 6de1ab8d754..60b07e2c4e5 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -32,9 +32,6 @@
<description>Camel JClouds support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.google.common.*;version="${jclouds-google-guava-version-range}",
- </camel.osgi.import.before.defaults>
<!-- jclouds requires guice 3 -->
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 4898f3094b6..d3f3df86518 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -33,10 +33,6 @@
<description>Camel Jetty 9.x support</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.4,10)",
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
<firstVersion>2.15.0</firstVersion>
</properties>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 75e38185a51..9a6f516e048 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -33,11 +33,6 @@
<description>Camel Jetty support</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.4,10)",
- javax.activation.*;version="${javax-activation-version-range}",
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index b92a15bd1cf..13538c4de2e 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -34,8 +34,6 @@
<description>Camel JMS support</description>
<properties>
- <camel.osgi.export.pkg>org.apache.camel.component.jms*</camel.osgi.export.pkg>
- <camel.osgi.import.additional>javax.jms;version="[1.1,3)"</camel.osgi.import.additional>
<camel.surefire.reuseForks>true</camel.surefire.reuseForks>
<camel.surefire.forkCount>1</camel.surefire.forkCount>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index ee60cfe9276..142c5d4a1c5 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -32,10 +32,6 @@
<description>Camel JMX support</description>
<properties>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index c24d55bee8d..9c22cd2b7d8 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -32,14 +32,6 @@
<description>Camel JPA support</description>
<properties>
- <camel.osgi.import.pkg>
- org.apache.camel.*;${camel.osgi.import.camel.version},
- javax.persistence.*;version="[1.1,3)",
- ${camel.osgi.import.defaults},
- org.hibernate.proxy;resolution:=optional,
- javassist.util.proxy;resolution:=optional,
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index c2bbe52cc39..88b9de6633c 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -32,9 +32,6 @@
<description>Camel SCP Support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.jcraft.jsch.*;version="[0.2,1)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 7fac7373c0c..dba8decf904 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -33,11 +33,6 @@
<description>Camel JSON Path Language</description>
<properties>
- <camel.osgi.import>
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.module.jaxb;resolution:=optional,
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index d247324f375..3731a8df38d 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -32,10 +32,6 @@
<name>Camel :: Kubernetes</name>
<properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.kubernetes*,
- org.apache.camel.component.openshift*
- </camel.osgi.export.pkg>
</properties>
<dependencyManagement>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 9d5a3153306..16005bc191d 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -36,14 +36,6 @@
<label>database</label>
<title>LevelDB</title>
- <camel.osgi.import.pkg>
- org.apache.camel*,
- org.fusesource.hawtbuf*,
- org.slf4j,
- org.fusesource.leveldbjni;resolution:=optional,
- org.iq80.leveldb;resolution:=optional,
- org.iq80.leveldb.impl;resolution:=optional
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index b5a33696028..a2d8251e2e6 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Lucene based search component</description>
<properties>
- <camel.osgi.import.additional>
- org.apache.lucene.*;version="${lucene-version-range}"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 5c5014b0b18..d7ef267fcd6 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Mail support</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index e9274ad6dff..29efdb534b8 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -32,10 +32,6 @@
<description>Camel OPC UA support</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.xml.bind*;version="[2.2,3.0)",
- com.google.common.*;version="19.0.0"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index 72db127f49c..de4618ac16a 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -32,7 +32,6 @@
<description>Camel MINA support</description>
<properties>
- <camel.osgi.import.before.defaults>org.apache.mina.*;version="[2.0,3.0)"</camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index 3e9acc63ef6..6cf3e3b2f34 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -32,9 +32,6 @@
<description>Camel MyBatis support</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.apache.ibatis.*;version="[3,4)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 2b199bd6d39..8c40c8c54ba 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -34,9 +34,6 @@
<packaging>jar</packaging>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
<firstVersion>2.14.0</firstVersion>
</properties>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index eb354a0a433..cd045a8d4eb 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -38,7 +38,6 @@
<componentPackage>org.apache.camel.component.olingo2</componentPackage>
<outPackage>org.apache.camel.component.olingo2.internal</outPackage>
- <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
<maven.exe.file.extension />
</properties>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 9385354ca83..546d98d14d3 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -33,9 +33,6 @@
<packaging>jar</packaging>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
<firstVersion>2.19.0</firstVersion>
</properties>
diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml
index 5364fc480d9..f7608e9aba5 100644
--- a/components/camel-olingo4/camel-olingo4-component/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-component/pom.xml
@@ -36,7 +36,6 @@
<maven.exe.file.extension />
<componentPackage>org.apache.camel.component.olingo4</componentPackage>
<outPackage>org.apache.camel.component.olingo4.internal</outPackage>
- <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-openapi-java/pom.xml b/components/camel-openapi-java/pom.xml
index 948a6f23d3e..eae9aac09e6 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -37,10 +37,6 @@
<firstVersion>3.1.0</firstVersion>
<label>rest,api</label>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)",
- io.apicurio.datamodels*
- </camel.osgi.import.before.defaults>
<camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index f368b574a18..2acdbad3a10 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -33,9 +33,6 @@
<description>Camel Google Protobuf data format support</description>
<properties>
- <camel.osgi.import.before.defaults>
- com.google.protobuf.*;version="[3.1,4)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 4638c075a23..0bfd4c0c7a7 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -32,10 +32,6 @@
<description>Camel QuickFIX/J support</description>
<properties>
- <camel.osgi.import>
- org.slf4j*;resolution:=optional,
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 70126cb0ca6..b24699ba9b1 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -36,10 +36,6 @@
<properties>
<firstVersion>3.1.0</firstVersion>
<label>rest,api,http</label>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)",
- io.apicurio.datamodels*
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-salesforce/camel-salesforce-codegen/pom.xml b/components/camel-salesforce/camel-salesforce-codegen/pom.xml
index af267f8106b..3e99847a927 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-codegen/pom.xml
@@ -107,23 +107,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index d4e5548c6b3..ae67073f42d 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -33,12 +33,6 @@
<description>Camel Salesforce support</description>
<properties>
- <camel.osgi.import.additional>
- javax.xml.bind*;version="[2.2,3.0)",
- org.eclipse.jetty.*;version="[9.4,10)",
- org.mortbay.cometd.*;version="[6.1,7)"
- </camel.osgi.import.additional>
- <camel.osgi.private.pkg>org.apache.camel.component.salesforce.internal.*</camel.osgi.private.pkg>
<salesforce.component.root>..</salesforce.component.root>
</properties>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 7d34351b4d2..794909c1945 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -209,23 +209,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 9236ff7f69d..dc5370ca3c4 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -32,9 +32,6 @@
<description>Camel Saxon (XQuery/XPath) support</description>
<properties>
- <camel.osgi.import.additional>
- net.sf.saxon.*;version="[11,12)"
- </camel.osgi.import.additional>
<camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml
index 7d7680a0083..c2ff0c68dca 100644
--- a/components/camel-servicenow/camel-servicenow-component/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-component/pom.xml
@@ -33,9 +33,6 @@
<description>Camel ServiceNow support</description>
<properties>
- <camel.osgi.import.additional>
- org.apache.cxf.*;version="${cxf-version-range}"
- </camel.osgi.import.additional>
</properties>
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
index 693b9afdd88..c5031f39aec 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
@@ -178,23 +178,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 0ff68248e5c..407213ce0ce 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -33,10 +33,6 @@
<description>Camel servlet transport support</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}",
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 90e1668c9aa..886e772212f 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -32,10 +32,6 @@
<description>A pure Java JMS Camel Component</description>
<properties>
- <camel.osgi.import>
- javax.jms;version="[1.1,3)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index bd2e37181e9..68eade8464d 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -33,7 +33,6 @@
<description>A pure Java JMS 2.0 Camel Component</description>
<properties>
- <camel.osgi.import.additional>javax.jms;version="[2,3)"</camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index b39eceaa6c0..51e25275b50 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -32,11 +32,6 @@
<description>Camel SOAP support</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.xml.bind*;version="[2.2,3.0)",
- javax.xml.ws*;version="[0.0,3)",
- javax.xml.soap*;version="[1.3,2)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index d0aa6745bb5..956812049d0 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -32,12 +32,6 @@
<properties>
<java.awt.headless>true</java.awt.headless>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}"
- </camel.osgi.import.before.defaults>
- <camel.osgi.import.additional>
- org.apache.solr.*;version="${solr-version-range}"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 403698506ed..a28902529eb 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -32,9 +32,6 @@
<packaging>jar</packaging>
<properties>
- <camel.osgi.import.before.defaults>
- org.joda.time.*;version="[1.6,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 1c2393e8d71..a70aecaa317 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -31,8 +31,6 @@
<description>Camel Spring Batch support</description>
<properties>
- <camel.osgi.import.before.defaults>org.springframework.batch.*;version="[4,6)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 0e643bed072..46116561d1a 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -32,10 +32,6 @@
<packaging>jar</packaging>
<properties>
- <camel.osgi.import.before.defaults>
- org.springframework.integration.*;version="[5,6)",
- org.springframework.messaging.*;version="[5,6)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index 2fb9acedf7f..6b22df3bd0b 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -31,10 +31,6 @@
<description>Camel support for Spring LDAP</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.springframework.ldap.*;version="[2,3)",
- org.springframework.transaction.compensating.*;version="[2,3)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index e103aa7eb34..777b996af05 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -34,8 +34,6 @@
<firstVersion>2.3.0</firstVersion>
<label>security,spring</label>
- <camel.osgi.import.before.defaults>org.springframework.security.*;version="[4,5)"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 3deb3c61c35..9912b5e7cbd 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -33,14 +33,6 @@
<description>Camel support for Spring Web Services</description>
<properties>
- <camel.osgi.import.before.defaults>
- org.springframework.beans.*;version="${spring-version-range}",
- org.springframework.util.*;version="${spring-version-range}",
- org.springframework.ws.*;version="[3,4)",
- org.springframework.xml.*;version="[3,4)",
- javax.activation.*;version="${javax-activation-version-range}",
- javax.xml.soap*;version="[1.3,2)"
- </camel.osgi.import.before.defaults>
<!-- for some weird reason org.springframework.ws and org.springframework.xml
will have import-ranges of [2,3) by the bundle plugin, so we
need to override it here -->
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index d1e13c3ac0f..e36b8a15410 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -37,10 +37,6 @@
<label>spring</label>
<supportLevel>Stable</supportLevel>
<title>Spring XML</title>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
<camel.surefire.forkCount>4</camel.surefire.forkCount>
<camel.surefire.parallel>false</camel.surefire.parallel>
@@ -291,16 +287,6 @@
</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.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index d948526e54d..8192c2f3b1d 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -32,10 +32,6 @@
<description>Camel StAX support</description>
<properties>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 505f5dab6d5..fac7c89ee93 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -36,9 +36,6 @@
<firstVersion>2.16.0</firstVersion>
<label>rest,api</label>
- <camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.13,3)"
- </camel.osgi.import.before.defaults>
<camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 109c3dd5c05..df410db305d 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -31,10 +31,6 @@
<description>Camel Syslog support</description>
<properties>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index d9b59ba03c7..326d4f547eb 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -38,7 +38,6 @@
<componentPackage>org.apache.camel.component.twilio</componentPackage>
<outPackage>org.apache.camel.component.twilio.internal</outPackage>
- <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
</properties>
<dependencies>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index bde8cbf85fa..10044c25c15 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -32,9 +32,6 @@
<name>Camel :: Undertow</name>
<properties>
- <camel.osgi.import.before.defaults>
- javax.activation.*;version="${javax-activation-version-range}"
- </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
index b1b9c541b3e..f3217d3db5a 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
@@ -91,23 +91,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml
index 6b5186bdc5b..dbd4f58fd59 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -32,12 +32,6 @@
<properties>
<tomcat.version>9.0.35</tomcat.version>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.websocket.jsr356.*,
- javax.websocket.*;version="[1.1,2)";resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 2bf99addc1e..fdbb936b88c 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -33,13 +33,6 @@
<description>Camel WebSocket using Jetty</description>
<properties>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.websocket.*,
- org.eclipse.jetty.util.ssl;version="[9.3,10)";resolution:=optional,
- org.eclipse.jetty.*;version="[9.3,10)",
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index e6e6802ce03..99f11dc93e0 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -34,9 +34,6 @@
<description>Wordpress REST API support</description>
<properties>
- <camel.osgi.import.additional>
- org.apache.cxf.*;version="${cxf-version-range}"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml
index f6be6502450..e856babe082 100644
--- a/components/camel-xslt-saxon/pom.xml
+++ b/components/camel-xslt-saxon/pom.xml
@@ -33,9 +33,6 @@
<description>Camel XSLT Saxon component</description>
<properties>
- <camel.osgi.import.additional>
- net.sf.saxon.*;version="[11.0,12)"
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 5009b82147e..0e461989cbc 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -33,9 +33,6 @@
<description>Camel XStream support</description>
<properties>
- <camel.osgi.import.additional>
- com.thoughtworks.xstream.*;version="[1.4.7,2)",
- </camel.osgi.import.additional>
</properties>
<dependencies>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index b5027800cf2..f2319b37347 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -33,11 +33,6 @@
<description>Camel Zookeeper Master Support</description>
<properties>
- <camel.osgi.import>
- !com.google.common.base;,
- !org.apache.camel.component.zookeepermaster.group,
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/pom.xml b/components/pom.xml
index 31395a84cab..f52a402107a 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -353,7 +353,6 @@
</modules>
<properties>
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
<camel-prepare-component>true</camel-prepare-component>
</properties>
@@ -454,63 +453,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <extensions>false</extensions>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <!-- do not include any resources as not needed-->
- <Include-Resource></Include-Resource>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 95db786f98b..31757267d60 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -36,12 +36,6 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>core</label>
- <camel.osgi.export.pkg>$${replace;{local-packages};;;\;},org.apache.camel.spi.annotations
- </camel.osgi.export.pkg>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 3d808ac4e11..97e6daec887 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -35,18 +35,6 @@
<properties>
<firstVersion>3.0.0</firstVersion>
<label>core</label>
- <camel.osgi.dynamic>
- org.apache.camel.spring.util;${camel.osgi.import.strict.version},
- org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
- org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
- org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version},
- org.apache.camel.component.caffeine;${camel.osgi.import.strict.version},
- net.sf.saxon
- </camel.osgi.dynamic>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
<platform.skip.tests>false</platform.skip.tests>
</properties>
@@ -144,20 +132,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/core/camel-core-model/pom.xml b/core/camel-core-model/pom.xml
index a4eee2b3500..f6ef335f98b 100644
--- a/core/camel-core-model/pom.xml
+++ b/core/camel-core-model/pom.xml
@@ -84,20 +84,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/core/camel-core-processor/pom.xml b/core/camel-core-processor/pom.xml
index 0d49e5907fe..b21d18f18a7 100644
--- a/core/camel-core-processor/pom.xml
+++ b/core/camel-core-processor/pom.xml
@@ -61,20 +61,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/core/camel-core-reifier/pom.xml b/core/camel-core-reifier/pom.xml
index c49564117ba..9f1cb866a30 100644
--- a/core/camel-core-reifier/pom.xml
+++ b/core/camel-core-reifier/pom.xml
@@ -76,20 +76,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index e78be88e30e..27273925cac 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -34,10 +34,6 @@
<properties>
<firstVersion>2.4.0</firstVersion>
<label>dsl</label>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 214e52ee8ba..b3e1c16fb6a 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -290,27 +290,6 @@
</environmentVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_plugin>
- org.apache.felix.bundleplugin.BlueprintPlugin,
- aQute.lib.spring.SpringXMLType,
- org.apache.felix.bundleplugin.JpaPlugin,
- org.apache.camel.maven.bundle.CamelPlugin
- </_plugin>
- </instructions>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index 56298400482..6251af40cdb 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -34,19 +34,6 @@
<properties>
<firstVersion>3.1.0</firstVersion>
<label>dsl</label>
- <camel.osgi.import>
- org.apache.camel.model;${camel.osgi.import.camel.version},
- org.apache.camel.model.cloud;${camel.osgi.import.camel.version},
- org.apache.camel.model.config;${camel.osgi.import.camel.version},
- org.apache.camel.model.dataformat;${camel.osgi.import.camel.version},
- org.apache.camel.model.language;${camel.osgi.import.camel.version},
- org.apache.camel.model.loadbalancer;${camel.osgi.import.camel.version},
- org.apache.camel.model.rest;${camel.osgi.import.camel.version},
- org.apache.camel.model.transformer;${camel.osgi.import.camel.version},
- org.apache.camel.model.validator;${camel.osgi.import.camel.version},
- javax.xml.bind.*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 103b4c7b8f0..1e42308cf30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -62,7 +62,6 @@
</modules>
<properties>
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
<camel.surefire.parallel>true</camel.surefire.parallel>
</properties>
@@ -139,56 +138,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <!-- do not include any resources as not needed-->
- <Include-Resource></Include-Resource>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index efaa11cf742..a2688330885 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -36,10 +36,6 @@
<firstVersion>3.0.0</firstVersion>
<title>Java Endpoint DSL</title>
<label>dsl</label>
- <camel.osgi.import>
- javax.xml.bind*;version="[2.2,3.0)",
- *
- </camel.osgi.import>
</properties>
<dependencies>
diff --git a/dsl/pom.xml b/dsl/pom.xml
index 50890322abf..5a0bc2153b7 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -34,7 +34,6 @@
<description>Camel DSL Parent</description>
<properties>
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
<camel.surefire.parallel>true</camel.surefire.parallel>
<camel-prepare-component>true</camel-prepare-component>
</properties>
@@ -134,54 +133,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/init/camel-bundle-plugin/pom.xml b/init/camel-bundle-plugin/pom.xml
deleted file mode 100644
index ccc9f0261a1..00000000000
--- a/init/camel-bundle-plugin/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>init</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>camel-bundle-plugin</artifactId>
- <packaging>maven-plugin</packaging>
-
- <name>Camel :: Maven Plugins :: Enhanced Bundle Plugin</name>
- <description>OSGi Bundle plugin detecting stale input</description>
-
- <properties>
- <sourcecheckExcludesComma>
- **/*.java,
- </sourcecheckExcludesComma>
- <maven-version>3.3.9</maven-version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${maven-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${maven-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
deleted file mode 100644
index 38ca8f54134..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.maven.bundle;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import aQute.bnd.annotation.plugin.BndPlugin;
-import aQute.bnd.osgi.Analyzer;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Resource;
-import aQute.bnd.service.AnalyzerPlugin;
-
-@BndPlugin(name = "camel")
-public class CamelPlugin implements AnalyzerPlugin {
-
- @Override
- public boolean analyzeJar(Analyzer analyzer) {
- Jar jar = analyzer.getJar();
- Map<String, Map<String, Resource>> dir = jar.getDirectories();
-
- Stream<String> components = dir
- .getOrDefault("META-INF/services/org/apache/camel/component", Collections.emptyMap()).keySet().stream()
- .map(s -> s.substring(s.lastIndexOf('/') + 1))
- .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.ComponentResolver\";component="
- + s);
- Stream<String> languages = dir
- .getOrDefault("META-INF/services/org/apache/camel/language", Collections.emptyMap()).keySet().stream()
- .map(s -> s.substring(s.lastIndexOf('/') + 1))
- .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.LanguageResolver\";language="
- + s);
- Stream<String> dataformats = dir
- .getOrDefault("META-INF/services/org/apache/camel/dataformat", Collections.emptyMap()).keySet().stream()
- .map(s -> s.substring(s.lastIndexOf('/') + 1))
- .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.DataformatResolver\";dataformat="
- + s);
- String header = analyzer.getProperty("Provide-Capability");
-
- header = Stream
- .concat(header != null && !header.isEmpty() ? Stream.of(header) : Stream.empty(),
- Stream.concat(components, Stream.concat(languages, dataformats)))
- .collect(Collectors.joining(","));
-
- analyzer.setProperty("Provide-Capability", header);
-
- return false;
- }
-
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
deleted file mode 100644
index 32308ce7370..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOError;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.jar.Manifest;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.zip.ZipFile;
-
-import aQute.bnd.osgi.Analyzer;
-import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Instructions;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Resource;
-import aQute.lib.collections.ExtList;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.Scanner;
-import org.osgi.service.metatype.MetaTypeService;
-import org.sonatype.plexus.build.incremental.BuildContext;
-
-/**
- * Generate an OSGi manifest for this project
- */
-@Mojo(name = "manifest", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_CLASSES)
-public class ManifestPlugin extends BundlePlugin {
- /**
- * When true, generate the manifest by rebuilding the full bundle in memory
- */
- @Parameter(property = "rebuildBundle")
- protected boolean rebuildBundle;
-
- /**
- * When true, manifest generation on incremental builds is supported in IDEs like Eclipse. Please note that the
- * underlying BND library does not support incremental build, which means always the whole manifest and SCR metadata
- * is generated.
- */
- @Parameter(property = "supportIncrementalBuild")
- private boolean supportIncrementalBuild;
-
- @Component
- private BuildContext buildContext;
-
- @Parameter(defaultValue = "${showStaleFiles}")
- private boolean showStaleFiles;
-
- @Override
- protected void execute(Map<String, String> instructions, ClassPathItem[] classpath) throws MojoExecutionException {
-
- if (supportIncrementalBuild && isUpToDate(project)) {
- return;
- }
- // in incremental build execute manifest generation only when explicitly
- // activated
- // and when any java file was touched since last build
- if (buildContext.isIncremental() && !(supportIncrementalBuild && anyJavaSourceFileTouchedSinceLastBuild())) {
- getLog().debug(
- "Skipping manifest generation because no java source file was added, updated or removed since last build.");
- return;
- }
-
- // avoid noisy logging
- PatchedLog plog = new PatchedLog(getLog());
- setLog(plog);
-
- Analyzer analyzer;
- try {
- analyzer = getAnalyzer(project, instructions, classpath);
- } catch (FileNotFoundException e) {
- throw new MojoExecutionException(
- "Cannot find " + e.getMessage() + " (manifest goal must be run after compile phase)", e);
- } catch (IOException e) {
- throw new MojoExecutionException("Error trying to generate Manifest", e);
- } catch (MojoFailureException e) {
- getLog().error(e.getLocalizedMessage());
- throw new MojoExecutionException("Error(s) found in manifest configuration", e);
- } catch (Exception e) {
- getLog().error("An internal error occurred", e);
- throw new MojoExecutionException("Internal error in maven-bundle-plugin", e);
- }
-
- File outputFile = new File(manifestLocation, "MANIFEST.MF");
-
- try {
- writeManifest(analyzer, outputFile, niceManifest, exportScr, scrLocation, buildContext, getLog());
-
- if (supportIncrementalBuild) {
- writeIncrementalInfo(project);
- }
- } catch (Exception e) {
- throw new MojoExecutionException("Error trying to write Manifest to file " + outputFile, e);
- } finally {
- try {
- analyzer.close();
- } catch (IOException e) {
- throw new MojoExecutionException("Error trying to write Manifest to file " + outputFile, e);
- }
- }
- }
-
- /**
- * Checks if any *.java file was added, updated or removed since last build in any source directory.
- */
- private boolean anyJavaSourceFileTouchedSinceLastBuild() {
- @SuppressWarnings("unchecked")
- List<String> sourceDirectories = project.getCompileSourceRoots();
- for (String sourceDirectory : sourceDirectories) {
- File directory = new File(sourceDirectory);
- Scanner scanner = buildContext.newScanner(directory);
- Scanner deleteScanner = buildContext.newDeleteScanner(directory);
- if (containsJavaFile(scanner) || containsJavaFile(deleteScanner)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean containsJavaFile(Scanner scanner) {
- String[] includes = new String[] { "**/*.java" };
- scanner.setIncludes(includes);
- scanner.scan();
- return scanner.getIncludedFiles().length > 0;
- }
-
-
- private static void exportScr(Analyzer analyzer, Jar jar, File scrLocation, BuildContext buildContext, Log log)
- throws Exception {
- log.debug("Export SCR metadata to: " + scrLocation.getPath());
- scrLocation.mkdirs();
-
- // export SCR metadata files from OSGI-INF/
- Map<String, Resource> scrDir = jar.getDirectories().get("OSGI-INF");
- if (scrDir != null) {
- for (Map.Entry<String, Resource> entry : scrDir.entrySet()) {
- String path = entry.getKey();
- Resource resource = entry.getValue();
- writeSCR(resource, new File(scrLocation, path), buildContext, log);
- }
- }
-
- // export metatype files from OSGI-INF/metatype
- Map<String, Resource> metatypeDir = jar.getDirectories().get(MetaTypeService.METATYPE_DOCUMENTS_LOCATION);
- if (metatypeDir != null) {
- for (Map.Entry<String, Resource> entry : metatypeDir.entrySet()) {
- String path = entry.getKey();
- Resource resource = entry.getValue();
- writeSCR(resource, new File(scrLocation, path), buildContext, log);
- }
- }
-
- }
-
- private static void writeSCR(Resource resource, File destination, BuildContext buildContext, Log log)
- throws Exception {
- log.debug("Write SCR file: " + destination.getPath());
- destination.getParentFile().mkdirs();
- OutputStream os = buildContext.newFileOutputStream(destination);
- try {
- resource.write(os);
- } finally {
- os.close();
- }
- }
-
- protected Analyzer getAnalyzer(MavenProject project, Map<String, String> instructions, ClassPathItem[] classpath)
- throws Exception {
- if (rebuildBundle && supportedProjectTypes.contains(project.getArtifact().getType())) {
- return buildOSGiBundle(project, instructions, classpath);
- }
-
- File file = getOutputDirectory();
- if (file == null) {
- file = project.getArtifact().getFile();
- }
-
- if (!file.exists()) {
- if (file.equals(getOutputDirectory())) {
- file.mkdirs();
- } else {
- throw new FileNotFoundException(file.getPath());
- }
- }
-
- Builder analyzer = getOSGiBuilder(project, instructions, classpath);
-
- analyzer.setJar(file);
-
- // calculateExportsFromContents when we have no explicit instructions
- // defining
- // the contents of the bundle *and* we are not analyzing the output
- // directory,
- // otherwise fall-back to addMavenInstructions approach
-
- boolean isOutputDirectory = file.equals(getOutputDirectory());
-
- if (analyzer.getProperty(Analyzer.EXPORT_PACKAGE) == null
- && analyzer.getProperty(Analyzer.EXPORT_CONTENTS) == null
- && analyzer.getProperty(Analyzer.PRIVATE_PACKAGE) == null && !isOutputDirectory) {
- String export = calculateExportsFromContents(analyzer.getJar());
- analyzer.setProperty(Analyzer.EXPORT_PACKAGE, export);
- }
-
- addMavenInstructions(project, analyzer);
-
- // if we spot Embed-Dependency and the bundle is "target/classes",
- // assume we need to rebuild
- if (analyzer.getProperty(DependencyEmbedder.EMBED_DEPENDENCY) != null && isOutputDirectory) {
- analyzer.build();
- } else {
- analyzer.mergeManifest(analyzer.getJar().getManifest());
- analyzer.getJar().setManifest(analyzer.calcManifest());
- }
-
- mergeMavenManifest(project, analyzer);
-
- boolean hasErrors = reportErrors("Manifest " + project.getArtifact(), analyzer);
- if (hasErrors) {
- String failok = analyzer.getProperty("-failok");
- if (null == failok || "false".equalsIgnoreCase(failok)) {
- throw new MojoFailureException("Error(s) found in manifest configuration");
- }
- }
-
- Jar jar = analyzer.getJar();
-
- if (unpackBundle) {
- File outputFile = getOutputDirectory();
- for (Entry<String, Resource> entry : jar.getResources().entrySet()) {
- File entryFile = new File(outputFile, entry.getKey());
- if (!entryFile.exists() || entry.getValue().lastModified() == 0) {
- entryFile.getParentFile().mkdirs();
- OutputStream os = buildContext.newFileOutputStream(entryFile);
- entry.getValue().write(os);
- os.close();
- }
- }
- }
-
- return analyzer;
- }
-
- private void writeIncrementalInfo(MavenProject project) throws MojoExecutionException {
- try {
- Path cacheData = getIncrementalDataPath(project);
- String curdata = getIncrementalData();
- Files.createDirectories(cacheData.getParent());
- try (Writer w = Files.newBufferedWriter(cacheData)) {
- w.append(curdata);
- }
- } catch (IOException e) {
- throw new MojoExecutionException("Error checking manifest uptodate status", e);
- }
- }
-
- private boolean isUpToDate(MavenProject project) throws MojoExecutionException {
- try {
- Path cacheData = getIncrementalDataPath(project);
- final String prvdata = getPreviousRunData(cacheData);
- final String curdata = getIncrementalData();
- if (curdata.equals(prvdata)) {
- long lastmod = Files.getLastModifiedTime(cacheData).toMillis();
- Set<String> stale = Stream
- .concat(Stream.of(new File(project.getBuild().getOutputDirectory())),
- project.getArtifacts().stream().map(Artifact::getFile))
- .flatMap(f -> newer(lastmod, f)).collect(Collectors.toSet());
- if (!stale.isEmpty()) {
- getLog().info("Stale files detected, re-generating manifest.");
- if (showStaleFiles) {
- getLog().info("Stale files: " + stale.stream().collect(Collectors.joining(", ")));
- } else if (getLog().isDebugEnabled()) {
- getLog().debug("Stale files: " + stale.stream().collect(Collectors.joining(", ")));
- }
- } else {
- // everything is in order, skip
- getLog().info("Skipping manifest generation, everything is up to date.");
- return true;
- }
- } else {
- if (prvdata == null) {
- getLog().info("No previous run data found, generating manifest.");
- } else {
- getLog().info("Configuration changed, re-generating manifest.");
- }
- }
- } catch (IOException e) {
- throw new MojoExecutionException("Error checking manifest uptodate status", e);
- }
- return false;
- }
-
- private String getPreviousRunData(Path cacheData) throws IOException {
- String prvdata;
- if (Files.isRegularFile(cacheData)) {
- prvdata = new String(Files.readAllBytes(cacheData), StandardCharsets.UTF_8);
- } else {
- prvdata = null;
- }
- return prvdata;
- }
-
- private String getIncrementalData() {
- return getInstructions().entrySet().stream().map(e -> e.getKey() + "=" + e.getValue())
- .collect(Collectors.joining("\n", "", "\n"));
- }
-
- private Path getIncrementalDataPath(MavenProject project) {
- return Paths.get(project.getBuild().getDirectory(), "maven-bundle-plugin",
- "org.apache.felix_maven-bundle-plugin_manifest_xx");
- }
-
- private long lastmod(Path p) {
- try {
- return Files.getLastModifiedTime(p).toMillis();
- } catch (IOException e) {
- return 0;
- }
- }
-
- private Stream<String> newer(long lastmod, File file) {
- try {
- if (file.isDirectory()) {
- return Files.walk(file.toPath()).filter(Files::isRegularFile).filter(p -> lastmod(p) > lastmod)
- .map(Path::toString);
- } else if (file.isFile()) {
- if (lastmod(file.toPath()) > lastmod) {
- if (file.getName().endsWith(".jar")) {
- try (ZipFile zf = new ZipFile(file)) {
- return zf.stream().filter(ze -> !ze.isDirectory())
- .filter(ze -> ze.getLastModifiedTime().toMillis() > lastmod)
- .map(ze -> file + "!" + ze.getName()).collect(Collectors.toList())
- .stream();
- }
- } else {
- return Stream.of(file.toString());
- }
- } else {
- return Stream.empty();
- }
- } else {
- return Stream.empty();
- }
- } catch (IOException e) {
- throw new IOError(e);
- }
- }
-
- public static void writeManifest(Analyzer analyzer, File outputFile, boolean niceManifest, boolean exportScr,
- File scrLocation, BuildContext buildContext, Log log) throws Exception {
- Properties properties = analyzer.getProperties();
- Jar jar = analyzer.getJar();
- Manifest manifest = jar.getManifest();
- if (outputFile.exists() && properties.containsKey("Merge-Headers")) {
- Manifest analyzerManifest = manifest;
- manifest = new Manifest();
-
- try(InputStream inputStream = new FileInputStream(outputFile)) {
- manifest.read(inputStream);
- }
-
- Instructions instructions = new Instructions(ExtList.from(analyzer.getProperty("Merge-Headers")));
- mergeManifest(instructions, manifest, analyzerManifest);
- } else {
- File parentFile = outputFile.getParentFile();
- parentFile.mkdirs();
- }
- writeManifest(manifest, outputFile, niceManifest, buildContext, log);
-
- if (exportScr) {
- exportScr(analyzer, jar, scrLocation, buildContext, log);
- }
- }
-
- public static void writeManifest(Manifest manifest, File outputFile, boolean niceManifest,
- BuildContext buildContext, Log log) throws IOException {
-
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- ManifestWriter.outputManifest(manifest, baos, niceManifest);
-
- if (log.isDebugEnabled()) {
- log.debug("Write manifest to " + outputFile.getPath());
- }
-
- if (updateFile(outputFile.toPath(), baos.toByteArray())) {
- buildContext.refresh(outputFile);
- }
- }
- }
-
- /**
- * Update a file with the given binary content if neeed. The file won't be modified if the content is already the
- * same.
- *
- * @param path
- * the path of the file to update
- * @param newdata
- * the new binary data, <code>null</code> to delete the file
- *
- * @return <code>true</code> if the file was modified, <code>false</code> otherwise
- *
- * @throws IOException
- * if an exception occurs
- */
- public static boolean updateFile(Path path, byte[] newdata) throws IOException {
- if (newdata == null) {
- if (!Files.exists(path)) {
- return false;
- }
- Files.delete(path);
- return true;
- } else {
- byte[] olddata = new byte[0];
- if (Files.exists(path) && Files.isReadable(path)) {
- olddata = Files.readAllBytes(path);
- }
- if (Arrays.equals(olddata, newdata)) {
- return false;
- }
- Files.createDirectories(path.getParent());
- Files.write(path, newdata, StandardOpenOption.WRITE, StandardOpenOption.CREATE,
- StandardOpenOption.TRUNCATE_EXISTING);
- return true;
- }
- }
-
- /*
- * Patched version of bnd's Analyzer.calculateExportsFromContents
- */
- public static String calculateExportsFromContents(Jar bundle) {
- String ddel = "";
- StringBuffer sb = new StringBuffer();
- Map<String, Map<String, Resource>> map = bundle.getDirectories();
- for (Iterator<Entry<String, Map<String, Resource>>> i = map.entrySet().iterator(); i.hasNext();) {
- // ----------------------------------------------------
- // should also ignore directories with no resources
- // ----------------------------------------------------
- Entry<String, Map<String, Resource>> entry = i.next();
- if (entry.getValue() == null || entry.getValue().isEmpty()) {
- continue;
- }
- // ----------------------------------------------------
- String directory = entry.getKey();
- if (directory.equals("META-INF") || directory.startsWith("META-INF/")) {
- continue;
- }
- if (directory.equals("OSGI-OPT") || directory.startsWith("OSGI-OPT/")) {
- continue;
- }
- if (directory.equals("/")) {
- continue;
- }
-
- if (directory.endsWith("/")) {
- directory = directory.substring(0, directory.length() - 1);
- }
-
- directory = directory.replace('/', '.');
- sb.append(ddel);
- sb.append(directory);
- ddel = ",";
- }
- return sb.toString();
- }
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java
deleted file mode 100644
index 86895b8c0f8..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import org.apache.maven.plugin.logging.Log;
-
-/**
- * Patched logger that is not noisy.
- */
-public class PatchedLog implements Log {
-
- private final Log delegate;
-
- public PatchedLog(Log delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public boolean isDebugEnabled() {
- return delegate.isDebugEnabled();
- }
-
- @Override
- public void debug(CharSequence charSequence) {
- delegate.debug(charSequence);
- }
-
- @Override
- public void debug(CharSequence charSequence, Throwable throwable) {
- delegate.debug(charSequence, throwable);
- }
-
- @Override
- public void debug(Throwable throwable) {
- delegate.debug(throwable);
- }
-
- @Override
- public boolean isInfoEnabled() {
- return delegate.isInfoEnabled();
- }
-
- @Override
- public void info(CharSequence charSequence) {
- delegate.info(charSequence);
- }
-
- @Override
- public void info(CharSequence charSequence, Throwable throwable) {
- delegate.info(charSequence, throwable);
- }
-
- @Override
- public void info(Throwable throwable) {
- delegate.info(throwable);
- }
-
- @Override
- public boolean isWarnEnabled() {
- return delegate.isWarnEnabled();
- }
-
- @Override
- public void warn(CharSequence charSequence) {
- // skip some unwanted WARN logging
- String s = charSequence.toString();
- if (s.startsWith("Include-Resource: overriding")) {
- return;
- }
- delegate.warn(charSequence);
- }
-
- @Override
- public void warn(CharSequence charSequence, Throwable throwable) {
- delegate.warn(charSequence, throwable);
- }
-
- @Override
- public void warn(Throwable throwable) {
- delegate.warn(throwable);
- }
-
- @Override
- public boolean isErrorEnabled() {
- return delegate.isErrorEnabled();
- }
-
- @Override
- public void error(CharSequence charSequence) {
- delegate.error(charSequence);
- }
-
- @Override
- public void error(CharSequence charSequence, Throwable throwable) {
- delegate.error(charSequence, throwable);
- }
-
- @Override
- public void error(Throwable throwable) {
- delegate.error(throwable);
- }
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
deleted file mode 100644
index 733e567e243..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.apache.maven.shared.osgi.Maven2OsgiConverter;
-
-/**
- * Clean OSGi versions, ie convert a group of versions to OSGi format.
- */
-@Mojo(name = "cleanVersions", threadSafe = true)
-public class VersionCleanerPlugin extends AbstractMojo {
-
- /**
- * The BND instructions for the bundle.
- */
- @Parameter
- private Map<String, String> versions = new LinkedHashMap<String, String>();
-
- /**
- * The Maven project.
- */
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
- private MavenProject project;
-
- private Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
-
- public Maven2OsgiConverter getMaven2OsgiConverter() {
- return maven2OsgiConverter;
- }
-
- public void setMaven2OsgiConverter(Maven2OsgiConverter maven2OsgiConverter) {
- this.maven2OsgiConverter = maven2OsgiConverter;
- }
-
- public void execute() throws MojoExecutionException, MojoFailureException {
- for (Map.Entry<String, String> entry : versions.entrySet()) {
- String name = entry.getKey();
- String version = entry.getValue();
- String osgi = maven2OsgiConverter.getVersion(version);
- project.getProperties().put(name, osgi);
- }
- }
-}
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt b/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/MANIFEST.MF b/init/camel-bundle-plugin/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt b/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 0291ff5ba9e..00000000000
--- a/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- This product includes software developed by
- Clifton Labs (https://github.com/cliftonlabs/json-simple).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/init/pom.xml b/init/pom.xml
deleted file mode 100644
index ca3e805457d..00000000000
--- a/init/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>init</artifactId>
- <packaging>pom</packaging>
-
- <name>Camel :: Init</name>
- <description>Camel Init</description>
-
- <modules>
- <module>camel-bundle-plugin</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin-version}</version>
- <configuration>
- <release>${jdk.version}</release>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin-version}</version>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0565a4895fb..36ac51301c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,7 +76,6 @@
<atlassian-fugue-version>3.0.0</atlassian-fugue-version>
<atmos-client-version>3.2.1</atmos-client-version>
<atmosphere-version>2.6.4</atmosphere-version>
- <atmosphere-version-range>[2.6,3.0)</atmosphere-version-range>
<avro-version>1.11.1</avro-version>
<avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
@@ -134,7 +133,6 @@
<couchbase-client-version>3.3.4</couchbase-client-version>
<curator-version>4.3.0</curator-version>
<cxf-version>3.5.4</cxf-version>
- <cxf-version-range>[3.5,3.6)</cxf-version-range>
<cxf-codegen-plugin-version>3.5.4</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
<cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
@@ -272,7 +270,6 @@
<javax-el3-version>3.0.0</javax-el3-version>
<javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
<javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
- <javax-activation-version-range>[0,2)</javax-activation-version-range>
<javax-activation-version>1.2.0</javax-activation-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<jakarta-mail-version>1.6.7</jakarta-mail-version>
@@ -296,7 +293,6 @@
<jclouds-version>2.5.0</jclouds-version>
<!-- jclouds must use this guava version -->
<jclouds-google-guava-version>27.1-jre</jclouds-google-guava-version>
- <jclouds-google-guava-version-range>[27.0,28.0)</jclouds-google-guava-version-range>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
<jedis-client-version>3.7.1</jedis-client-version>
@@ -362,7 +358,6 @@
<log4j2-version>2.18.0</log4j2-version>
<logback-version>1.2.11</logback-version>
<lucene-version>8.11.1</lucene-version>
- <lucene-version-range>[8,9)</lucene-version-range>
<lightcouch-version>0.2.0</lightcouch-version>
<mapstruct-version>1.5.2.Final</mapstruct-version>
<!-- needed from tooling/archetypes -->
@@ -472,7 +467,6 @@
<scala-version>2.11.12</scala-version>
<scala-datasonnet-version>2.13.9</scala-datasonnet-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
- <servlet-version-range>[3,4)</servlet-version-range>
<shiro-version>1.9.1</shiro-version>
<shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
<!-- Maven version required by Shrinkwrap -->
@@ -492,7 +486,6 @@
<snmp4j-version>2.6.3_1</snmp4j-version>
<!-- solr version aligned with lucene -->
<solr-version>8.11.2</solr-version>
- <solr-version-range>[8,9)</solr-version-range>
<solr-zookeeper-version>3.6.2</solr-zookeeper-version>
<spark-version>3.2.2</spark-version>
<splunk-version>1.9.0_1</splunk-version>
@@ -502,7 +495,6 @@
<spring-integration-version>5.5.15</spring-integration-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
<spring-vault-core-version>2.3.2</spring-vault-core-version>
- <spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
<spring5-version>5.3.24</spring5-version>
<spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
@@ -560,38 +552,6 @@
<zookeeper-version>3.5.9</zookeeper-version>
<zxing-version>3.5.0</zxing-version>
- <!-- OSGi bundles properties -->
- <camel.osgi.import.camel.version>
- version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"
- </camel.osgi.import.camel.version>
- <camel.osgi.import.strict.version>
- version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"
- </camel.osgi.import.strict.version>
- <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
- <camel.osgi.import.defaults>
- </camel.osgi.import.defaults>
- <camel.osgi.import.before.defaults />
- <camel.osgi.import.additional />
- <camel.osgi.import.pkg>
- org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.before.defaults},
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- *
- </camel.osgi.import.pkg>
- <camel.osgi.activator />
- <camel.osgi.failok>false</camel.osgi.failok>
- <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
- <camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
- <camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
- <camel.osgi.version>version=${project.version}</camel.osgi.version>
- <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
- <camel.osgi.dynamic />
- <camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
- <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
- <camel.osgi.require.capability />
- <camel.osgi.provide.capability />
- <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
</properties>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 78b3629dce7..50ea06d1324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
<modules>
<module>parent</module>
- <module>init</module>
<module>etc</module>
<module>bom</module>
<module>buildingtools</module>
diff --git a/tests/pom.xml b/tests/pom.xml
index 64f65160359..916bc578407 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -34,7 +34,6 @@
<packaging>pom</packaging>
<properties>
- <camel.osgi.export.pkg />
</properties>
<modules>
@@ -49,22 +48,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 15dfc6c7c37..f7e85d8ad4c 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -39,19 +39,6 @@
<pkgArtifactId>mock-javamail</pkgArtifactId>
<pkgVersion>1.7</pkgVersion>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <camel.osgi.export.pkg>
- org.jvnet.mock_javamail*
- </camel.osgi.export.pkg>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
- <camel.osgi.private.pkg>
- META-INF;-split-package:=merge-first,
- META-INF.services;-split-package:=merge-first
- META-INF.maven.org.apache.camel.tests*;-split-package:=merge-first
- </camel.osgi.private.pkg>
- <camel.osgi.export>${camel.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first
- </camel.osgi.export>
</properties>
<dependencies>
diff --git a/tests/test-bundles/pom.xml b/tests/test-bundles/pom.xml
index 349765e4616..373c2cbf80d 100644
--- a/tests/test-bundles/pom.xml
+++ b/tests/test-bundles/pom.xml
@@ -35,13 +35,6 @@
<properties>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <camel.osgi.export>${camel.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first
- </camel.osgi.export>
- <camel.osgi.export.pkg />
- <camel.osgi.import.pkg />
- <camel.osgi.private.pkg />
- <camel.osgi.dynamicimport.pkg />
- <camel.osgi.failok>false</camel.osgi.failok>
</properties>
<build>
@@ -86,31 +79,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <Import-Package>${camel.osgi.import.pkg}*</Import-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <DynamicImport-Package>${camel.osgi.dynamicimport.pkg}</DynamicImport-Package>
- <_failok>${camel.osgi.failok}</_failok>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
diff --git a/tooling/camel-tooling-model/pom.xml b/tooling/camel-tooling-model/pom.xml
index 15f39facbf9..8d826cd27bf 100644
--- a/tooling/camel-tooling-model/pom.xml
+++ b/tooling/camel-tooling-model/pom.xml
@@ -32,12 +32,6 @@
<description>Tooling Model</description>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
- <camel.osgi.export.pkg>
- org.apache.camel.tooling.model
- </camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -56,54 +50,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml
index d73f4e7a65a..6e0082731e8 100644
--- a/tooling/camel-tooling-util/pom.xml
+++ b/tooling/camel-tooling-util/pom.xml
@@ -32,12 +32,6 @@
<description>Tooling utilities</description>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
- <camel.osgi.export.pkg>
- org.apache.camel.tooling.util
- </camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -51,54 +45,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/tooling/camel-util-json/pom.xml b/tooling/camel-util-json/pom.xml
index 01b87dc4616..5ce54dd1712 100644
--- a/tooling/camel-util-json/pom.xml
+++ b/tooling/camel-util-json/pom.xml
@@ -32,12 +32,6 @@
<description>A json simple parser that preserves the ordering in Map as read from JSon source</description>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
- <camel.osgi.export.pkg>
- org.apache.camel.util.json
- </camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -51,54 +45,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 78b439a7f62..9944e4217be 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -72,21 +72,6 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>versions</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 288fc564645..819c01fd475 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -33,10 +33,6 @@
<description>Generator of REST DSL route definitions from OpenAPI specification</description>
<properties>
- <camel.osgi.import.pkg>
- org.apache.camel.*;${camel.osgi.import.camel.version},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
@@ -102,54 +98,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 6917d8ca7ba..5c420e4d151 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -45,6 +45,5 @@
</modules>
<properties>
- <camel.osgi.export.pkg />
</properties>
</project>
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index 2bd002e3752..1a3c500371f 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -33,13 +33,6 @@
<description>Annotations for Camel Endpoint developers</description>
<properties>
- <camel.osgi.import.pkg>
- *
- </camel.osgi.import.pkg>
- <camel.osgi.export.pkg>
- org.apache.camel.spi;
- org.apache.camel.spi.annotations
- </camel.osgi.export.pkg>
</properties>
<dependencies>
@@ -47,54 +40,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index df4a869ae11..e49ea06ec7e 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -32,10 +32,6 @@
<description>Generator of REST DSL route definitions from Swagger (OpenAPI) specification</description>
<properties>
- <camel.osgi.import.pkg>
- org.apache.camel.*;${camel.osgi.import.camel.version},
- *
- </camel.osgi.import.pkg>
</properties>
<dependencies>
@@ -83,54 +79,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-bundle-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <supportIncrementalBuild>true</supportIncrementalBuild>
- <noWarningProjectTypes>pom</noWarningProjectTypes>
- <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>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <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>
- <_removeheaders>Bnd-LastModified</_removeheaders>
- </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>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>