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=361c0cdcdbb430ebd34334a2a5269618720970d6;hp=9b8594de03064aece379607b90ffdf767b6866ce;hb=463c2a8dd4b9ca623872e6520906c19c03a1c4cb;hpb=3515ce6f0295365e0992874cfda23d1a228cbac3

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 9b8594de0..361c0cdcd 100644
--- 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>
 
     <properties>
+        <itext.version.actual>2.1.7.b1</itext.version.actual>
         <lucene.version>4.9.0</lucene.version>
+        <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
     </properties>
 
@@ -107,6 +109,8 @@
                                     <source>true</source>
                                     <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>
@@ -114,7 +118,10 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>${lucene.prefix}.queries</Bundle-SymbolicName>
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>
+                                        <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>
@@ -122,23 +129,32 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>${lucene.prefix}.sandbox</Bundle-SymbolicName>
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>
+                                        <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>
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>
+                                        <Bundle-SymbolicName>${lucene.prefix}.analyzers-common</Bundle-SymbolicName>
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>
+                                        <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>
-                                        <Import-Package>org.apache.lucene.*;version="${lucene.version}";resolution:=optional,*;resolution:=optional</Import-Package>
+                                        <Bundle-SymbolicName>${lucene.prefix}.queryparser</Bundle-SymbolicName>
+                                        <Bundle-Version>${lucene.version.actual}</Bundle-Version>
+                                        <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>
@@ -226,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>
@@ -261,7 +281,7 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>com.lowagie.text</Bundle-SymbolicName>
-                                        <Bundle-Version>2.1.7.b1</Bundle-Version>
+                                        <Bundle-Version>${itext.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -284,6 +304,10 @@
                                     <id>net.java.dev.jna:jna-platform:4.2.2</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.2</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>