Use Require-Bundle in lucene bundles to avoid class loading problems.

[simantics/platform.git] / releng / org.simantics.sdk.build.p2.site / pom.xml

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 42fb59d55d7e26cd9615ab5df19c5736574b87e9..5233c9796aecf383e2e825d25390b5bdc4c0a551 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -11,7 +11,7 @@
     <properties>\r
         <itext.version.actual>2.1.7.b1</itext.version.actual>\r
         <lucene.version>4.9.0</lucene.version>\r
-        <lucene.version.actual>4.9.0.b0001</lucene.version.actual>\r
+        <lucene.version.actual>4.9.0.b0002</lucene.version.actual>\r
         <lucene.prefix>org.apache.lucene4</lucene.prefix>\r
     </properties>\r
 \r
@@ -110,6 +110,7 @@
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.core</Bundle-SymbolicName>\r
                                         <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
+                                        <Export-Package>*;version="${lucene.version}"</Export-Package>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
@@ -118,7 +119,9 @@
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.queries</Bundle-SymbolicName>\r
                                         <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>\r
+                                        <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+                                        <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+                                        <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
@@ -127,7 +130,9 @@
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.sandbox</Bundle-SymbolicName>\r
                                         <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>\r
+                                        <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+                                        <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+                                        <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
@@ -136,7 +141,9 @@
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>\r
                                         <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>\r
+                                        <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}",${lucene.prefix}.queries;bundle-version="${lucene.version},${lucene.prefix}.sandbox;bundle-version="${lucene.version}"</Require-Bundle>\r
+                                        <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+                                        <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
@@ -145,7 +152,9 @@
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>\r
                                         <Bundle-Version>${lucene.version.actual}</Bundle-Version>\r
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>\r
+                                        <Require-Bundle>${lucene.prefix}.core;bundle-version="${lucene.version}"</Require-Bundle>\r
+                                        <Export-Package>*;version="${lucene.version}"</Export-Package>\r
+                                        <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r