Repository: karaf-decanter Updated Branches: refs/heads/master 1bd657db5 -> 469591ba9
[KARAF-4757] - Decanter: elasticsearch-appender-rest shouldn't be dependent on http Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/469591ba Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/469591ba Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/469591ba Branch: refs/heads/master Commit: 469591ba9e1bae0349b27443706626846a9ee155 Parents: 1bd657d Author: anierbeck <[email protected]> Authored: Tue Oct 11 17:22:28 2016 +0200 Committer: anierbeck <[email protected]> Committed: Tue Oct 11 17:22:28 2016 +0200 ---------------------------------------------------------------------- appender/elasticsearch-rest/pom.xml | 2 +- assembly/src/main/feature/feature.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/469591ba/appender/elasticsearch-rest/pom.xml ---------------------------------------------------------------------- diff --git a/appender/elasticsearch-rest/pom.xml b/appender/elasticsearch-rest/pom.xml index 91f45b1..e282fdb 100644 --- a/appender/elasticsearch-rest/pom.xml +++ b/appender/elasticsearch-rest/pom.xml @@ -70,7 +70,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>org.apache.log;resolution:=optional,*</Import-Package> + <Import-Package>!javax.servlet*, org.apache.log;resolution:=optional,*</Import-Package> <Private-Package> org.apache.karaf.decanter.appender.elasticsearch.rest, org.apache.http*, http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/469591ba/assembly/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml index e39d788..601f4f5 100644 --- a/assembly/src/main/feature/feature.xml +++ b/assembly/src/main/feature/feature.xml @@ -151,7 +151,6 @@ </feature> <feature name="decanter-appender-elasticsearch-rest" version="${project.version}" description="Karaf Decanter Elasticsearch HTTP REST Appender"> - <feature>http</feature> <feature>decanter-common</feature> <bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch.rest/${project.version}</bundle> <configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.rest.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch.rest/${project.version}/cfg</configfile>
