summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurkhard <11603289+reger24@users.noreply.github.com>2025-03-31 21:08:13 +0200
committerGitHub <noreply@github.com>2025-03-31 21:08:13 +0200
commit2b7c4ec5772236a6cf0e3f2fd71dd692e6b5676c (patch)
treead87cb450d00e02d3a56c08f4a38769673a4fa03
parentf559e1b256cd58088f55bda85daac191ca98c3c5 (diff)
fic Merge pull request #689 from henschi/jetty9.4.57 ivy.xml conflicts
-rw-r--r--ivy.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/ivy.xml b/ivy.xml
index fadbbc192..e56cf4b0e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -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" />