Repository: servicemix-bundles Updated Branches: refs/heads/master d965c1122 -> e45e5ae1f
SM-2869 - Fix import and private packages in elasticsearch bundles Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/e45e5ae1 Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/e45e5ae1 Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/e45e5ae1 Branch: refs/heads/master Commit: e45e5ae1feae49e7834c764e492a2e795db5d1a1 Parents: d965c11 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Feb 15 07:50:36 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Feb 15 07:50:36 2016 +0100 ---------------------------------------------------------------------- elasticsearch-2.0.0/pom.xml | 11 ++++++++++- elasticsearch-2.0.1/pom.xml | 13 +++++++++++-- elasticsearch-2.0.2/pom.xml | 13 +++++++++++-- elasticsearch-2.1.0/pom.xml | 11 ++++++++++- elasticsearch-2.1.1/pom.xml | 11 ++++++++++- pom.xml | 5 +++++ 6 files changed, 57 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/elasticsearch-2.0.0/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch-2.0.0/pom.xml b/elasticsearch-2.0.0/pom.xml index b231e19..d3f3831 100644 --- a/elasticsearch-2.0.0/pom.xml +++ b/elasticsearch-2.0.0/pom.xml @@ -50,13 +50,22 @@ org.elasticsearch </servicemix.osgi.export.pkg> <servicemix.osgi.import.pkg> - *;resolution:=optional, + com.google.common.collect, + com.fasterxml.jackson.core;version="[2.6,3)", + com.fasterxml.jackson.dataformat.yaml, + com.fasterxml.jackson.dataformat.smile, + com.ning.compress.lzf.util, + com.sun.jna;resolution:=optional, + *;resolution:=optional </servicemix.osgi.import.pkg> <servicemix.osgi.private.pkg> org.joda.time*;-split-package:=merge-first, org.apache.lucene*;-split-package:=merge-first, org.tartarus.snowball*, org.apache.regexp, + com.twitter.jsr166e, + com.tdunning.math.stats, + com.carrotsearch.hppc*, META-INF.* </servicemix.osgi.private.pkg> </properties> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/elasticsearch-2.0.1/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch-2.0.1/pom.xml b/elasticsearch-2.0.1/pom.xml index 06fd32e..f5d48d2 100644 --- a/elasticsearch-2.0.1/pom.xml +++ b/elasticsearch-2.0.1/pom.xml @@ -50,13 +50,22 @@ org.elasticsearch </servicemix.osgi.export.pkg> <servicemix.osgi.import.pkg> - *;resolution:=optional, + com.google.common.collect, + com.fasterxml.jackson.core;version="[2.6,3)", + com.fasterxml.jackson.dataformat.yaml, + com.fasterxml.jackson.dataformat.smile, + com.ning.compress.lzf.util, + com.sun.jna;resolution:=optional, + *;resolution:=optional </servicemix.osgi.import.pkg> <servicemix.osgi.private.pkg> - org.joda.time*;split-package:=merge-first, + org.joda.time*;-split-package:=merge-first, org.apache.lucene*;-split-package:=merge-first, org.tartarus.snowball*, org.apache.regexp, + com.twitter.jsr166e, + com.tdunning.math.stats, + com.carrotsearch.hppc*, META-INF.* </servicemix.osgi.private.pkg> </properties> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/elasticsearch-2.0.2/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch-2.0.2/pom.xml b/elasticsearch-2.0.2/pom.xml index 94db3e6..3fe0c9a 100644 --- a/elasticsearch-2.0.2/pom.xml +++ b/elasticsearch-2.0.2/pom.xml @@ -50,13 +50,22 @@ org.elasticsearch </servicemix.osgi.export.pkg> <servicemix.osgi.import.pkg> - *;resolution:=optional, + com.google.common.collect, + com.fasterxml.jackson.core;version="[2.6,3)", + com.fasterxml.jackson.dataformat.yaml, + com.fasterxml.jackson.dataformat.smile, + com.ning.compress.lzf.util, + com.sun.jna;resolution:=optional, + *;resolution:=optional </servicemix.osgi.import.pkg> <servicemix.osgi.private.pkg> - org.joda.time*;split-package:=merge-first, + org.joda.time*;-split-package:=merge-first, org.apache.lucene*;-split-package:=merge-first, org.tartarus.snowball*, org.apache.regexp, + com.twitter.jsr166e, + com.tdunning.math.stats, + com.carrotsearch.hppc*, META-INF.* </servicemix.osgi.private.pkg> </properties> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/elasticsearch-2.1.0/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch-2.1.0/pom.xml b/elasticsearch-2.1.0/pom.xml index 7418b56..4e88268 100644 --- a/elasticsearch-2.1.0/pom.xml +++ b/elasticsearch-2.1.0/pom.xml @@ -50,13 +50,22 @@ org.elasticsearch </servicemix.osgi.export.pkg> <servicemix.osgi.import.pkg> - *;resolution:=optional, + com.google.common.collect, + com.fasterxml.jackson.core;version="[2.6,3)", + com.fasterxml.jackson.dataformat.yaml, + com.fasterxml.jackson.dataformat.smile, + com.ning.compress.lzf.util, + com.sun.jna;resolution:=optional, + *;resolution:=optional </servicemix.osgi.import.pkg> <servicemix.osgi.private.pkg> org.joda.time*;-split-package:=merge-first, org.apache.lucene*;-split-package:=merge-first, org.tartarus.snowball*, org.apache.regexp, + com.twitter.jsr166e, + com.tdunning.math.stats, + com.carrotsearch.hppc*, META-INF.* </servicemix.osgi.private.pkg> </properties> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/elasticsearch-2.1.1/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch-2.1.1/pom.xml b/elasticsearch-2.1.1/pom.xml index ab2bd84..3000e7c 100644 --- a/elasticsearch-2.1.1/pom.xml +++ b/elasticsearch-2.1.1/pom.xml @@ -50,13 +50,22 @@ org.elasticsearch </servicemix.osgi.export.pkg> <servicemix.osgi.import.pkg> - *;resolution:=optional, + com.google.common.collect, + com.fasterxml.jackson.core;version="[2.6,3)", + com.fasterxml.jackson.dataformat.yaml, + com.fasterxml.jackson.dataformat.smile, + com.sun.jna;resolution:=optional, + com.ning.compress.lzf.util, + *;resolution:=optional </servicemix.osgi.import.pkg> <servicemix.osgi.private.pkg> org.joda.time*;-split-package:=merge-first, org.apache.lucene*;-split-package:=merge-first, org.tartarus.snowball*, org.apache.regexp, + com.twitter.jsr166e, + com.tdunning.math.stats, + com.carrotsearch.hppc*, META-INF.* </servicemix.osgi.private.pkg> </properties> http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e45e5ae1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 17c1e34..04225c0 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,11 @@ <modules> <!-- add modules for all bundles to released in the next batch here --> <module>jest-0.1.6</module> + <module>elasticsearch-2.1.1</module> + <module>elasticsearch-2.1.0</module> + <module>elasticsearch-2.0.2</module> + <module>elasticsearch-2.0.1</module> + <module>elasticsearch-2.0.0</module> </modules> </project>
