servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/3] servicemix-bundles git commit: [SM-3597] Ship elasticsearch nett4 transport plugin in elasticsearch 6.x bundle
Date Tue, 30 Jan 2018 09:23:31 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master c14c1996e -> f6951ac29


[SM-3597] Ship elasticsearch nett4 transport plugin in elasticsearch 6.x bundle


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/5f49ac9c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5f49ac9c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5f49ac9c

Branch: refs/heads/master
Commit: 5f49ac9c916fee97937333ed8676f237d52b1621
Parents: c14c199
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jan 30 10:20:54 2018 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jan 30 10:20:54 2018 +0100

----------------------------------------------------------------------
 elasticsearch-6.1.1/pom.xml                     | 42 ++++++++++++++++----
 .../META-INF/org.apache.lucene.codecs.Codec     |  3 ++
 .../org.apache.lucene.codecs.DocValuesFormat    |  2 +
 .../org.apache.lucene.codecs.PostingsFormat     |  1 +
 pom.xml                                         |  1 +
 5 files changed, 42 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5f49ac9c/elasticsearch-6.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-6.1.1/pom.xml b/elasticsearch-6.1.1/pom.xml
index dec4e54..9b7ef65 100644
--- a/elasticsearch-6.1.1/pom.xml
+++ b/elasticsearch-6.1.1/pom.xml
@@ -51,20 +51,26 @@
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             com.google.common.collect,
-            com.fasterxml.jackson.core;version="[2.6,3)",
-            com.fasterxml.jackson.dataformat.yaml;version="[2.6,3)",
-            com.fasterxml.jackson.dataformat.smile;version="[2.6,3)",
+            com.fasterxml.jackson.core;version="[2.8,3)",
+            com.fasterxml.jackson.dataformat.yaml;version="[2.8,3)",
+            com.fasterxml.jackson.dataformat.smile;version="[2.8,3)",
             com.sun.jna;resolution:=optional,
             com.ning.compress.lzf.util,
-            *;resolution:=optional
+            org.apache.logging.log4j*;version="[2.8,3)",
+            *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.joda.time*;-split-package:=merge-first,
-            org.apache.lucene*;-split-package:=merge-first,
+            org.joda.time*,
+            org.joda.convert*,
+            org.apache.lucene*,
             org.tartarus.snowball*,
             com.tdunning.math.stats,
+            com.vividsolutions.jts.geom,
             com.carrotsearch.hppc*,
-            META-INF.services.*;-split-package:=merge-first
+            joptsimple*,
+            org.HdrHistogram,
+            org.locationtech.spatial4j*,
+            META-INF.services.*
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -74,6 +80,21 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+             <groupId>org.apache.logging.log4j</groupId>
+             <artifactId>log4j-core</artifactId>
+             <version>2.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-backward-codecs</artifactId>
+            <version>7.1.0</version>
+        </dependency>
 
         <!-- sources -->
         <dependency>
@@ -82,6 +103,12 @@
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+        </dependency>
     </dependencies>
 
     <build>
@@ -99,6 +126,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+				    <include>org.elasticsearch.plugin:transport-netty4client</include>
                                     <include>org.apache.lucene:*</include>
                                 </includes>
                             </artifactSet>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5f49ac9c/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.Codec
----------------------------------------------------------------------
diff --git a/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.Codec
b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.Codec
new file mode 100644
index 0000000..087c825
--- /dev/null
+++ b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.Codec
@@ -0,0 +1,3 @@
+org.apache.lucene.codecs.lucene60.Lucene60Codec
+org.apache.lucene.codecs.lucene62.Lucene62Codec
+org.apache.lucene.codecs.lucene70.Lucene70Codec

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5f49ac9c/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.DocValuesFormat
----------------------------------------------------------------------
diff --git a/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.DocValuesFormat
b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.DocValuesFormat
new file mode 100644
index 0000000..b069eb6
--- /dev/null
+++ b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.DocValuesFormat
@@ -0,0 +1,2 @@
+org.apache.lucene.codecs.lucene54.Lucene54DocValuesFormat
+org.apache.lucene.codecs.lucene70.Lucene70DocValuesFormat

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5f49ac9c/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.PostingsFormat
----------------------------------------------------------------------
diff --git a/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.PostingsFormat
b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.PostingsFormat
new file mode 100644
index 0000000..3b5682a
--- /dev/null
+++ b/elasticsearch-6.1.1/src/main/resources/META-INF/org.apache.lucene.codecs.PostingsFormat
@@ -0,0 +1 @@
+org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5f49ac9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a67c9f9..503cc34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <module>braintree-java-2.74.0</module>
         <module>fastjson-1.2.45</module>
         <module>libphonenumber-8.8.9</module>
+        <module>elasticsearch-6.1.1</module>
     </modules>
 
 </project>


Mime
View raw message