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 69674c0e94e2ede780b0243e17f5dfb18e9ce121..5233c9796aecf383e2e825d25390b5bdc4c0a551 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -9,7 +9,9 @@
     <version>1.25.0</version>\r
 \r
     <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.b0002</lucene.version.actual>\r
         <lucene.prefix>org.apache.lucene4</lucene.prefix>\r
     </properties>\r
 \r
@@ -107,6 +109,8 @@
                                     <source>true</source>\r
                                     <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
@@ -114,6 +118,10 @@
                                     <source>true</source>\r
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.queries</Bundle-SymbolicName>\r
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>\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
@@ -121,6 +129,10 @@
                                     <source>true</source>\r
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.sandbox</Bundle-SymbolicName>\r
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>\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
@@ -128,6 +140,10 @@
                                     <source>true</source>\r
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>\r
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>\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
@@ -135,6 +151,10 @@
                                     <source>true</source>\r
                                     <instructions>\r
                                         <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>\r
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>\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
@@ -197,6 +217,10 @@
                                     <id>org.apache.pdfbox:fontbox:2.0.2</id>\r
                                     <source>true</source>\r
                                 </artifact>\r
+                                <artifact>\r
+                                    <id>org.apache.pdfbox:xmpbox:2.0.2</id>\r
+                                    <source>true</source>\r
+                                </artifact>\r
                                 <artifact>\r
                                     <id>log4j:log4j:1.2.17</id>\r
                                     <source>true</source>\r
@@ -218,7 +242,11 @@
                                 </artifact>\r
                                 <artifact>\r
                                     <id>org.eclipse.collections:eclipse-collections-api:7.1.0</id>\r
+                                    <override>true</override>\r
                                     <source>true</source>\r
+                                    <instructions>\r
+                                        <Export-Package>org.eclipse.collections.*</Export-Package>\r
+                                    </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
                                     <id>org.eclipse.collections:eclipse-collections:7.1.0</id>\r
@@ -253,6 +281,7 @@
                                     <source>true</source>\r
                                     <instructions>\r
                                         <Bundle-SymbolicName>com.lowagie.text</Bundle-SymbolicName>\r
+                                        <Bundle-Version>${itext.version.actual}</Bundle-Version>\r
                                     </instructions>\r
                                 </artifact>\r
                                 <artifact>\r
@@ -267,6 +296,14 @@
                                     <id>org.mozilla:rhino:1.7.7.1</id>\r
                                     <source>true</source>\r
                                 </artifact>\r
+                                <artifact>\r
+                                    <id>net.java.dev.jna:jna:4.2.2</id>\r
+                                    <source>true</source>\r
+                                </artifact>\r
+                                <artifact>\r
+                                    <id>net.java.dev.jna:jna-platform:4.2.2</id>\r
+                                    <source>true</source>\r
+                                </artifact>\r
                             </artifacts>\r
                         </configuration>\r
                     </execution>\r
@@ -285,7 +322,6 @@
                     </webApp>\r
                 </configuration>\r
             </plugin>\r
-\r
         </plugins>\r
     </build>\r
 \r