X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=5233c9796aecf383e2e825d25390b5bdc4c0a551;hp=42fb59d55d7e26cd9615ab5df19c5736574b87e9;hb=efa8ab9e95a174f97cb6c26a8d8992ed091aaf84;hpb=83e5258d777a6badf9909e969d6127c9c4899552

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