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 2012/10/05 15:35:51 UTC

svn commit: r1394512 - in /servicemix/smx4/bundles/trunk: elasticsearch-0.19.8/pom.xml pom.xml

Author: jbonofre
Date: Fri Oct  5 13:35:51 2012
New Revision: 1394512

URL: http://svn.apache.org/viewvc?rev=1394512&view=rev
Log:
[SMX4-1261] Fix elasticsearch 0.19.8 bundle content

Modified:
    servicemix/smx4/bundles/trunk/elasticsearch-0.19.8/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/elasticsearch-0.19.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/elasticsearch-0.19.8/pom.xml?rev=1394512&r1=1394511&r2=1394512&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/elasticsearch-0.19.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/elasticsearch-0.19.8/pom.xml Fri Oct  5 13:35:51 2012
@@ -49,10 +49,11 @@
             javax.net.ssl,
             javax.servlet,
             javax.servlet.http,
-            org.xml.sax,
+            javax.xml.parsers,
+            org.xml.sax*,
             com.google.common*,
             com.google.protobuf,
-            org.apache.lucene*,
+            org.apache.regexp,
             org.codehaus.jackson*,
             org.joda.time*,
             org.mvel2*,
@@ -74,6 +75,9 @@
             com.sun.jna;resolution:=optional,
             sun.misc;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            org.apache.lucene*;-split-package:=merge-first
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <repositories>
@@ -128,9 +132,9 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>config/**</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1394512&r1=1394511&r2=1394512&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Oct  5 13:35:51 2012
@@ -43,6 +43,7 @@
 
     <modules>
         <module>struts-1.3.10</module>
+        <module>elasticsearch-0.19.8</module>
         <module>elasticsearch-0.19.9</module>
         <module>automaton-1.11-8</module>
         <module>gentlyweb-utils-1.5</module>