You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2023/02/16 17:47:08 UTC
[karaf-decanter] branch main updated: [KARAF-7646] Upgrade to OSGi R8 and use atomic service artifacts
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/main by this push:
new 3a5dc67f [KARAF-7646] Upgrade to OSGi R8 and use atomic service artifacts
new 7f931747 Merge pull request #328 from jbonofre/KARAF-7646
3a5dc67f is described below
commit 3a5dc67fcfc28cb7b93ae2724d663d1743bbc2c1
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Feb 14 07:28:10 2023 +0100
[KARAF-7646] Upgrade to OSGi R8 and use atomic service artifacts
---
alerting/alerter/camel/pom.xml | 20 ++++++++++++++++++++
alerting/alerter/email/pom.xml | 20 ++++++++++++++++++++
alerting/alerter/log/pom.xml | 18 ++++++++++++++++++
alerting/service/pom.xml | 14 ++++++++++++--
appender/camel/pom.xml | 20 ++++++++++++++++++++
appender/cassandra/pom.xml | 15 +++++++++++++++
appender/dropwizard/pom.xml | 15 +++++++++++++++
appender/elasticsearch/pom.xml | 15 +++++++++++++++
appender/file/pom.xml | 15 +++++++++++++++
appender/hdfs/pom.xml | 20 ++++++++++++++++++++
appender/influxdb/pom.xml | 15 +++++++++++++++
appender/jdbc/pom.xml | 15 +++++++++++++++
appender/jms/pom.xml | 15 +++++++++++++++
appender/kafka/pom.xml | 15 +++++++++++++++
appender/log/pom.xml | 15 +++++++++++++++
appender/loki/pom.xml | 15 +++++++++++++++
appender/mongodb/pom.xml | 15 +++++++++++++++
appender/mqtt/pom.xml | 15 +++++++++++++++
appender/orientdb/pom.xml | 15 +++++++++++++++
appender/prometheus/pom.xml | 21 +++++++++++++++++++++
appender/redis/pom.xml | 15 +++++++++++++++
appender/rest/pom.xml | 15 +++++++++++++++
appender/s3/pom.xml | 15 +++++++++++++++
appender/socket/pom.xml | 15 +++++++++++++++
appender/timescaledb/pom.xml | 15 +++++++++++++++
appender/utils/pom.xml | 2 +-
appender/websocket-servlet/pom.xml | 21 +++++++++++++++++++++
collector/camel/pom.xml | 5 +++++
collector/configadmin/pom.xml | 20 ++++++++++++++++++++
collector/dropwizard/pom.xml | 15 +++++++++++++++
collector/druid/pom.xml | 15 +++++++++++++++
collector/elasticsearch/pom.xml | 15 +++++++++++++++
collector/eventadmin/pom.xml | 15 +++++++++++++++
collector/file/pom.xml | 20 ++++++++++++++++++++
collector/jdbc/pom.xml | 15 +++++++++++++++
collector/jetty/pom.xml | 15 +++++++++++++++
collector/jms/pom.xml | 15 +++++++++++++++
collector/jmx/pom.xml | 15 +++++++++++++++
collector/kafka/pom.xml | 15 +++++++++++++++
collector/log4j-socket/pom.xml | 15 +++++++++++++++
collector/mqtt/pom.xml | 15 +++++++++++++++
collector/openstack/pom.xml | 15 +++++++++++++++
collector/oshi/pom.xml | 15 +++++++++++++++
collector/prometheus/pom.xml | 15 +++++++++++++++
collector/redis/pom.xml | 15 +++++++++++++++
collector/rest-servlet/pom.xml | 15 +++++++++++++++
collector/rest/pom.xml | 15 +++++++++++++++
collector/snmp/pom.xml | 15 +++++++++++++++
collector/soap/pom.xml | 15 +++++++++++++++
collector/socket/pom.xml | 15 +++++++++++++++
collector/system/pom.xml | 15 +++++++++++++++
marshaller/csv/pom.xml | 15 +++++++++++++++
marshaller/json/pom.xml | 15 +++++++++++++++
marshaller/raw/pom.xml | 10 ++++++++++
parser/identity/pom.xml | 10 ++++++++++
parser/regex/pom.xml | 10 ++++++++++
parser/split/pom.xml | 10 ++++++++++
pom.xml | 26 ++++++++++++++++++--------
processor/aggregate/pom.xml | 18 ++++++++++++++++++
processor/camel/pom.xml | 15 +++++++++++++++
processor/groupby/pom.xml | 18 ++++++++++++++++++
processor/passthrough/pom.xml | 18 ++++++++++++++++++
62 files changed, 940 insertions(+), 11 deletions(-)
diff --git a/alerting/alerter/camel/pom.xml b/alerting/alerter/camel/pom.xml
index 8ddb20b3..0198a207 100644
--- a/alerting/alerter/camel/pom.xml
+++ b/alerting/alerter/camel/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Alerting :: Camel</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
diff --git a/alerting/alerter/email/pom.xml b/alerting/alerter/email/pom.xml
index d9e884b8..90c7c33d 100644
--- a/alerting/alerter/email/pom.xml
+++ b/alerting/alerter/email/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Alerting :: e-mail</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
diff --git a/alerting/alerter/log/pom.xml b/alerting/alerter/log/pom.xml
index ee5648fe..f2d09005 100644
--- a/alerting/alerter/log/pom.xml
+++ b/alerting/alerter/log/pom.xml
@@ -33,4 +33,22 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: Alerting :: Log</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
diff --git a/alerting/service/pom.xml b/alerting/service/pom.xml
index 4683f294..7d684b5c 100644
--- a/alerting/service/pom.xml
+++ b/alerting/service/pom.xml
@@ -40,9 +40,19 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index af335a41..05893525 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Appender :: Camel</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-core-osgi</artifactId>
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index f82be879..5904946d 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -32,6 +32,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Cassandra</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/dropwizard/pom.xml b/appender/dropwizard/pom.xml
index 0309b9e9..08133854 100644
--- a/appender/dropwizard/pom.xml
+++ b/appender/dropwizard/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Dropwizard Metrics</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
diff --git a/appender/elasticsearch/pom.xml b/appender/elasticsearch/pom.xml
index 720013ca..dfb75070 100644
--- a/appender/elasticsearch/pom.xml
+++ b/appender/elasticsearch/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Elasticsearch</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/file/pom.xml b/appender/file/pom.xml
index e5880538..dbd5a65c 100644
--- a/appender/file/pom.xml
+++ b/appender/file/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: File</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/hdfs/pom.xml b/appender/hdfs/pom.xml
index a8ac4a77..72e1e1a5 100644
--- a/appender/hdfs/pom.xml
+++ b/appender/hdfs/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Appender :: HDFS</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
diff --git a/appender/influxdb/pom.xml b/appender/influxdb/pom.xml
index 441b24b5..70dac882 100644
--- a/appender/influxdb/pom.xml
+++ b/appender/influxdb/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: InfluxDB</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/jdbc/pom.xml b/appender/jdbc/pom.xml
index 8ebc5df8..7cf4ef58 100644
--- a/appender/jdbc/pom.xml
+++ b/appender/jdbc/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: JDBC</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
diff --git a/appender/jms/pom.xml b/appender/jms/pom.xml
index 1faafda1..cad19bfe 100644
--- a/appender/jms/pom.xml
+++ b/appender/jms/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: JMS</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index 37140b8a..7a4c8d2e 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Kafka</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/log/pom.xml b/appender/log/pom.xml
index 3ca2c1bb..0361a0e1 100644
--- a/appender/log/pom.xml
+++ b/appender/log/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Log</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/loki/pom.xml b/appender/loki/pom.xml
index c30d1946..71211d1e 100644
--- a/appender/loki/pom.xml
+++ b/appender/loki/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Loki</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/mongodb/pom.xml b/appender/mongodb/pom.xml
index e683f229..11cf7b54 100644
--- a/appender/mongodb/pom.xml
+++ b/appender/mongodb/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: MongoDB</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/mqtt/pom.xml b/appender/mqtt/pom.xml
index b24d4ae5..bfb27c7f 100644
--- a/appender/mqtt/pom.xml
+++ b/appender/mqtt/pom.xml
@@ -33,6 +33,21 @@
<name>Apache Karaf :: Decanter :: Appender :: MQTT</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
diff --git a/appender/orientdb/pom.xml b/appender/orientdb/pom.xml
index e467693b..10499b44 100644
--- a/appender/orientdb/pom.xml
+++ b/appender/orientdb/pom.xml
@@ -34,6 +34,21 @@
<packaging>bundle</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/prometheus/pom.xml b/appender/prometheus/pom.xml
index b027aedf..d01eaaa7 100644
--- a/appender/prometheus/pom.xml
+++ b/appender/prometheus/pom.xml
@@ -34,6 +34,27 @@
<name>Apache Karaf :: Decanter :: Appender :: Prometheus</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
diff --git a/appender/redis/pom.xml b/appender/redis/pom.xml
index c47b56cb..6fe6fcfa 100644
--- a/appender/redis/pom.xml
+++ b/appender/redis/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Redis</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
diff --git a/appender/rest/pom.xml b/appender/rest/pom.xml
index 54e10e48..df3921b0 100644
--- a/appender/rest/pom.xml
+++ b/appender/rest/pom.xml
@@ -38,6 +38,21 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/s3/pom.xml b/appender/s3/pom.xml
index e72d6ab3..87957228 100644
--- a/appender/s3/pom.xml
+++ b/appender/s3/pom.xml
@@ -46,6 +46,21 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
diff --git a/appender/socket/pom.xml b/appender/socket/pom.xml
index b0b8a432..6b0e7b1d 100644
--- a/appender/socket/pom.xml
+++ b/appender/socket/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: Socket</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/appender/timescaledb/pom.xml b/appender/timescaledb/pom.xml
index 6eef11f4..1d429a50 100644
--- a/appender/timescaledb/pom.xml
+++ b/appender/timescaledb/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Appender :: TimescaleDB</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
diff --git a/appender/utils/pom.xml b/appender/utils/pom.xml
index fcc0cb7d..08479059 100644
--- a/appender/utils/pom.xml
+++ b/appender/utils/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.event</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/appender/websocket-servlet/pom.xml b/appender/websocket-servlet/pom.xml
index 4c8d1aef..58cb58fa 100644
--- a/appender/websocket-servlet/pom.xml
+++ b/appender/websocket-servlet/pom.xml
@@ -34,6 +34,27 @@
<name>Apache Karaf :: Decanter :: Appender :: Websocket Servlet</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
diff --git a/collector/camel/pom.xml b/collector/camel/pom.xml
index 4a731245..3637298a 100644
--- a/collector/camel/pom.xml
+++ b/collector/camel/pom.xml
@@ -34,6 +34,11 @@
<name>Apache Karaf :: Decanter :: Collector :: Camel</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
diff --git a/collector/configadmin/pom.xml b/collector/configadmin/pom.xml
index ca221343..f2f6dcb5 100644
--- a/collector/configadmin/pom.xml
+++ b/collector/configadmin/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Collector :: ConfigAdmin</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/dropwizard/pom.xml b/collector/dropwizard/pom.xml
index 93c995ea..b803dec0 100644
--- a/collector/dropwizard/pom.xml
+++ b/collector/dropwizard/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: DropWizard</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/druid/pom.xml b/collector/druid/pom.xml
index 39df6876..54ed2578 100644
--- a/collector/druid/pom.xml
+++ b/collector/druid/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Druid</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/elasticsearch/pom.xml b/collector/elasticsearch/pom.xml
index d636e44f..a311dbb1 100644
--- a/collector/elasticsearch/pom.xml
+++ b/collector/elasticsearch/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Elasticsearch</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
diff --git a/collector/eventadmin/pom.xml b/collector/eventadmin/pom.xml
index 201bd564..6ba107b4 100644
--- a/collector/eventadmin/pom.xml
+++ b/collector/eventadmin/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: EventAdmin</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/file/pom.xml b/collector/file/pom.xml
index c7b3001a..c140c52c 100644
--- a/collector/file/pom.xml
+++ b/collector/file/pom.xml
@@ -34,6 +34,26 @@
<name>Apache Karaf :: Decanter :: Collector :: File</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/collector/jdbc/pom.xml b/collector/jdbc/pom.xml
index 74827017..52393a3d 100644
--- a/collector/jdbc/pom.xml
+++ b/collector/jdbc/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: JDBC</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/jetty/pom.xml b/collector/jetty/pom.xml
index d47159d4..22a3c07d 100644
--- a/collector/jetty/pom.xml
+++ b/collector/jetty/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Jetty Handler</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/jms/pom.xml b/collector/jms/pom.xml
index 7946e476..c970545d 100644
--- a/collector/jms/pom.xml
+++ b/collector/jms/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: JMS</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/jmx/pom.xml b/collector/jmx/pom.xml
index dc5640c3..ec37ad49 100644
--- a/collector/jmx/pom.xml
+++ b/collector/jmx/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: JMX</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index fbc1fc7c..c725c02b 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Kafka</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/log4j-socket/pom.xml b/collector/log4j-socket/pom.xml
index cd69de80..0d1f284e 100644
--- a/collector/log4j-socket/pom.xml
+++ b/collector/log4j-socket/pom.xml
@@ -33,6 +33,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Log Socket</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
diff --git a/collector/mqtt/pom.xml b/collector/mqtt/pom.xml
index e0a49359..edaa882a 100644
--- a/collector/mqtt/pom.xml
+++ b/collector/mqtt/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: MQTT</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/openstack/pom.xml b/collector/openstack/pom.xml
index 91aa3f54..2483f78a 100644
--- a/collector/openstack/pom.xml
+++ b/collector/openstack/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: OpenStack</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/oshi/pom.xml b/collector/oshi/pom.xml
index 325feaee..8b0c1ca9 100644
--- a/collector/oshi/pom.xml
+++ b/collector/oshi/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: OSHI</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/prometheus/pom.xml b/collector/prometheus/pom.xml
index b4493067..275f4d98 100644
--- a/collector/prometheus/pom.xml
+++ b/collector/prometheus/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Prometheus</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter.collector</groupId>
<artifactId>org.apache.karaf.decanter.collector.utils</artifactId>
diff --git a/collector/redis/pom.xml b/collector/redis/pom.xml
index f0fbe326..4a16d7ea 100644
--- a/collector/redis/pom.xml
+++ b/collector/redis/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Redis</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
diff --git a/collector/rest-servlet/pom.xml b/collector/rest-servlet/pom.xml
index 87142346..f9738d7a 100644
--- a/collector/rest-servlet/pom.xml
+++ b/collector/rest-servlet/pom.xml
@@ -33,6 +33,21 @@
<name>Apache Karaf :: Decanter :: Collector :: REST :: Servlet</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/collector/rest/pom.xml b/collector/rest/pom.xml
index 4dcde124..9b98ec9e 100644
--- a/collector/rest/pom.xml
+++ b/collector/rest/pom.xml
@@ -38,6 +38,21 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/snmp/pom.xml b/collector/snmp/pom.xml
index e922a7c9..f9989409 100644
--- a/collector/snmp/pom.xml
+++ b/collector/snmp/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: SNMP</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Still using 2.8.6 to work with JDK 8 -->
<dependency>
<groupId>org.snmp4j</groupId>
diff --git a/collector/soap/pom.xml b/collector/soap/pom.xml
index 857128d5..88b4d724 100644
--- a/collector/soap/pom.xml
+++ b/collector/soap/pom.xml
@@ -38,6 +38,21 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/socket/pom.xml b/collector/socket/pom.xml
index a90f4861..2d51a5a0 100644
--- a/collector/socket/pom.xml
+++ b/collector/socket/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: Socket</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/collector/system/pom.xml b/collector/system/pom.xml
index b52da85e..747af19e 100644
--- a/collector/system/pom.xml
+++ b/collector/system/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Collector :: System</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
diff --git a/marshaller/csv/pom.xml b/marshaller/csv/pom.xml
index 21b49252..62a27e49 100644
--- a/marshaller/csv/pom.xml
+++ b/marshaller/csv/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Marshaller :: CSV</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/marshaller/json/pom.xml b/marshaller/json/pom.xml
index 2bf3e984..6c1ae2df 100644
--- a/marshaller/json/pom.xml
+++ b/marshaller/json/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Marshaller :: Json</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/marshaller/raw/pom.xml b/marshaller/raw/pom.xml
index 0ca779ef..6dc16c7e 100644
--- a/marshaller/raw/pom.xml
+++ b/marshaller/raw/pom.xml
@@ -34,6 +34,16 @@
<name>Apache Karaf :: Decanter :: Marshaller :: Raw</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/parser/identity/pom.xml b/parser/identity/pom.xml
index 0494d4b0..914beb32 100644
--- a/parser/identity/pom.xml
+++ b/parser/identity/pom.xml
@@ -34,6 +34,16 @@
<name>Apache Karaf :: Decanter :: Parser :: Identity</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/parser/regex/pom.xml b/parser/regex/pom.xml
index bf0cee18..6a673459 100644
--- a/parser/regex/pom.xml
+++ b/parser/regex/pom.xml
@@ -34,6 +34,16 @@
<name>Apache Karaf :: Decanter :: Parser :: Regex</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/parser/split/pom.xml b/parser/split/pom.xml
index 58d07536..9f2b9d30 100644
--- a/parser/split/pom.xml
+++ b/parser/split/pom.xml
@@ -34,6 +34,16 @@
<name>Apache Karaf :: Decanter :: Parser :: Split</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
diff --git a/pom.xml b/pom.xml
index c6763263..16fdd9aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -294,12 +294,27 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>8.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
</dependency>
<!-- Karaf -->
@@ -384,11 +399,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/processor/aggregate/pom.xml b/processor/aggregate/pom.xml
index 0001eca6..57fef1c9 100644
--- a/processor/aggregate/pom.xml
+++ b/processor/aggregate/pom.xml
@@ -33,6 +33,24 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: Processor :: Aggregate</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/processor/camel/pom.xml b/processor/camel/pom.xml
index 6ad61e71..fbbade06 100644
--- a/processor/camel/pom.xml
+++ b/processor/camel/pom.xml
@@ -34,6 +34,21 @@
<name>Apache Karaf :: Decanter :: Processor :: Camel</name>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-core-osgi</artifactId>
diff --git a/processor/groupby/pom.xml b/processor/groupby/pom.xml
index a94df85e..460abae8 100644
--- a/processor/groupby/pom.xml
+++ b/processor/groupby/pom.xml
@@ -33,6 +33,24 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: Processor :: GroupBy</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/processor/passthrough/pom.xml b/processor/passthrough/pom.xml
index dcb37dfb..f3872a97 100644
--- a/processor/passthrough/pom.xml
+++ b/processor/passthrough/pom.xml
@@ -33,6 +33,24 @@
<packaging>bundle</packaging>
<name>Apache Karaf :: Decanter :: Processor :: Pass Through</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>