Improve Apache POI packaging

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 492723385daf2e5b5cc83d01be0c61fa23babe5b..9ab6d35f9adddd43dd10ca421fec2243101c6d69 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -12,7 +12,7 @@
        <flow:flow name="apache/org.apache.commons.codec"
                spec="spec.commons">
                <flow:arg name="project" value="codec" />
-               <flow:arg name="version" value="1.9" />
+               <flow:arg name="version" value="1.11" />
                <bean p:version="@{version}.0"
                        parent="template.commonsArchiveWrapper" />
        </flow:flow>

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 7bb6573de3ecbf79d773a8c3f005f14bd7447f41..ae9126386a7ac38e3e99ccbf772f273ec2eb65b6 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -20,9 +20,20 @@
        <flow:flow name="apache/org.apache.tika" spec="spec.version">
                <flow:arg name="version" value="1.19" />
                <bean id="org.apache.tika.core" parent="template.tikaMaven"
-                       p:sourceCoords="org.apache.tika:tika-core:@{version}" />
-               <bean id="org.apache.tika.parser" parent="template.tikaMaven"
-                       p:sourceCoords="org.apache.tika:tika-parsers:@{version}" />
+                       p:sourceCoords="org.apache.tika:tika-core:@{version}">
+                       <property name="doNotModify" value="true" />
+               </bean>
+               <bean id="org.apache.tika.parsers" parent="template.tikaMaven"
+                       p:sourceCoords="org.apache.tika:tika-parsers:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Bundle-Activator">org.apache.tika.parser.internal.Activator</prop>
+                                       <prop key="Import-Package">
+                                               *;resolution:=optional
+                                       </prop>
+                               </props>
+                       </property>
+               </bean>
        </flow:flow>
 
        <bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
@@ -84,17 +95,29 @@
 
        <flow:flow name="apache/org.apache.pdfbox"
                spec="spec.version">
-               <flow:arg name="version" value="2.0.3" />
+               <flow:arg name="version" value="2.0.2" />
                <bean id="org.apache.pdfbox" parent="template.apacheMaven"
                        p:version="@{version}"
                        p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
                <bean id="org.apache.pdfbox.fontbox"
                        parent="template.apacheMaven" p:version="@{version}"
                        p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
+               <bean id="org.apache.pdfbox.xmpbox" parent="template.apacheMaven"
+                       p:version="@{version}"
+                       p:sourceCoords="org.apache.pdfbox:xmpbox:@{version}" />
+               <!-- Legacy, still used by Tika -->
+               <bean id="org.apache.pdfbox.jempbox"
+                       parent="template.apacheMaven" p:version="@{version}"
+                       p:sourceCoords="org.apache.pdfbox:jempbox:1.8.2" />
        </flow:flow>
 
        <flow:flow name="apache/org.apache.poi" spec="spec.version">
                <flow:arg name="version" value="4.0.0" />
+               <!-- <bean id="org.apache.poi" parent="template.apacheMaven" -->
+               <!-- p:version="@{version}" -->
+               <!-- p:sourceCoords="org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:@{version}_1"> -->
+               <!-- <property name="doNotModify" value="true" /> -->
+               <!-- </bean> -->
                <bean id="org.apache.poi" parent="template.apacheMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.poi:poi:@{version}" />
                <bean id="org.apache.poi.ooxml" parent="template.apacheMaven"
@@ -102,6 +125,7 @@
                        p:sourceCoords="org.apache.poi:poi-ooxml:@{version}">
                        <property name="bndProperties">
                                <props merge="true">
+                                       <!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
                                        <prop key="Import-Package">
                                                com.graphbuilder.*;resolution:=optional,
                                                org.etsi.uri.*;resolution:=optional,
@@ -116,17 +140,28 @@
                        p:sourceCoords="org.apache.poi:poi-ooxml-schemas:@{version}">
                        <property name="bndProperties">
                                <props merge="true">
+                                       <!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
                                        <prop key="Import-Package">
                                                com.microsoft.schemas.*;resolution:=optional,
                                                org.openxmlformats.schemas.*;resolution:=optional,
                                                *
                                        </prop>
+                                       <prop key="Require-Bundle">org.apache.xmlbeans</prop>
                                </props>
                        </property>
                </bean>
                <bean id="org.apache.poi.scratchpad"
                        parent="template.apacheMaven" p:version="@{version}"
-                       p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}" />
+                       p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <!-- <prop key="Fragment-Host">org.apache.poi</prop> -->
+                                       <prop key="Import-Package">
+                                               *
+                                       </prop>
+                               </props>
+                       </property>
+               </bean>
        </flow:flow>
 
        <bean id="org.apache.xmlbeans"
@@ -134,6 +169,7 @@
                parent="template.apacheMaven">
                <property name="bndProperties">
                        <props merge="true">
+                               <prop key="DynamicImport-Package">*</prop>
                                <prop key="Import-Package">
                                        com.sun.*;resolution:=optional,
                                        *
@@ -267,7 +303,7 @@
        <bean id="template.tikaMaven" parent="template.apacheMaven"
                abstract="true">
                <property name="version" value="@{version}.0" />
-               <property name="doNotModify" value="true" />
+               <!-- <property name="doNotModify" value="true" /> -->
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.APACHE" />