Update Jetty to 8.1.17.v20150415

[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 7428e9bb05a6ed435308a192ae3d63012c7d2ac0..74c442210e1dc441a0a0075754a2eb6d45276626 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.16.v20140903" />
+               <flow:arg name="jettyVersion" value="8.1.17.v20150415" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->
@@ -27,39 +27,26 @@
                        <property name="includes">
                                <map>
                                        <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation.jar"
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-http.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-io.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-security.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-server.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets.jar"
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-util.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"
                                                value="org.argeo.tp.jetty" />
-                                       <!-- Javax -->
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
-                                               value="org.argeo.tp.javax" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/annotations/javax.annotation-*.jar"
-                                               value="org.argeo.tp.javax" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/annotations/org.objectweb.asm-*.jar"
-                                               value="org.argeo.tp" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jndi/javax.activation-*.jar"
-                                               value="org.argeo.tp.javax" />
-                                       <entry
-                                               key="jetty-distribution-@{jettyVersion}/lib/jta/javax.transaction-*.jar"
-                                               value="org.argeo.tp.javax" />
                                </map>
                        </property>
                        <property name="excludes">