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 2014/08/04 10:23:52 UTC
svn commit: r1615499 - in /servicemix/smx4/bundles/trunk:
elasticsearch-1.2.0/pom.xml pom.xml
Author: jbonofre
Date: Mon Aug 4 08:23:52 2014
New Revision: 1615499
URL: http://svn.apache.org/r1615499
Log:
[SMX4-1801] Embed dependencies to avoid classloader issues
Modified:
servicemix/smx4/bundles/trunk/elasticsearch-1.2.0/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/elasticsearch-1.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/elasticsearch-1.2.0/pom.xml?rev=1615499&r1=1615498&r2=1615499&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/elasticsearch-1.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/elasticsearch-1.2.0/pom.xml Mon Aug 4 08:23:52 2014
@@ -46,16 +46,11 @@
*;resolution:=optional,
</servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg>
- org.apache.lucene*;-split-package:=merge-last
+ org.apache.lucene*;-split-package:=merge-last,
+ org.tartarus.snowball*,
+ org.apache.regexp,
+ META-INF.*
</servicemix.osgi.private.pkg>
- <servicemix.osgi.provide.capability>
- osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.Codec,
- osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.PostingsFormat,
- osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.DocValuesFormat
- </servicemix.osgi.provide.capability>
- <servicemix.osgi.require.capability>
- osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
- </servicemix.osgi.require.capability>
</properties>
<repositories>
@@ -77,44 +72,6 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-join</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- sources -->
@@ -123,44 +80,6 @@
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
<classifier>sources</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-sandbox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-suggest</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-join</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-grouping</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1615499&r1=1615498&r2=1615499&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Mon Aug 4 08:23:52 2014
@@ -46,6 +46,7 @@
<module>jsch-agentproxy-sshj-0.0.7</module>
<module>jts-1.13</module>
<module>elasticsearch-1.2.1</module>
+ <module>elasticsearch-1.2.0</module>
<module>elasticsearch-repository-hdfs-2.0.0</module>
<module>commons-configuration-1.9</module>
<module>jackson-module-scala-2.3.0</module>