Bump dependencies (qzind#1174)

* Bumps Jetty, Log4J, pdfbox, apache commons, JNA, JDK
tresf · Oct 4, 2023 · 4d1eb2b · 4d1eb2b
1 parent 730e31b
commit 4d1eb2b
Show file tree

Hide file tree

Showing 42 changed files with 4 additions and 4 deletions.
diff --git a/ant/project.properties b/ant/project.properties
@@ -36,7 +36,7 @@ java.download=https://bell-sw.com/pages/downloads/#/java-11-lts
 # Java vendor to bundle into software (e.g. "*BellSoft|Adoptium|Microsoft|Amazon|IBM")
 jlink.java.vendor="BellSoft"
 # Java vendor to bundle into software (e.g. "11.0.17+7")
-jlink.java.version="11.0.20+8"
+jlink.java.version="11.0.20.1+1"
 # Java garbage collector flavor to use (e.g. "hotspot|openj9")
 jlink.java.gc="hotspot"
 # Java garbage collector version to use (e.g. openj9: "0.35.0", zulu: "11.62.17")

diff --git a/lib/commons-codec-1.15.jar b/lib/commons-codec-1.15.jar
diff --git a/lib/commons-codec-1.16.0.jar b/lib/commons-codec-1.16.0.jar
diff --git a/lib/commons-io-2.11.0.jar b/lib/commons-io-2.11.0.jar
diff --git a/lib/commons-io-2.13.0.jar b/lib/commons-io-2.13.0.jar
diff --git a/lib/commons-lang3-3.12.0.jar b/lib/commons-lang3-3.12.0.jar
diff --git a/lib/commons-lang3-3.13.0.jar b/lib/commons-lang3-3.13.0.jar
diff --git a/lib/communication/jna-5.12.1.jar b/lib/communication/jna-5.12.1.jar
diff --git a/lib/communication/jna-5.13.0.jar b/lib/communication/jna-5.13.0.jar
diff --git a/lib/communication/jna-platform-5.12.1.jar → lib/communication/jna-platform-5.13.0.jar b/lib/communication/jna-platform-5.12.1.jar → lib/communication/jna-platform-5.13.0.jar
diff --git a/lib/logging/log4j-api-2.19.0.jar b/lib/logging/log4j-api-2.19.0.jar
diff --git a/lib/logging/log4j-api-2.20.0.jar b/lib/logging/log4j-api-2.20.0.jar
diff --git a/lib/logging/log4j-core-2.19.0.jar → lib/logging/log4j-core-2.20.0.jar b/lib/logging/log4j-core-2.19.0.jar → lib/logging/log4j-core-2.20.0.jar
diff --git a/lib/printing/pdfbox-app-2.0.29-SNAPSHOT.jar → lib/printing/pdfbox-app-2.0.29.jar b/lib/printing/pdfbox-app-2.0.29-SNAPSHOT.jar → lib/printing/pdfbox-app-2.0.29.jar
diff --git a/lib/websocket/jetty-client-10.0.15.jar b/lib/websocket/jetty-client-10.0.15.jar
diff --git a/lib/websocket/jetty-client-10.0.16.jar b/lib/websocket/jetty-client-10.0.16.jar
diff --git a/lib/websocket/jetty-http-10.0.15.jar b/lib/websocket/jetty-http-10.0.15.jar
diff --git a/lib/websocket/jetty-http-10.0.16.jar b/lib/websocket/jetty-http-10.0.16.jar
diff --git a/lib/websocket/jetty-io-10.0.15.jar b/lib/websocket/jetty-io-10.0.15.jar
diff --git a/lib/websocket/jetty-io-10.0.16.jar b/lib/websocket/jetty-io-10.0.16.jar
diff --git a/lib/websocket/jetty-security-10.0.15.jar b/lib/websocket/jetty-security-10.0.15.jar
diff --git a/lib/websocket/jetty-security-10.0.16.jar b/lib/websocket/jetty-security-10.0.16.jar
diff --git a/lib/websocket/jetty-server-10.0.15.jar b/lib/websocket/jetty-server-10.0.15.jar
diff --git a/lib/websocket/jetty-server-10.0.16.jar b/lib/websocket/jetty-server-10.0.16.jar
diff --git a/lib/websocket/jetty-servlet-10.0.15.jar b/lib/websocket/jetty-servlet-10.0.15.jar
diff --git a/lib/websocket/jetty-servlet-10.0.16.jar b/lib/websocket/jetty-servlet-10.0.16.jar
diff --git a/lib/websocket/jetty-util-10.0.15.jar b/lib/websocket/jetty-util-10.0.15.jar
diff --git a/lib/websocket/jetty-util-10.0.16.jar b/lib/websocket/jetty-util-10.0.16.jar
diff --git a/lib/websocket/websocket-core-client-10.0.15.jar b/lib/websocket/websocket-core-client-10.0.15.jar
diff --git a/lib/websocket/websocket-core-client-10.0.16.jar b/lib/websocket/websocket-core-client-10.0.16.jar
diff --git a/lib/websocket/websocket-core-common-10.0.15.jar b/lib/websocket/websocket-core-common-10.0.15.jar
diff --git a/lib/websocket/websocket-core-common-10.0.16.jar b/lib/websocket/websocket-core-common-10.0.16.jar
diff --git a/...bsocket/websocket-core-server-10.0.15.jar → ...bsocket/websocket-core-server-10.0.16.jar b/...bsocket/websocket-core-server-10.0.15.jar → ...bsocket/websocket-core-server-10.0.16.jar
diff --git a/...websocket/websocket-jetty-api-10.0.15.jar → ...websocket/websocket-jetty-api-10.0.16.jar b/...websocket/websocket-jetty-api-10.0.15.jar → ...websocket/websocket-jetty-api-10.0.16.jar
diff --git a/...socket/websocket-jetty-client-10.0.15.jar → ...socket/websocket-jetty-client-10.0.16.jar b/...socket/websocket-jetty-client-10.0.15.jar → ...socket/websocket-jetty-client-10.0.16.jar
diff --git a/lib/websocket/websocket-jetty-common-10.0.15.jar b/lib/websocket/websocket-jetty-common-10.0.15.jar
diff --git a/lib/websocket/websocket-jetty-common-10.0.16.jar b/lib/websocket/websocket-jetty-common-10.0.16.jar
diff --git a/lib/websocket/websocket-jetty-server-10.0.15.jar b/lib/websocket/websocket-jetty-server-10.0.15.jar
diff --git a/lib/websocket/websocket-jetty-server-10.0.16.jar b/lib/websocket/websocket-jetty-server-10.0.16.jar
diff --git a/lib/websocket/websocket-servlet-10.0.15.jar → lib/websocket/websocket-servlet-10.0.16.jar b/lib/websocket/websocket-servlet-10.0.15.jar → lib/websocket/websocket-servlet-10.0.16.jar
diff --git a/src/qz/build/JLink.java b/src/qz/build/JLink.java
@@ -147,7 +147,7 @@ private static boolean needsDownload(Version want, Version installed) {
      * Download the JDK and return the path it was extracted to
      */
     private String downloadJdk(Arch arch, Platform platform) throws IOException {
-        String url = new Url(this.javaVendor).format(arch, platform, this.gcEngine, this.javaSemver, this.gcVersion);
+        String url = new Url(this.javaVendor).format(arch, platform, this.gcEngine, this.javaSemver, this.javaVersion, this.gcVersion);
 
         // Saves to out e.g. "out/jlink/jdk-AdoptOpenjdk-amd64-platform-11_0_7"
         String extractedJdk = new Fetcher(String.format("jlink/jdk-%s-%s-%s-%s", javaVendor.value(), arch.value(), platform.value(), javaSemver.toString().replaceAll("\\+", "_")), url)

diff --git a/src/qz/build/jlink/Url.java b/src/qz/build/jlink/Url.java
@@ -36,15 +36,15 @@ public Url(Vendor vendor) {
         pattern = VENDOR_URL_MAP.get(vendor);
     }
 
-    public String format(Arch arch, Platform platform, String gcEngine, Version javaSemver, String gcVer) throws UnsupportedEncodingException {
+    public String format(Arch arch, Platform platform, String gcEngine, Version javaSemver, String javaVersion, String gcVer) throws UnsupportedEncodingException {
         Url pattern = new Url(vendor);
         String urlArch = vendor.getUrlArch(arch);
         String fileExt = vendor.getUrlExtension(platform);
         String urlPlatform = vendor.getUrlPlatform(platform);
         String urlJavaVersion = vendor.getUrlJavaVersion(javaSemver);
 
         // Convert "+" to "%2B"
-        String urlJavaVersionEncode = URLEncoder.encode(javaSemver.toString(), "UTF-8");
+        String urlJavaVersionEncode = URLEncoder.encode(javaVersion, "UTF-8");
 
         int javaMajor = javaSemver.getMajorVersion();
         switch(vendor) {