servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1599262 - in /servicemix/smx4/bundles/trunk: ./ elasticsearch-1.0.0/ elasticsearch-1.0.0/src/main/resources/META-INF/services/ elasticsearch-1.0.1/ elasticsearch-1.0.1/src/main/resources/META-INF/services/ elasticsearch-1.1.0/ elasticsearc...
Date Mon, 02 Jun 2014 16:45:33 GMT
Author: jbonofre
Date: Mon Jun  2 16:45:32 2014
New Revision: 1599262

URL: http://svn.apache.org/r1599262
Log:
[SMX4-1752] Improve the wrapping of lucene artifacts in elasticsearch 1.x bundles

Removed:
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
    servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
Modified:
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/pom.xml
    servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/pom.xml
    servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/pom.xml?rev=1599262&r1=1599261&r2=1599262&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/elasticsearch-1.0.0/pom.xml Mon Jun  2 16:45:32 2014
@@ -46,9 +46,7 @@
             *;resolution:=optional,
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.apache.lucene*;-split-package:=merge-first,
-            org.tartarus.snowball.*;-split-package:=merge-first,
-            META-INF.services; -split-package:=merge-first
+            org.apache.lucene*;-split-package:=merge-last
         </servicemix.osgi.private.pkg>
         <servicemix.osgi.provide.capability>
             osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.Codec,
@@ -82,22 +80,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -144,22 +126,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -213,6 +179,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.apache.lucene:*</include>
                                 </includes>
                             </artifactSet>
                             <filters>
@@ -222,7 +189,16 @@
                                         <include>config/**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>org.apache.lucene:*</artifact>
+                                    <includes>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
                             </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>

Modified: servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/pom.xml?rev=1599262&r1=1599261&r2=1599262&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/elasticsearch-1.0.1/pom.xml Mon Jun  2 16:45:32 2014
@@ -46,9 +46,7 @@
             *;resolution:=optional,
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.apache.lucene*;-split-package:=merge-first,
-            org.tartarus.snowball.*;-split-package:=merge-first,
-            META-INF.services; -split-package:=merge-first
+            org.apache.lucene*;-split-package:=merge-last
         </servicemix.osgi.private.pkg>
         <servicemix.osgi.provide.capability>
             osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.Codec,
@@ -82,22 +80,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -144,22 +126,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -213,6 +179,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.apache.lucene:*</include>
                                 </includes>
                             </artifactSet>
                             <filters>
@@ -222,7 +189,16 @@
                                         <include>config/**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>org.apache.lucene:*</artifact>
+                                    <includes>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
                             </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>

Modified: servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/pom.xml?rev=1599262&r1=1599261&r2=1599262&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/elasticsearch-1.1.0/pom.xml Mon Jun  2 16:45:32 2014
@@ -46,9 +46,7 @@
             *;resolution:=optional,
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
-            org.apache.lucene*;-split-package:=merge-first,
-            org.tartarus.snowball.*;-split-package:=merge-first,
-            META-INF.services; -split-package:=merge-first
+            org.apache.lucene*;-split-package:=merge-last
         </servicemix.osgi.private.pkg>
         <servicemix.osgi.provide.capability>
             osgi.serviceloader; osgi.serviceloader=org.apache.lucene.codecs.Codec,
@@ -82,22 +80,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -144,22 +126,6 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-analyzers-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-codecs</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-queries</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.lucene</groupId>
                     <artifactId>lucene-memory</artifactId>
                 </exclusion>
                 <exclusion>
@@ -213,6 +179,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>org.apache.lucene:*</include>
                                 </includes>
                             </artifactSet>
                             <filters>
@@ -222,7 +189,16 @@
                                         <include>config/**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>org.apache.lucene:*</artifact>
+                                    <includes>
+                                        <include>META-INF/services/**</include>
+                                    </includes>
+                                </filter>
                             </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1599262&r1=1599261&r2=1599262&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Mon Jun  2 16:45:32 2014
@@ -138,6 +138,9 @@
         <module>jaxb-xjc-2.2.10</module>
         <module>aws-java-sdk-1.7.5</module>
         <module>aws-java-sdk-1.7.1</module>
+        <module>elasticsearch-1.1.0</module>
+        <module>elasticsearch-1.0.1</module>
+        <module>elasticsearch-1.0.0</module>
     </modules>
 
 </project>



Mime
View raw message