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=5233c9796aecf383e2e825d25390b5bdc4c0a551;hp=2890fb24ab9287ed8a7cae3e8c270b813de0e94f;hb=efa8ab9e95a174f97cb6c26a8d8992ed091aaf84;hpb=0b72d3e4ec886838314ffeba0fa201e32c0aae3e

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 2890fb24a..5233c9796 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,10 +6,12 @@
     <groupId>org.simantics</groupId>
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>
     <packaging>pom</packaging>
-    <version>1.24.0</version>
+    <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.b0002</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,6 +118,10 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>${lucene.prefix}.queries</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>
@@ -121,6 +129,10 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>${lucene.prefix}.sandbox</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>
@@ -128,6 +140,10 @@
                                     <source>true</source>
                                     <instructions>
                                         <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>
@@ -135,6 +151,10 @@
                                     <source>true</source>
                                     <instructions>
                                         <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>
@@ -197,6 +217,10 @@
                                     <id>org.apache.pdfbox:fontbox:2.0.2</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.apache.pdfbox:xmpbox:2.0.2</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>log4j:log4j:1.2.17</id>
                                     <source>true</source>
@@ -218,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>
@@ -253,6 +281,7 @@
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>com.lowagie.text</Bundle-SymbolicName>
+                                        <Bundle-Version>${itext.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -267,6 +296,14 @@
                                     <id>org.mozilla:rhino:1.7.7.1</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>net.java.dev.jna:jna:4.2.2</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>net.java.dev.jna:jna-platform:4.2.2</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>
@@ -285,7 +322,6 @@
                     </webApp>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
@@ -296,4 +332,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>