From efa8ab9e95a174f97cb6c26a8d8992ed091aaf84 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 18 Aug 2016 13:21:50 +0300
Subject: [PATCH] Use Require-Bundle in lucene bundles to avoid class loading
 problems.

Change-Id: Ia5cb73cf8658fa245a79b7ac8ecc5a157b1d90a2
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 19 +++++++++++++-----
 ...imantics.sdk.build.targetdefinition.target | 20 +++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

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