servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [servicemix-bundles] branch master updated: [SM-3958] Don't export elasticsearch client in the elasticsearch bundles
Date Tue, 29 Jan 2019 17:52:27 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre 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 78c8b27  [SM-3958] Don't export elasticsearch client in the elasticsearch bundles
78c8b27 is described below

commit 78c8b274078f4ee6f07f6ef4477b635a7d8d7143
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Tue Jan 29 18:51:59 2019 +0100

    [SM-3958] Don't export elasticsearch client in the elasticsearch bundles
---
 elasticsearch-6.2.4/pom.xml | 16 +++++++++-------
 elasticsearch-6.4.3/pom.xml | 15 +++++++++------
 elasticsearch-6.5.4/pom.xml | 15 +++++++++------
 pom.xml                     |  2 ++
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/elasticsearch-6.2.4/pom.xml b/elasticsearch-6.2.4/pom.xml
index 64596a7..beb39dc 100644
--- a/elasticsearch-6.2.4/pom.xml
+++ b/elasticsearch-6.2.4/pom.xml
@@ -39,21 +39,23 @@
         <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>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>org.elasticsearch</pkgGroupId>
         <pkgArtifactId>elasticsearch</pkgArtifactId>
         <pkgVersion>6.2.4</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.elasticsearch
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+            !org.elasticsearch.client*,
+            org.elasticsearch*;version="${pkgVersion}";-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             !org.elasticsearch*,
+            !org.joda.time,
             !org.joda.convert,
             !org.locationtech.spatial4j*,
             !com.vividsolutions.jts*,
+            !org.apache.lucene*,
             com.google.common.collect,
             com.fasterxml.jackson.core;version="[2.8,3)",
             com.fasterxml.jackson.dataformat.yaml;version="[2.8,3)",
@@ -63,9 +65,9 @@
             org.apache.logging.log4j*;version="[2.8,3)"
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.joda.time*,
+            org.joda.time*;-split-package:=merge-first,
             org.joda.convert*,
-            org.apache.lucene*,
+            org.apache.lucene*;-split-package:=merge-first,
             org.tartarus.snowball*,
             com.tdunning.math.stats,
             com.vividsolutions.jts*,
@@ -73,7 +75,7 @@
             joptsimple*,
             org.HdrHistogram,
             org.locationtech.spatial4j*,
-            META-INF.services.*
+            META-INF.services.*;-split-package:=merge-first
         </servicemix.osgi.private.pkg>
     </properties>
 
diff --git a/elasticsearch-6.4.3/pom.xml b/elasticsearch-6.4.3/pom.xml
index d6bf4b9..bdbe733 100644
--- a/elasticsearch-6.4.3/pom.xml
+++ b/elasticsearch-6.4.3/pom.xml
@@ -45,14 +45,17 @@
         <pkgGroupId>org.elasticsearch</pkgGroupId>
         <pkgArtifactId>elasticsearch</pkgArtifactId>
         <pkgVersion>6.4.3</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.elasticsearch
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+            !org.elasticsearch.client*;
+            org.elasticsearch*;version="${pkgVersion}";-split-package:=merge-first    
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             !org.elasticsearch*,
+            !org.joda.time,
             !org.joda.convert,
             !org.locationtech.spatial4j*,
             !com.vividsolutions.jts.geom,
+            !org.apache.lucene*,
             com.google.common.collect,
             com.fasterxml.jackson.core;version="[2.8,4)",
             com.fasterxml.jackson.dataformat.yaml;version="[2.8,4)",
@@ -63,9 +66,9 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.joda.time*,
+            org.joda.time*;-split-package:=merge-first,
             org.joda.convert*,
-            org.apache.lucene*,
+            org.apache.lucene*;-split-package:=merge-first,
             org.tartarus.snowball*,
             com.tdunning.math.stats,
             com.vividsolutions.jts.geom,
@@ -73,7 +76,7 @@
             joptsimple*,
             org.HdrHistogram,
             org.locationtech.spatial4j*,
-            META-INF.services.*
+            META-INF.services.*;-split-package:=merge-first
         </servicemix.osgi.private.pkg>
     </properties>
 
diff --git a/elasticsearch-6.5.4/pom.xml b/elasticsearch-6.5.4/pom.xml
index 62ac778..612977e 100644
--- a/elasticsearch-6.5.4/pom.xml
+++ b/elasticsearch-6.5.4/pom.xml
@@ -45,14 +45,17 @@
         <pkgGroupId>org.elasticsearch</pkgGroupId>
         <pkgArtifactId>elasticsearch</pkgArtifactId>
         <pkgVersion>6.5.4</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.elasticsearch
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+            !org.elasticsearch.client*,
+            org.elasticsearch*;version="${pkgVersion}";-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             !org.elasticsearch*,
+            !org.joda.time,
             !org.joda.convert,
             !org.locationtech.spatial4j*,
             !com.vividsolutions.jts.geom,
+            !org.apache.lucene*,
             com.google.common.collect,
             com.google.common.geometry;resolution:=optional,
             com.fasterxml.jackson.core;version="[2.8,4)",
@@ -66,9 +69,9 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.joda.time*,
+            org.joda.time*;-split-package:=merge-first,
             org.joda.convert*,
-            org.apache.lucene*,
+            org.apache.lucene*;-split-package:=merge-first,
             org.tartarus.snowball*,
             com.tdunning.math.stats,
             com.vividsolutions.jts.geom,
@@ -76,7 +79,7 @@
             joptsimple*,
             org.HdrHistogram,
             org.locationtech.spatial4j*,
-            META-INF.services.*
+            META-INF.services.*;-split-package:=merge-first
         </servicemix.osgi.private.pkg>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index 09ae6ba..04bc49d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,8 @@
         <module>jedis-3.0.1</module>
         <module>qpid-6.3.3</module>
         <module>libphonenumber-8.10.3</module>
+        <module>elasticsearch-6.2.4</module>
+        <module>elasticsearch-client-6.2.4</module>
         <module>elasticsearch-6.4.3</module>
         <module>elasticsearch-client-6.4.3</module>
         <module>elasticsearch-6.5.4</module>


Mime
View raw message