Update versions and introduce POI (and XML dependencies)

[gpl/argeo-tp.git] / META-INF / spring / eclipse.jetty.xml

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 74c442210e1dc441a0a0075754a2eb6d45276626..d1b48f3c8c99e3185f075e4018971328155fabdc 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -8,7 +8,7 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
-               <flow:arg name="jettyVersion" value="8.1.17.v20150415" />
+               <flow:arg name="jettyVersion" value="9.4.12.v20180830" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->
@@ -20,7 +20,7 @@
                abstract="true">
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
                        <property name="uri"
-                               value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
+                               value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/@{jettyVersion}/jetty-distribution-@{jettyVersion}.zip" />
                        <property name="license">
                                <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>
@@ -29,23 +29,32 @@
                                        <entry
                                                key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
                                </map>
                        </property>
@@ -54,13 +63,13 @@
                                        <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
                                </list>
                        </property>
-                       <property name="sourcesProvider">
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="uri"
-                                               value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
+<!--                   <property name="sourcesProvider"> -->
+<!--                           <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+<!--                                   <property name="uri" -->
+<!--                                           value="https://github.com/eclipse/jetty.project/archive/jetty-@{jettyVersion}.zip" /> -->
+<!--                                   <property name="osgiFactory" ref="osgiFactory" /> -->
+<!--                           </bean> -->
+<!--                   </property> -->
                        <property name="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>