boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into jetty9.4.57

Browse Source
pull/689/head
Burkhard 3 weeks ago committed by GitHub
parent 783a0aa496 9e65ce9091
commit e234c2637e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File

3
build.xml
Unescape View File

@ -60,7 +60,7 @@
<target name="install-ivy" description="--> install ivy">
<local name="ivy.download.dir"/><property name="ivy.download.dir" value="${basedir}/ivy" />
<local name="ivy.download.file"/><property name="ivy.download.file" value="${ivy.download.dir}/ivy.jar" />
<local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.0"/>
<local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.3"/>
<local name="ivy.debian.file"/><property name="ivy.debian.file" value="/usr/share/java/ivy.jar" />
<!-- Check whether ivy is already available as a Debian package -->
@ -401,6 +401,7 @@
<target name="clean" description="make clean">
<delete dir="${release_main}" failonerror="false"/>
<delete failonerror="false">
<fileset dir="${basedir}/ivy" includes="**/*.jar" />
<fileset dir="${lib}" includes="**/*.jar" excludes="org.restlet.jar" /> <!-- we cannot find the org.restlet.jar in maven -->
<fileset dir="${src}" includes="**/*.class" />
<fileset dir="${build}" includes="**/*.class" />

26
ivy.xml
Unescape View File

@ -25,7 +25,7 @@
<dependency org="commons-codec" name="commons-codec" rev="1.15" />
<dependency org="commons-io" name="commons-io" rev="2.17.0" />
<dependency org="commons-logging" name="commons-logging" rev="1.2" />
<dependency org="io.dropwizard.metrics" name="metrics-core" rev="3.2.2"/>
<dependency org="io.dropwizard.metrics" name="metrics-core" rev="4.1.5"/>
<dependency org="io.dropwizard.metrics" name="metrics-jmx" rev="4.1.5" conf="compile->master"/>
<dependency org="io.opentracing" name="opentracing-noop" rev="0.33.0"/>
<dependency org="io.opentracing" name="opentracing-util" rev="0.33.0"/>
@ -66,21 +66,19 @@
<dependency org="org.apache.solr" name="solr-core" rev="9.0.0" conf="compile->master"/>
<dependency org="org.apache.solr" name="solr-scripting" rev="9.0.0" conf="compile->master"/>
<dependency org="org.apache.solr" name="solr-solrj" rev="9.0.0" conf="compile->master" />
<dependency org="org.apache.zookeeper" name="zookeeper" rev="3.6.2" conf="compile->master" />
<dependency org="org.apache.zookeeper" name="zookeeper" rev="3.7.0" conf="compile->master" />
<dependency org="org.bitlet" name="weupnp" rev="0.1.4" />
<dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.79" />
<dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.4.1">
<exclude module="stax-api" />
</dependency>
<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">
<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">
<exclude module="jetty-util-ajax" />
</dependency>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.57.v20241219" />

Write Preview
Loading…
Cancel
Save