Merge branch 'yacy:master' into fileupload1.5

pull/696/head
Henschi 3 weeks ago committed by GitHub
commit 68c90cacf8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -403,6 +403,7 @@
<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="${libt}" includes="**/*.jar" />
<fileset dir="${src}" includes="**/*.class" />
<fileset dir="${build}" includes="**/*.class" />
<fileset dir="test/" includes="**/*.class" />

@ -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,28 +66,26 @@
<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.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="com.fasterxml.woodstox" name="woodstox-core" rev="6.2.8" />
<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.56.v20240826" />
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.4.56.v20240826" />
<dependency org="org.eclipse.jetty.http2" name="http2-client" rev="9.4.56.v20240826" conf="compile->master"/>
<dependency org="org.eclipse.jetty.http2" name="http2-common" rev="9.4.56.v20240826" conf="compile->master"/>
<dependency org="org.eclipse.jetty.http2" name="http2-http-client-transport" rev="9.4.56.v20240826" conf="compile->master"/>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.57.v20241219" />
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.4.57.v20241219" />
<dependency org="org.eclipse.jetty.http2" name="http2-client" rev="9.4.57.v20241219" conf="compile->master"/>
<dependency org="org.eclipse.jetty.http2" name="http2-common" rev="9.4.57.v20241219" conf="compile->master"/>
<dependency org="org.eclipse.jetty.http2" name="http2-http-client-transport" rev="9.4.57.v20241219" conf="compile->master"/>
<dependency org="org.jsoup" name="jsoup" rev="1.15.3" />
<dependency org="org.jwat" name="jwat-warc" rev="1.1.3" />
<dependency org="org.locationtech.spatial4j" name="spatial4j" rev="0.8"/>
@ -100,10 +98,8 @@
<dependency org="org.tukaani" name="xz" rev="1.8"/>
<dependency org="oro" name="oro" rev="2.0.8"/>
<dependency org="junit" name="junit" rev="4.13" conf="test->default"/>
<dependency org="org.hamcrest" name="hamcrest" rev="2.2" conf="test->default"/>
<dependency org="org.hamcrest" name="hamcrest-core" rev="2.2" conf="test->default"/>
<dependency org="org.hamcrest" name="hamcrest-library" rev="2.2" conf="test->default"/>
<dependency org="junit" name="junit" rev="4.13.2" conf="test->default"/>
<dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" conf="test->default"/>
<dependency org="com.github.luben" name="zstd-jni" rev="1.5.5-6"></dependency>
<dependency org="ai.djl" name ="api" rev="0.27.0"></dependency>
</dependencies>

6
libt/.gitignore vendored

@ -1,4 +1,2 @@
hamcrest-2.2.jar
hamcrest-core-2.2.jar
hamcrest-library-2.2.jar
junit-4.13.jar
hamcrest-core-1.3.jar
junit-4.13.2.jar

Loading…
Cancel
Save