fic Merge pull request #689 from henschi/jetty9.4.57 ivy.xml conflicts

This commit is contained in:
Burkhard authored and GitHub committed 2025-03-31 21:08:13 +02:00
1 parent f559e1b256
commit 2b7c4ec577
1 file changed
+9 -9
+9 -9
View File
@@ -70,15 +70,15 @@
<dependency org="org.bitlet" name="weupnp" rev="0.1.4" />
<dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.79" />
<dependency org="com.fasterxml.woodstox" name="woodstox-core" rev="6.2.8" />
<dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.56.v20240826" />
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="9.4.56.v20240826" conf="compile->master" />
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.4.56.v20240826" conf="compile->master"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.56.v20240826"/>
<dependency org="org.eclipse.jetty" name="jetty-proxy" rev="9.4.56.v20240826"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.56.v20240826"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.56.v20240826"/>
<dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.56.v20240826"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.56.v20240826">
<dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.57.v20241219" />
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="9.4.57.v20241219" conf="compile->master" />
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.4.57.v20241219" conf="compile->master"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.57.v20241219"/>
<dependency org="org.eclipse.jetty" name="jetty-proxy" rev="9.4.57.v20241219"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.57.v20241219"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.57.v20241219"/>
<dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.57.v20241219"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.57.v20241219">
<exclude module="jetty-util-ajax" />
</dependency>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.57.v20241219" />