You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2020/04/27 19:10:37 UTC
[servicemix-bundles] branch master updated: fix
elasticsearch-client 6.4.3
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 52e06c4 fix elasticsearch-client 6.4.3
52e06c4 is described below
commit 52e06c4a6f39235b735c9b69f89e2018baddeada
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Apr 27 15:09:45 2020 -0400
fix elasticsearch-client 6.4.3
---
elasticsearch-client-6.4.3/pom.xml | 68 +++++++++++++++++++++++++++++++++-----
1 file changed, 59 insertions(+), 9 deletions(-)
diff --git a/elasticsearch-client-6.4.3/pom.xml b/elasticsearch-client-6.4.3/pom.xml
index e067a32..b8c89d5 100644
--- a/elasticsearch-client-6.4.3/pom.xml
+++ b/elasticsearch-client-6.4.3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>13</version>
+ <version>14</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -36,9 +36,9 @@
<description>This OSGi bundle wraps elasticsearch-client ${pkgVersion} jar files.</description>
<scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
<tag>HEAD</tag>
</scm>
@@ -46,16 +46,47 @@
<pkgGroupId>org.elasticsearch.client</pkgGroupId>
<pkgVersion>6.4.3</pkgVersion>
<servicemix.osgi.export>
- org.elasticsearch.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.action.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.client.node;version="${pkgVersion}";-split-package:=merge-first,
org.elasticsearch.client.sniff;version="${pkgVersion}";-split-package:=merge-first,
- org.elasticsearch.transport.client;version="${pkgVersion}";-split-package:=merge-first,
- org.elasticsearch.client.transport;version="${pkgVersion}";-split-package:=merge-first,
org.elasticsearch.client.support;version="${pkgVersion}";-split-package:=merge-first,
- org.elasticsearch.client.node;version="${pkgVersion}";-split-package:=merge-first
+ org.elasticsearch.client.transport;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.common.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.indices;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.index.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.plugins.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.rest;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.rest.action;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.search.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.tasks.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.transport.*;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch.transport.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.elasticsearch;version="${pkgVersion}";-split-package:=merge-first,
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
-
+ com.fasterxml.jackson.core.base;version="[2.8,3)",
+ com.fasterxml.jackson.core.filter;version="[2.8,3)",
+ com.fasterxml.jackson.core.io;version="[2.8,3)",
+ com.fasterxml.jackson.core.util;version="[2.8,3)",
+ com.fasterxml.jackson.core;version="[2.8,3)",
+ com.fasterxml.jackson.dataformat.smile;version="[2.8,3)",
+ com.fasterxml.jackson.dataformat.yaml;version="[2.8,3)",
+ javax.net.ssl,
+ org.apache.commons.logging,
+ org.apache.http.*,
+ org.apache.logging.log4j.*,
+ org.apache.lucene.*,
+ org.joda.time.*;version="[2.9, 3)",
</servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ org.apache.lucene.index.memory;-split-package:=merge-first,
+ org.apache.lucene.search.*;-split-package:=merge-first,
+ org.apache.lucene.spatial.*;-split-package:=merge-first,
+ org.apache.lucene.spatial3d.*;-split-package:=merge-first,
+ org.elasticsearch.*;-split-package:=merge-first,
+ com.carrotsearch.hppc*,
+ </servicemix.osgi.private.pkg>
</properties>
<dependencies>
@@ -79,6 +110,12 @@
<artifactId>transport</artifactId>
<version>${pkgVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>lang-mustache-client</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
<!-- sources -->
<dependency>
@@ -105,6 +142,12 @@
<version>${pkgVersion}</version>
<classifier>sources</classifier>
</dependency>
+ <dependency>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>lang-mustache-client</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
</dependencies>
<build>
@@ -124,6 +167,7 @@
<include>${pkgGroupId}:elasticsearch-rest-client</include>
<include>${pkgGroupId}:elasticsearch-rest-client-sniffer</include>
<include>${pkgGroupId}:elasticsearch-rest-high-level-client</include>
+ <include>org.elasticsearch.plugin:lang-mustache-client</include>
<include>${pkgGroupId}:transport</include>
</includes>
</artifactSet>
@@ -147,6 +191,12 @@
</excludes>
</filter>
<filter>
+ <artifact>org.elasticsearch.plugin:lang-mustache-client</artifact>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </filter>
+ <filter>
<artifact>${pkgGroupId}:transport</artifact>
<excludes>
<exclude>**/*</exclude>