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

Change-Id: Ia5cb73cf8658fa245a79b7ac8ecc5a157b1d90a2

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

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 7a8c6280e70c490eab21ccfce5506926bf3786b1..c8a0298a833b8fc186c7fe15a9cb4d63f2d2b210 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -75,9 +75,9 @@
 <repository location="http://www.simantics.org/update/nebula/Q22016/release/"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.apache.lucene4.queries" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.queries" version="4.9.0.b0002"/>\r
 <unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
-<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0002"/>\r
 <unit id="org.antlr.runtime.source" version="3.5.2"/>\r
 <unit id="org.apache.commons.compress" version="1.12.0"/>\r
 <unit id="org.apache.pdfbox.source" version="2.0.2"/>\r
@@ -91,20 +91,20 @@
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>\r
 <unit id="freemarker" version="2.3.23.stable"/>\r
 <unit id="com.github.virtuald.curvesapi.source" version="1.3.0"/>\r
-<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0002"/>\r
 <unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
 <unit id="org.apache.pdfbox.fontbox" version="2.0.2"/>\r
 <unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
 <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
-<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0002"/>\r
 <unit id="freemarker.source" version="2.3.23.stable"/>\r
 <unit id="jakarta-regexp" version="1.4.0"/>\r
 <unit id="net.jcip.annotations.source" version="1.0.0"/>\r
 <unit id="org.apache.log4j.source" version="1.2.17"/>\r
-<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0002"/>\r
 <unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
 <unit id="org.apache.commons.io.source" version="1.4.0"/>\r
-<unit id="org.apache.lucene4.core" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.core" version="4.9.0.b0002"/>\r
 <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
 <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
 <unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>\r
@@ -121,12 +121,12 @@
 <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
 <unit id="stax.api" version="1.0.1"/>\r
 <unit id="org.apache.pdfbox.fontbox.source" version="2.0.2"/>\r
-<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0002"/>\r
 <unit id="it.unimi.dsi.fastutil" version="7.0.12"/>\r
 <unit id="net.jcip.annotations" version="1.0.0"/>\r
 <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
 <unit id="org.jfree.jchart.source" version="1.0.19"/>\r
-<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0002"/>\r
 <unit id="org.apache.poi.ooxml-schemas" version="3.14.0"/>\r
 <unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
 <unit id="org.apache.poi" version="3.14.0"/>\r
@@ -156,8 +156,8 @@
 <unit id="javax.vecmath" version="1.5.2"/>\r
 <unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
 <unit id="org.ini4j.source" version="0.5.4"/>\r
-<unit id="org.apache.lucene4.core.source" version="4.9.0.b0001"/>\r
-<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0001"/>\r
+<unit id="org.apache.lucene4.core.source" version="4.9.0.b0002"/>\r
+<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0002"/>\r
 <repository location="http://www.simantics.org/download/master/external-components"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r