X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Feclipse.jetty.xml;h=23dab080bfe7cbbbb644b31766aac076808c9d2e;hb=e3deb55aef36868ee95f2a8b349d878d23a357ba;hp=aab369aec1f2cbe444abe5ca7f17064efd5cf8f9;hpb=0f0e8df126acafadabecebbe4ce960ce68d06f0d;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index aab369a..23dab08 100644
--- 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="9.4.6.v20170531" />
 	</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,39 +29,33 @@
 					<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"
-						value="org.argeo.tp.jetty" />
-					<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"
-						value="org.argeo.tp.jetty" />
-					<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-http-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{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" />
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
 					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/annotations/org.objectweb.asm-*.jar"
-						value="org.argeo.tp" />
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
 					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/jndi/javax.activation-*.jar"
-						value="org.argeo.tp.javax" />
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
 					<entry
-						key="jetty-distribution-@{jettyVersion}/lib/jta/javax.transaction-*.jar"
-						value="org.argeo.tp.javax" />
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
 				</map>
 			</property>
 			<property name="excludes">
@@ -69,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>