Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
fic Merge pull request #689 from henschi/jetty9.4.57 ivy.xml conflicts
Burkhard2b7c4ec57722
diff --git a/ivy.xml b/ivy.xmlindex 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" />