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 2019/12/07 08:48:19 UTC
[karaf-decanter] branch master updated: [KARAF-6227] Fix influxdb
appender headers
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new f351e40 [KARAF-6227] Fix influxdb appender headers
new 9c538a1 Merge pull request #112 from jbonofre/KARAF-6227
f351e40 is described below
commit f351e40033523682b62a352fcd83bd9002e835eb
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Dec 7 06:42:04 2019 +0100
[KARAF-6227] Fix influxdb appender headers
---
appender/influxdb/pom.xml | 63 +++++++++++++++++++++-
...org.apache.karaf.decanter.appender.influxdb.cfg | 2 +-
assembly/src/main/feature/feature.xml | 7 ---
3 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/appender/influxdb/pom.xml b/appender/influxdb/pom.xml
index 655f7d6..87b87b1 100644
--- a/appender/influxdb/pom.xml
+++ b/appender/influxdb/pom.xml
@@ -67,11 +67,72 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>!*</Export-Package>
<Import-Package>
+ !org.influxdb,
+ !org.influxdb.annotation,
+ !org.influxdb.dto,
+ !org.influxdb.impl,
+ !org.influxdb.msgpack,
+ !retrofit2,
+ !retrofit2.converter.moshi,
+ !retrofit2.http,
+ !com.squareup.moshi,
+ !okhttp3,
+ !okhttp3.internal,
+ !okhttp3.internal.cache,
+ !okhttp3.internal.connection,
+ !okhttp3.internal.http,
+ !okhttp3.intenral.http1,
+ !okhttp3.internal.http2,
+ !okhttp3.internal.io,
+ !okhttp3.internal.platform,
+ !okhttp3.internal.publicsuffix,
+ !okhttp3.internal.tls,
+ !okhttp3.internal.ws,
+ !okhttp3.logging,
+ !okio,
+ !org.conscrypt,
+ !org.msgpack.core,
+ !org.msgpack.core.buffer,
+ !org.msgpack.value,
+ !org.msgpack.value.impl,
+ android*;resolution:=optional,
+ com.android*;resolution:=optional,
+ dalvik.system;resolution:=optional,
+ sun.security*;resolution:=optional,
+ org.apache.harmony*;resolution:=optional,
*
</Import-Package>
<Private-Package>
org.apache.karaf.decanter.appender.influxdb,
- org.apache.karaf.decanter.appender.utils
+ org.apache.karaf.decanter.appender.utils,
+ org.influxdb,
+ org.influxdb.annotation,
+ org.influxdb.impl,
+ org.influxdb.dto,
+ org.influxdb.msgpack,
+ retrofit2,
+ retrofit2.converter.moshi,
+ retrofit2.http,
+ com.squareup.moshi,
+ okhttp3,
+ okhttp3.internal,
+ okhttp3.internal.cache,
+ okhttp3.internal.connection,
+ okhttp3.internal.http,
+ okhttp3.internal.http1,
+ okhttp3.internal.http2,
+ okhttp3.internal.io,
+ okhttp3.internal.platform,
+ okhttp3.internal.publicsuffix,
+ okhttp3.internal.tls,
+ okhttp3.internal.ws,
+ okhttp3.logging,
+ okio,
+ org.conscrypt,
+ org.msgpack.core,
+ org.msgpack.core.buffer,
+ org.msgpack.value,
+ org.msgpack.value.impl
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
diff --git a/appender/influxdb/src/main/cfg/org.apache.karaf.decanter.appender.influxdb.cfg b/appender/influxdb/src/main/cfg/org.apache.karaf.decanter.appender.influxdb.cfg
index 9dab7aa..6e4b28d 100644
--- a/appender/influxdb/src/main/cfg/org.apache.karaf.decanter.appender.influxdb.cfg
+++ b/appender/influxdb/src/main/cfg/org.apache.karaf.decanter.appender.influxdb.cfg
@@ -22,7 +22,7 @@
##########################################
# URL of the InfluxDB database
-url=
+url=http://localhost:8086
# InfluxDB server username
#username=
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index cc91619..bf06def 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -327,13 +327,6 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-influxdb-core" version="${project.version}" description="Karaf Decanter InfluxDB Appender core">
<feature>decanter-common</feature>
- <bundle dependency="true">mvn:com.google.guava/guava/16.0.1</bundle>
- <bundle dependency="true">mvn:org.jetbrains.kotlin/kotlin-osgi-bundle/1.3.21</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.retrofit/2.5.0_1</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.15.0_1</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.14.0_1</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.influxdb-java/2.15_1</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.influxdb/${project.version}</bundle>
</feature>