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=4e17e37653c0c5186996357becc7062c054ce683;hp=7859b67cad864ac632f3ae026dec1f9dbe0d7557;hb=ddc53405b5fcadd42f1916d0f85e65d56b20f981;hpb=bbf626a92fb6e402350f8c633f318d33e67327c0

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 7859b67ca..4e17e3765 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.b0003</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,25 +130,31 @@
                                     <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>
-                                    <id>org.apache.lucene:lucene-queryparser:${lucene.version}</id>
+                                    <id>org.apache.lucene:lucene-analyzers-common:${lucene.version}</id>
                                     <source>true</source>
                                     <instructions>
-                                        <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>
+                                        <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>
-                                    <id>org.apache.lucene:lucene-analyzers-common:${lucene.version}</id>
+                                    <id>org.apache.lucene:lucene-queryparser:${lucene.version}</id>
                                     <source>true</source>
                                     <instructions>
-                                        <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>
+                                        <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>
@@ -233,7 +242,11 @@
                                 </artifact>
                                 <artifact>
                                     <id>org.eclipse.collections:eclipse-collections-api:7.1.0</id>
+                                    <override>true</override>
                                     <source>true</source>
+                                    <instructions>
+                                        <Export-Package>org.eclipse.collections.*</Export-Package>
+                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.eclipse.collections:eclipse-collections:7.1.0</id>