You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2017/02/18 14:07:46 UTC
[2/4] servicemix-bundles git commit: [SM-3261] Extend jackson version
import range in elasticsearch bundles
[SM-3261] Extend jackson version import range 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/86244ac8
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/86244ac8
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/86244ac8
Branch: refs/heads/master
Commit: 86244ac8dc1d37df01beb19b51e5cf434782732d
Parents: 1ee464e
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sat Feb 18 14:57:58 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sat Feb 18 14:57:58 2017 +0100
----------------------------------------------------------------------
elasticsearch-2.3.0/pom.xml | 9 ++++-----
elasticsearch-2.3.1/pom.xml | 9 ++++-----
elasticsearch-2.3.5/pom.xml | 9 ++++-----
elasticsearch-2.4.0/pom.xml | 9 ++++-----
elasticsearch-2.4.3/pom.xml | 10 ++++------
5 files changed, 20 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/86244ac8/elasticsearch-2.3.0/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.3.0/pom.xml b/elasticsearch-2.3.0/pom.xml
index aa6d6cb..358d890 100644
--- a/elasticsearch-2.3.0/pom.xml
+++ b/elasticsearch-2.3.0/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,8 +52,8 @@
<servicemix.osgi.import.pkg>
com.google.common.collect,
com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml,
- com.fasterxml.jackson.dataformat.smile,
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
com.sun.jna;resolution:=optional,
com.ning.compress.lzf.util,
*;resolution:=optional
@@ -62,11 +62,10 @@
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.*
+ META-INF.*;-split-package:=merge-first
</servicemix.osgi.private.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/86244ac8/elasticsearch-2.3.1/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.3.1/pom.xml b/elasticsearch-2.3.1/pom.xml
index 04369d0..e642be3 100644
--- a/elasticsearch-2.3.1/pom.xml
+++ b/elasticsearch-2.3.1/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,8 +52,8 @@
<servicemix.osgi.import.pkg>
com.google.common.collect,
com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml,
- com.fasterxml.jackson.dataformat.smile,
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
com.sun.jna;resolution:=optional,
com.ning.compress.lzf.util,
*;resolution:=optional
@@ -62,11 +62,10 @@
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.*
+ META-INF.*;-split-package:=merge-first
</servicemix.osgi.private.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/86244ac8/elasticsearch-2.3.5/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.3.5/pom.xml b/elasticsearch-2.3.5/pom.xml
index b9b6c5b..0be2410 100644
--- a/elasticsearch-2.3.5/pom.xml
+++ b/elasticsearch-2.3.5/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,8 +52,8 @@
<servicemix.osgi.import.pkg>
com.google.common.collect,
com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml,
- com.fasterxml.jackson.dataformat.smile,
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
com.sun.jna;resolution:=optional,
com.ning.compress.lzf.util,
*;resolution:=optional
@@ -62,11 +62,10 @@
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.*
+ META-INF.*;-split-package:=merge-first
</servicemix.osgi.private.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/86244ac8/elasticsearch-2.4.0/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.4.0/pom.xml b/elasticsearch-2.4.0/pom.xml
index 0535ad4..5cc7de9 100644
--- a/elasticsearch-2.4.0/pom.xml
+++ b/elasticsearch-2.4.0/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,8 +52,8 @@
<servicemix.osgi.import.pkg>
com.google.common.collect,
com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml,
- com.fasterxml.jackson.dataformat.smile,
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
com.sun.jna;resolution:=optional,
com.ning.compress.lzf.util,
*;resolution:=optional
@@ -62,11 +62,10 @@
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.*
+ META-INF.*;-split-package:=merge-first
</servicemix.osgi.private.pkg>
</properties>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/86244ac8/elasticsearch-2.4.3/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.4.3/pom.xml b/elasticsearch-2.4.3/pom.xml
index 71001a6..88c41f3 100644
--- a/elasticsearch-2.4.3/pom.xml
+++ b/elasticsearch-2.4.3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,8 +52,8 @@
<servicemix.osgi.import.pkg>
com.google.common.collect,
com.fasterxml.jackson.core;version="[2.6,3)",
- com.fasterxml.jackson.dataformat.yaml,
- com.fasterxml.jackson.dataformat.smile,
+ com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
com.sun.jna;resolution:=optional,
com.ning.compress.lzf.util,
*;resolution:=optional
@@ -62,11 +62,9 @@
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.*
+ com.carrotsearch.hppc*
</servicemix.osgi.private.pkg>
</properties>