Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@tresf
tresf committed Nov 13, 2023
1 parent ec36f91 commit 8c8b902
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 119 deletions.
12 changes: 12 additions & 0 deletions ant/deps.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Dependencies
jetty.version=10.0.16
jna.version=5.13.0
log4j.version=2.21.1
pdfbox.version=2.0.30
twelvemonkeys.version=3.10.1
bouncycastle.version=1.76
usb4java.version=1.2.0
hid4java.version=0.7.0
purejavahidapi.version=0.0.10
javasemver.version=0.9.0
jettison.version=1.5.4
jssc.version=2.9.5
jaiimageio.version=1.4.0
icu4j.version=74.1
javafx.version=19.0.2.1
javafx.monocle=true

Expand Down
152 changes: 33 additions & 119 deletions ant/ivy.xml
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,32 @@
<ivy-module version="2.0" xmlns:m="https://ant.apache.org/ivy/maven">
<ivy-module version="2.0" xmlns:m="antlib:org.apache.ivy.ant">
<info organisation="io.qz" module="qz-tray"/>
<dependencies>
<!-- Core -->
<dependency name="jna-platform"
org="net.java.dev.jna"
conf="*->default"
rev="5.13.0"/>
<dependency name="jna"
org="net.java.dev.jna"
conf="*->default"
rev="5.13.0"/>
<dependency name="bcprov-jdk18on"
org="org.bouncycastle"
conf="*->default"
rev="1.76"/>
<dependency name="bcpkix-jdk18on"
org="org.bouncycastle"
conf="*->default"
rev="1.76"/>

<dependency name="java-semver"
org="com.github.zafarkhaja"
conf="*->default"
rev="0.9.0">
<!-- Skip, need 0.7.0-SNAPSHOT -->
<dependency name="jna-platform" org="net.java.dev.jna" conf="*->default" rev="${jna.version}"/>
<dependency name="jna" org="net.java.dev.jna" conf="*->default" rev="${jna.version}"/>
<dependency name="bcprov-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
<dependency name="bcpkix-jdk18on" org="org.bouncycastle" conf="*->default" rev="${bouncycastle.version}"/>
<dependency name="java-semver" org="com.github.zafarkhaja" conf="*->default" rev="${javasemver.version}">
<!-- Skip, need 0.10.0-SNAPSHOT -->
<exclude name="*"/>
</dependency>

<!-- Websockets -->
<dependency name="jettison"
org="org.codehaus.jettison"
conf="*->default"
rev="1.5.4">
<dependency name="jettison" org="org.codehaus.jettison" conf="*->default" rev="${jettison.version}">
<!-- FIXME: Skip, currently 1.3.3-SNAPSHOT needs testing -->
<exclude name="*"/>
</dependency>

<dependency name="jakarta.websocket-api"
org="jakarta.websocket"
conf="*->default"
<dependency name="jakarta.websocket-api" org="jakarta.websocket" conf="*->default"
rev="2.1.1">
<!-- FIXME: Skip, currently 1.1 needs testing -->
<exclude name="*"/>
</dependency>
<dependency name="javax.websocket-api"
org="javax.websocket"
conf="*->default"
<dependency name="javax.websocket-api" org="javax.websocket" conf="*->default"
rev="1.1"/>
<!-- FIXME: Replace with jakarta above? -->

<dependency name="jetty-servlet-api"
org="org.eclipse.jetty.toolchain"
conf="*->default"
<dependency name="jetty-servlet-api" org="org.eclipse.jetty.toolchain" conf="*->default"
rev="4.0.6"/>

<!-- Jetty -->
Expand All @@ -74,47 +49,25 @@
<dependency name="websocket-servlet" org="org.eclipse.jetty.websocket" conf="*->default" rev="${jetty.version}"/>

<!-- Apache Commons -->
<dependency name="commons-codec"
org="commons-codec"
conf="*->default"
<dependency name="commons-codec" org="commons-codec" conf="*->default"
rev="1.15">
</dependency>
<dependency name="commons-io"
org="commons-io"
conf="*->default"
<dependency name="commons-io" org="commons-io" conf="*->default"
rev="2.11.0">
</dependency>
<dependency name="commons-pool2"
org="org.apache.commons"
conf="*->default"
<dependency name="commons-pool2" org="org.apache.commons" conf="*->default"
rev="2.11.1">
</dependency>
<dependency name="not-going-to-be-commons-ssl"
org="com.narupley"
conf="*->default"
<dependency name="not-going-to-be-commons-ssl" org="com.narupley" conf="*->default"
rev="0.3.20">
<exclude name="bcprov-jdk15on"/>
</dependency>

<!-- Communications -->
<dependency name="usb-api"
org="javax.usb"
conf="*->default"
rev="1.0.2">
</dependency>
<dependency name="usb4java"
org="org.usb4java"
conf="*->default"
rev="1.2.0">
</dependency>
<dependency name="usb4java-javax"
org="org.usb4java"
conf="*->default"
rev="1.2.0">
</dependency>
<dependency name="libusb4java"
org="org.usb4java"
rev="1.2.0">
<dependency name="usb-api" org="javax.usb" conf="*->default" rev="1.0.2"/>
<dependency name="usb4java" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
<dependency name="usb4java-javax" org="org.usb4java" conf="*->default" rev="${usb4java.version}"/>
<dependency name="libusb4java" org="org.usb4java" rev="1.2.0">
<artifact name="libusb4java" type="jar" m:classifier="linux-arm"/>
<artifact name="libusb4java" type="jar" m:classifier="linux-x86_64"/>
<artifact name="libusb4java" type="jar" m:classifier="linux-x86"/>
Expand All @@ -124,61 +77,37 @@
<artifact name="libusb4java" type="jar" m:classifier="windows-x86"/>
</dependency>

<dependency name="purejavahidapi"
org="nyholku"
conf="*->default"
rev="0.0.10">
<dependency name="purejavahidapi" org="nyholku" conf="*->default" rev="${purejavahidapi.version}">
<exclude name="jna"/>
<!-- Skip, need 0.0.10-SNAPSHOT -->
<exclude name="*"/>
</dependency>
<dependency name="hid4java"
org="org.hid4java"
conf="*->default"
rev="0.7.0">
<dependency name="hid4java" org="org.hid4java" conf="*->default" rev="${hid4java.version}">
<exclude name="jna"/>
<!-- Skip, need 0.7.2-SNAPSHOT -->
<exclude name="*"/>
</dependency>
<dependency name="jssc"
org="io.github.java-native"
conf="*->default"
rev="2.9.2">
<dependency name="jssc" org="io.github.java-native" conf="*->default" rev="${jssc.version}">
<exclude name="jna"/>
<!-- Skip, need 2.9.3-SNAPSHOT -->
<!-- Skip, need 2.9.6-SNAPSHOT -->
<exclude name="*"/>
</dependency>
<!-- Theming -->
<dependency name="darcula-bobbylight"
org="com.bulenkov.darcula"
conf="*->default"
rev="0.0.0">
<dependency name="darcula-bobbylight" org="com.bulenkov.darcula" conf="*->default" rev="0.0.0">
<!-- Skip, missing -->
<exclude name="*"/>
</dependency>

<!-- Windows Installer -->
<dependency name="mslinks"
org="mslinks"
conf="*->default"
rev="1.1.0">
<dependency name="mslinks" org="mslinks" conf="*->default" rev="1.1.0">
<!-- Skip, missing -->
<exclude name="*"/>
</dependency>

<!-- Charsets -->
<dependency name="icu4j"
org="com.ibm.icu"
conf="*->default"
rev="74.1"/>
<dependency name="icu4j-charset"
org="com.ibm.icu"
conf="*->default"
rev="74.1"/>
<dependency name="TCVN-3"
org="com.ibm.icu"
conf="*->default"
rev="74.1">
<dependency name="icu4j" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
<dependency name="icu4j-charset" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}"/>
<dependency name="TCVN-3" org="com.ibm.icu" conf="*->default" rev="${icu4j.version}">
<!-- Skip, missing, send upstream? -->
<exclude name="*"/>
</dependency>
Expand All @@ -191,30 +120,15 @@
<dependency name="imageio-jpeg" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>
<dependency name="imageio-metadata" org="com.twelvemonkeys.imageio" conf="*->default" rev="${twelvemonkeys.version}"/>

<dependency name="jai-imageio-core"
org="com.github.jai-imageio"
conf="*->default"
rev="1.4.0"/>
<dependency name="jai-imageio-jpeg2000"
org="com.github.jai-imageio"
conf="*->default"
rev="1.4.0"/>
<dependency name="jai-imageio-core" org="com.github.jai-imageio" conf="*->default" rev="${jaiimageio.version}"/>
<dependency name="jai-imageio-jpeg2000" org="com.github.jai-imageio" conf="*->default" rev="${jaiimageio.version}"/>

<!-- Logging -->
<dependency name="log4j-core"
org="org.apache.logging.log4j"
conf="*->default"
rev="2.21.1"/>
<dependency name="log4j-api"
org="org.apache.logging.log4j"
conf="*->default"
rev="2.21.1"/>
<dependency name="log4j-core" org="org.apache.logging.log4j" conf="*->default" rev="${log4j.version}"/>
<dependency name="log4j-api" org="org.apache.logging.log4j" conf="*->default" rev="${log4j.version}"/>

<!-- Printing -->
<dependency name="pdfbox"
org="org.apache.pdfbox"
conf="*->default"
rev="2.0.30">
<dependency name="pdfbox" org="org.apache.pdfbox" conf="*->default" rev="${pdfbox.version}">
<exclude name="log4j-core"/>
<exclude name="log4j-api"/>
<exclude name="commons-httpclient"/>
Expand Down

0 comments on commit 8c8b902

Please sign in to comment.