projects / gpl / argeo-tp.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update versions and introduce POI (and XML dependencies)
[gpl/argeo-tp.git] / META-INF / spring / apache.xml
diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 97d02c34ba6be522ebc220a413b5da83e4515de0..7bb6573de3ecbf79d773a8c3f005f14bd7447f41 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:flow="http://www.argeo.org/schema/slc-flow"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-       <flow:flow name="apache/org.apache.lucene" spec="spec.version">
+       <flow:flow name="apache/org.apache.lucene"
+               spec="spec.version">
                <flow:arg name="version" value="3.6.2" />
                <bean id="org.apache.lucene" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.lucene:lucene-core:@{version}" />
+                       p:version="@{version}"
+                       p:sourceCoords="org.apache.lucene:lucene-core:@{version}" />
        </flow:flow>
 
        <flow:flow name="apache/org.apache.tika" spec="spec.version">
-               <flow:arg name="version" value="1.16" />
+               <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"
@@ -38,12 +42,14 @@
                </property>
        </bean>
 
-       <bean id="org.apache.mina.core" p:sourceCoords="org.apache.mina:mina-core:2.0.16"
+       <bean id="org.apache.mina.core"
+               p:sourceCoords="org.apache.mina:mina-core:2.0.19"
                parent="template.apacheMaven">
                <property name="doNotModify" value="true" />
        </bean>
-       
-       <bean id="org.apache.sshd.core" p:sourceCoords="org.apache.sshd:sshd-core:1.6.0"
+
+       <bean id="org.apache.sshd.core"
+               p:sourceCoords="org.apache.sshd:sshd-core:2.0.0"
                parent="template.apacheMaven">
                <property name="doNotModify" value="true" />
        </bean>
@@ -55,7 +61,8 @@
                        <property name="uri"
                                value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
                        <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>
                        <property name="wrappers">
                                <map>
@@ -67,47 +74,133 @@
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
                                        <property name="uri"
                                                value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-                                       <property name="base" value="apache-log4j-@{version}/src/main/java/" />
+                                       <property name="base"
+                                               value="apache-log4j-@{version}/src/main/java/" />
                                        <property name="osgiFactory" ref="osgiFactory" />
                                </bean>
                        </property>
                </bean>
        </flow:flow>
 
-       <flow:flow name="apache/org.apache.pdfbox" spec="spec.version">
+       <flow:flow name="apache/org.apache.pdfbox"
+               spec="spec.version">
                <flow:arg name="version" value="2.0.3" />
                <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}" />
+                       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}" />
        </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.poi:poi:@{version}" />
+               <bean id="org.apache.poi.ooxml" parent="template.apacheMaven"
+                       p:version="@{version}"
+                       p:sourceCoords="org.apache.poi:poi-ooxml:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Import-Package">
+                                               com.graphbuilder.*;resolution:=optional,
+                                               org.etsi.uri.*;resolution:=optional,
+                                               *
+                                       </prop>
+                               </props>
+                       </property>
+               </bean>
+
+               <bean id="org.apache.poi.ooxml.schemas"
+                       parent="template.apacheMaven" p:version="@{version}"
+                       p:sourceCoords="org.apache.poi:poi-ooxml-schemas:@{version}">
+                       <property name="bndProperties">
+                               <props merge="true">
+                                       <prop key="Import-Package">
+                                               com.microsoft.schemas.*;resolution:=optional,
+                                               org.openxmlformats.schemas.*;resolution:=optional,
+                                               *
+                                       </prop>
+                               </props>
+                       </property>
+               </bean>
+               <bean id="org.apache.poi.scratchpad"
+                       parent="template.apacheMaven" p:version="@{version}"
+                       p:sourceCoords="org.apache.poi:poi-scratchpad:@{version}" />
+       </flow:flow>
+
+       <bean id="org.apache.xmlbeans"
+               p:sourceCoords="org.apache.xmlbeans:xmlbeans:3.0.1"
+               parent="template.apacheMaven">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       com.sun.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+       <bean id="org.apache.xalan" p:sourceCoords="xalan:xalan:2.7.2"
+               parent="template.apacheMaven" />
+       <bean id="org.apache.xalan.serializer"
+               p:sourceCoords="xalan:serializer:2.7.2" parent="template.apacheMaven" />
+
+       <bean id="org.apache.xerces"
+               p:sourceCoords="xerces:xercesImpl:2.12.0"
+               parent="template.apacheMaven">
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Import-Package">
+                                       sun.*;resolution:=optional,
+                                       *
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+       <bean id="org.apache.xml.resolver"
+               p:sourceCoords="xml-resolver:xml-resolver:1.2"
+               parent="template.apacheMaven" />
+
+       <bean id="org.apache.xml.security"
+               p:sourceCoords="org.apache.santuario:xmlsec:2.1.2"
+               parent="template.apacheMaven" />
+
        <flow:flow name="apache/org.apache.batik" spec="spec.version">
-               <flow:arg name="version" value="1.9.1" />
+               <flow:arg name="version" value="1.10" />
                <!-- <bean id="org.apache.batik.ext" parent="template.apacheMaven" -->
                <!-- p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-ext:jar:@{version}" 
                        /> -->
                <bean id="org.apache.batik.i18n" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
+                       p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
                <bean id="org.apache.batik.util" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
+                       p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
                <bean id="org.apache.batik.css" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+                       p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
        </flow:flow>
 
-       <flow:flow name="apache/org.apache.xmlgraphics" spec="spec.version">
-               <flow:arg name="version" value="2.2.0" />
-               <bean id="org.apache.xmlgraphics.commons" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:2.2" />
+       <flow:flow name="apache/org.apache.xmlgraphics"
+               spec="spec.version">
+               <flow:arg name="version" value="2.3" />
+               <bean id="org.apache.xmlgraphics.commons"
+                       parent="template.apacheMaven" p:version="@{version}.0"
+                       p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:@{version}" />
        </flow:flow>
 
+
        <flow:flow name="apache/org.apache.httpcomponents.httpclient"
                spec="spec.version">
-               <flow:arg name="version" value="4.5.4" />
+               <flow:arg name="version" value="4.5.6" />
                <bean parent="template.archiveWrapper">
                        <property name="version" value="@{version}" />
                        <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>
                        <property name="uri"
                                value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
@@ -132,11 +225,12 @@
 
        <flow:flow name="apache/org.apache.httpcomponents.httpcore"
                spec="spec.version">
-               <flow:arg name="version" value="4.4.8" />
+               <flow:arg name="version" value="4.4.10" />
                <bean parent="template.archiveWrapper">
                        <property name="version" value="@{version}" />
                        <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                               <util:constant
+                                       static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>
                        <property name="uri"
                                value="http://archive.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-@{version}-osgi-bin.zip" />
@@ -165,7 +259,8 @@
                abstract="true">
                <property name="groupId" value="org.argeo.tp.apache" />
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
 
@@ -174,7 +269,8 @@
                <property name="version" value="@{version}.0" />
                <property name="doNotModify" value="true" />
                <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
 </beans>
\ No newline at end of file
Argeo Third Parties - An OSGi enterprise distribution