Update dependencies (qzind#1000)

* Bump Java and internal versions to use "-SNAPSHOT" notation between builds * Handle JDK-8240734 for older JDKs too. * Add workaround for broken commons-io copyDirectory behavior. Per qzind#1011 Co-authored-by: lite1979 <[email protected]>
LetsDelivery · Aug 21, 2022 · 0e151fb · 0e151fb
1 parent 14d249e
commit 0e151fb
Show file tree

Hide file tree

Showing 45 changed files with 13 additions and 11 deletions.
diff --git a/js/qz-tray.js b/js/qz-tray.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /**
- * @version 2.2.1
+ * @version 2.2.2-SNAPSHOT
  * @overview QZ Tray Connector
  * <p/>
  * Connects a web client to the QZ Tray software.
@@ -38,7 +38,7 @@ var qz = (function() {
 ///// PRIVATE METHODS /////
 
     var _qz = {
-        VERSION: "2.2.1",                              //must match @version above
+        VERSION: "2.2.2-SNAPSHOT",                              //must match @version above
         DEBUG: false,
 
         log: {

diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar
diff --git a/lib/commons-codec-1.15.jar b/lib/commons-codec-1.15.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.4.jar b/lib/commons-io-2.4.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.4.jar b/lib/commons-lang3-3.4.jar
diff --git a/lib/commons-pool2-2.11.1.jar b/lib/commons-pool2-2.11.1.jar
diff --git a/lib/commons-pool2-2.4.2.jar b/lib/commons-pool2-2.4.2.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.8.0.jar b/lib/communication/jna-5.8.0.jar
diff --git a/lib/communication/jna-platform-5.8.0.jar → lib/communication/jna-platform-5.12.1.jar b/lib/communication/jna-platform-5.8.0.jar → lib/communication/jna-platform-5.12.1.jar
diff --git a/lib/imaging/common-image-3.6.jar → lib/imaging/common-image-3.8.2.jar b/lib/imaging/common-image-3.6.jar → lib/imaging/common-image-3.8.2.jar
diff --git a/lib/imaging/common-io-3.6.jar → lib/imaging/common-io-3.8.2.jar b/lib/imaging/common-io-3.6.jar → lib/imaging/common-io-3.8.2.jar
diff --git a/lib/imaging/common-lang-3.6.jar b/lib/imaging/common-lang-3.6.jar
diff --git a/lib/imaging/common-lang-3.8.2.jar b/lib/imaging/common-lang-3.8.2.jar
diff --git a/lib/imaging/imageio-core-3.6.jar b/lib/imaging/imageio-core-3.6.jar
diff --git a/lib/imaging/imageio-core-3.8.2.jar b/lib/imaging/imageio-core-3.8.2.jar
diff --git a/lib/imaging/imageio-jpeg-3.6.jar b/lib/imaging/imageio-jpeg-3.6.jar
diff --git a/lib/imaging/imageio-jpeg-3.8.2.jar b/lib/imaging/imageio-jpeg-3.8.2.jar
diff --git a/lib/imaging/imageio-metadata-3.6.jar b/lib/imaging/imageio-metadata-3.6.jar
diff --git a/lib/imaging/imageio-metadata-3.8.2.jar b/lib/imaging/imageio-metadata-3.8.2.jar
diff --git a/lib/logging/log4j-api-2.17.2.jar → lib/logging/log4j-api-2.18.0.jar b/lib/logging/log4j-api-2.17.2.jar → lib/logging/log4j-api-2.18.0.jar
diff --git a/lib/logging/log4j-core-2.17.2.jar → lib/logging/log4j-core-2.18.0.jar b/lib/logging/log4j-core-2.17.2.jar → lib/logging/log4j-core-2.18.0.jar
diff --git a/lib/mslinks-1.0.7.jar b/lib/mslinks-1.0.7.jar
diff --git a/lib/mslinks-1.1.0.jar b/lib/mslinks-1.1.0.jar
diff --git a/lib/printing/pdfbox-app-2.0.24.jar → lib/printing/pdfbox-app-2.0.26.jar b/lib/printing/pdfbox-app-2.0.24.jar → lib/printing/pdfbox-app-2.0.26.jar
diff --git a/lib/websocket/javax-websocket-server-impl-9.4.45.v20220203.jar b/lib/websocket/javax-websocket-server-impl-9.4.45.v20220203.jar
diff --git a/...bsocket/jetty-client-9.4.45.v20220203.jar → ...bsocket/jetty-client-9.4.48.v20220622.jar b/...bsocket/jetty-client-9.4.45.v20220203.jar → ...bsocket/jetty-client-9.4.48.v20220622.jar
diff --git a/...websocket/jetty-http-9.4.45.v20220203.jar → ...websocket/jetty-http-9.4.48.v20220622.jar b/...websocket/jetty-http-9.4.45.v20220203.jar → ...websocket/jetty-http-9.4.48.v20220622.jar
diff --git a/lib/websocket/jetty-io-9.4.45.v20220203.jar → lib/websocket/jetty-io-9.4.48.v20220622.jar b/lib/websocket/jetty-io-9.4.45.v20220203.jar → lib/websocket/jetty-io-9.4.48.v20220622.jar
diff --git a/...ocket/jetty-security-9.4.45.v20220203.jar → ...ocket/jetty-security-9.4.48.v20220622.jar b/...ocket/jetty-security-9.4.45.v20220203.jar → ...ocket/jetty-security-9.4.48.v20220622.jar
diff --git a/...bsocket/jetty-server-9.4.45.v20220203.jar → ...bsocket/jetty-server-9.4.48.v20220622.jar b/...bsocket/jetty-server-9.4.45.v20220203.jar → ...bsocket/jetty-server-9.4.48.v20220622.jar
diff --git a/...socket/jetty-servlet-9.4.45.v20220203.jar → ...socket/jetty-servlet-9.4.48.v20220622.jar b/...socket/jetty-servlet-9.4.45.v20220203.jar → ...socket/jetty-servlet-9.4.48.v20220622.jar
diff --git a/...websocket/jetty-util-9.4.45.v20220203.jar → ...websocket/jetty-util-9.4.48.v20220622.jar b/...websocket/jetty-util-9.4.45.v20220203.jar → ...websocket/jetty-util-9.4.48.v20220622.jar
diff --git a/...socket/websocket-api-9.4.45.v20220203.jar → ...socket/websocket-api-9.4.48.v20220622.jar b/...socket/websocket-api-9.4.45.v20220203.jar → ...socket/websocket-api-9.4.48.v20220622.jar
diff --git a/...ket/websocket-client-9.4.45.v20220203.jar → ...ket/websocket-client-9.4.48.v20220622.jar b/...ket/websocket-client-9.4.45.v20220203.jar → ...ket/websocket-client-9.4.48.v20220622.jar
diff --git a/...ket/websocket-common-9.4.45.v20220203.jar → ...ket/websocket-common-9.4.48.v20220622.jar b/...ket/websocket-common-9.4.45.v20220203.jar → ...ket/websocket-common-9.4.48.v20220622.jar
diff --git a/...ket/websocket-server-9.4.45.v20220203.jar → ...ket/websocket-server-9.4.48.v20220622.jar b/...ket/websocket-server-9.4.45.v20220203.jar → ...ket/websocket-server-9.4.48.v20220622.jar
diff --git a/...et/websocket-servlet-9.4.45.v20220203.jar → ...et/websocket-servlet-9.4.48.v20220622.jar b/...et/websocket-servlet-9.4.45.v20220203.jar → ...et/websocket-servlet-9.4.48.v20220622.jar
diff --git a/src/qz/build/JLink.java b/src/qz/build/JLink.java
@@ -28,7 +28,7 @@ public class JLink {
     private static final Logger log = LogManager.getLogger(JLink.class);
     private static final String JAVA_AMD64_VENDOR = "AdoptOpenJDK";
     private static final String JAVA_ARM64_VENDOR = "BellSoft";
-    private static final String JAVA_VERSION = "11.0.12+7";
+    private static final String JAVA_VERSION = "11.0.16+8";
     private static final String JAVA_MAJOR = JAVA_VERSION.split("\\.")[0];
     private static final String JAVA_MINOR = JAVA_VERSION.split("\\.")[1];
     private static final String JAVA_PATCH = JAVA_VERSION.split("\\.|\\+|-")[2];
@@ -92,12 +92,11 @@ private static boolean needsDownload(Version want, Version installed) {
         // Per JDK-8240734: Major versions checks aren't enough starting with 11.0.16+8
         // see also https://github.com/adoptium/adoptium-support/issues/557
         Version bad = SystemUtilities.getJavaVersion("11.0.16+8");
-        if(installed.greaterThanOrEqualTo(bad)) {
-            if(want.lessThan(bad)) {
+        if(want.greaterThanOrEqualTo(bad) && installed.lessThan(bad) ||
+                installed.greaterThanOrEqualTo(bad) && want.lessThan(bad)) {
                 // Force download
                 // Fixes "Hash of java.rmi differs from expected hash"
                 downloadJdk = true;
-            }
         }
         return downloadJdk;
     }

diff --git a/src/qz/common/Constants.java b/src/qz/common/Constants.java
@@ -14,7 +14,7 @@ public class Constants {
     public static final String HEXES = "0123456789ABCDEF";
     public static final char[] HEXES_ARRAY = HEXES.toCharArray();
     public static final int BYTE_BUFFER_SIZE = 8192;
-    public static final Version VERSION = Version.valueOf("2.2.1");
+    public static final Version VERSION = Version.valueOf("2.2.2-SNAPSHOT");
     public static final Version JAVA_VERSION = SystemUtilities.getJavaVersion();
     public static final String JAVA_VENDOR = System.getProperty("java.vendor");
 

diff --git a/src/qz/installer/Installer.java b/src/qz/installer/Installer.java
@@ -123,7 +123,8 @@ public Installer deployApp() throws IOException {
 
         // Delete the JDK blindly
         FileUtils.deleteDirectory(dest.resolve(JRE_LOCATION).toFile());
-        FileUtils.copyDirectory(src.toFile(), dest.toFile());
+        // Note: preserveFileDate=false per https://github.com/qzind/tray/issues/1011
+        FileUtils.copyDirectory(src.toFile(), dest.toFile(), false);
         FileUtilities.setPermissionsRecursively(dest, false);
 
         if(!SystemUtilities.isWindows()) {

diff --git a/src/qz/utils/JsonWriter.java b/src/qz/utils/JsonWriter.java
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
 /**
@@ -50,7 +51,7 @@ public static boolean write(String path, String data, boolean overwrite, boolean
             remove(config, append);
         }
 
-        FileUtils.write(f, config.toString(2));
+        FileUtils.write(f, config.toString(2), StandardCharsets.UTF_8);
 
         return true;
     }
@@ -61,7 +62,7 @@ public static boolean contains(File path, String data) {
                 return false;
             }
 
-            String jsonData = FileUtils.readFileToString(path, Charsets.UTF_8);
+            String jsonData = FileUtils.readFileToString(path, StandardCharsets.UTF_8);
             JSONObject before = new JSONObject(jsonData);
             JSONObject after = new JSONObject(jsonData);
             merge(after, new JSONObject(data), true);

diff --git a/src/qz/utils/LinuxUtilities.java b/src/qz/utils/LinuxUtilities.java
@@ -19,7 +19,8 @@ public class LinuxUtilities {
     public static boolean elevatedFileCopy(Path source, Path destination) {
         // Don't prompt if it's not needed
         try {
-            FileUtils.copyFile(source.toFile(), destination.toFile());
+            // Note: preserveFileDate=false per https://github.com/qzind/tray/issues/1011
+            FileUtils.copyFile(source.toFile(), destination.toFile(), false);
             return true;
         } catch(IOException ignore) {}
         if(foundElevator == null) {