transitive deps update

This commit is contained in:
Greg DiCristofaro 2025-01-08 09:27:33 -05:00
parent 445dad824e
commit 9f295600be
No known key found for this signature in database
8 changed files with 41 additions and 59 deletions

View File

@ -30,7 +30,7 @@
<dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.13.52" />
<dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
<dependency conf="core->default" org="com.squareup.okhttp3" name="okhttp" rev="4.12.0"/>
<dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.5"/>
<!-- for yaml reading/writing -->
@ -81,19 +81,14 @@
<exclude name="jna" />
<exclude name="jna-platform" />
</dependency>
<!--
<override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
<override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
<override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/>
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
//changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
<exclude org="org.bouncycastle" module="bcpkix-jdk15on"/>
<exclude org="*" ext="*" type="javadoc"/>
<override org="commons-io" module="commons-io" rev="2.18.0"/>
<override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
<override org="io.netty" module="netty-transport" rev="4.1.116.Final"/>
<override org="junit" module="junit" rev="4.13.2"/>
</dependencies>
</ivy-module>

View File

@ -130,21 +130,14 @@
<dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.28"/>
<dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="2.24.3" transitive="false"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.24.3" transitive="false"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="${log4j.version}" transitive="false"/>
<dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="${log4j.version}" transitive="false"/>
<exclude org="*" ext="*" type="javadoc"/>
<exclude org="log4j" module="log4j"/>
<!--
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
<override org="io.netty" module="netty-transport" rev="4.1.116.Final"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/>
<override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
<override org="com.fasterxml.jackson.core" module="jackson-databind" rev="${jackson.version}"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="${jackson.version}"/>
// changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
</dependencies>
</ivy-module>

View File

@ -3,6 +3,7 @@
<property name="jackson.version" value="2.18.2"/>
<property name="jfxtras.version" value="17-r1"/>
<property name="twelvemonkeys.version" value="3.12.0"/>
<property name="log4j.version" value="2.24.3"/>
<settings defaultResolver="main"/>
<resolvers>

View File

@ -9,5 +9,8 @@
<dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.15.11"/>
<dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.4"/>
<dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
<exclude org="*" ext="*" type="javadoc"/>
</dependencies>
</ivy-module>

View File

@ -34,33 +34,29 @@
<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="${jetty.version}"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="${jetty.version}"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="${jetty.version}"/>
<dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
<dependency conf="servlet->default" org="jakarta.servlet" name="jakarta.servlet-api" rev="6.1.0"/>
<!-- logging -->
<dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"/>
<dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="${slf4j.version}"/>
<!--
<exclude org="*" ext="*" type="javadoc"/>
<exclude org="org.apache.logging.log4j" ext="*"/>
<exclude org="com.google.code.gson" ext="*"/>
<exclude org="com.google.guava" ext="*"/>
<override org="commons-io" module="commons-io" rev="2.18"/>
<override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
<override org="org.apache.logging.log4j" module="log4j-api" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-core" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-web" rev="${log4j.version}"/>
<override org="org.apache.logging.log4j" module="log4j-api" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-core" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
<override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
<override org="org.slf4j" module="slf4j-api" rev="${slf4j.version}"/>
<override org="io.netty" module="netty-transport" rev="4.1.116.Final"/>
<override org="io.netty" module="netty-common" rev="4.1.116.Final"/>
<override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
<override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/>
<override org="com.google.guava" module="guava" rev="31.1-jre"/>
<override org="joda-time" module="joda-time" rev="2.10.14" /> -->
<override org="org.apache.zookeeper" module="zookeeper" rev="3.9.3"/>
<override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.9.3"/>
</dependencies>
</ivy-module>

View File

@ -1,7 +1,8 @@
<ivysettings>
<property name="jetty.version" value="12.0.16"/>
<property name="slf4j.version" value="2.0.16"/>
<property name="log4j.version" value="2.24.3"/>
<settings defaultResolver="main"/>
<resolvers>
<chain name="main">

View File

@ -8,20 +8,11 @@
<dependency conf="tika->default" org="org.apache.tika" name="tika-core" rev="3.0.0"/>
<dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
<!-- https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
<!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
<override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
<override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
<override org="com.google.code.gson" module="gson" rev="2.9.0"/>
<override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
<override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
<override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/>
<override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/>
// changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2
<override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
<override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
<exclude org="*" ext="*" type="javadoc"/>
<override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
<override org="org.apache.logging.log4j" module="log4j-api" rev="${log4j.version}"/>
</dependencies>
</ivy-module>

View File

@ -1,5 +1,7 @@
<ivysettings>
<settings defaultResolver="main"/>
<property name="log4j.version" value="2.24.3"/>
<resolvers>
<chain name="main">
<ibiblio name="central" root="https://repo1.maven.org/maven2" m2compatible="true"/>