Changeset 18434 in josm for trunk/src/org

Timestamp:

2022-04-21T21:54:17+02:00 (3 years ago)

Author:

taylor.smock

Message:

Dependency updates

JCSCacheManager was modified to move away from methods deprecated in JCS 3.1.

TestUtils was modified so that we are only testing Java versions that byte
buddy might not understand, and to use the non-shaded version of byte buddy
(equalsverifier is no longer a fat jar).

ivy.xml:

• commons-jcs3-core: 3.0 -> 3.1
  • Full changelog: ​https://commons.apache.org/proper/commons-jcs/changes-report.html#a3.1
• metadata-extractor: 2.16.0 -> 2.17.0
  • Full changelog: ​https://github.com/drewnoakes/metadata-extractor/releases/tag/2.17.0
• jacoco: 0.8.7 -> 0.8.8
  • Official support for Java 17 and Java 18, experimental support for Java 19 class files
  • Full changelog: ​https://www.jacoco.org/jacoco/trunk/doc/changes.html
• spotbugs: 4.5.2 -> 4.6.0
  • New bug type (SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA)
  • Full changelog: ​https://github.com/spotbugs/spotbugs/releases/tag/4.6.0
• wiremock: 2.32.0 -> 2.33.1
  • Fix CVE-2020-36518
  • Changelog for 2.33.0: ​https://github.com/wiremock/wiremock/releases/tag/2.33.0
  • Changelog for 2.33.1: ​https://github.com/wiremock/wiremock/releases/tag/2.33.1
• classgraph: 4.8.138 -> 4.8.146
  • Fixes handling for some URLs (jar:file:jarname.jar!/)
• equalsverifier: 3.8.1 -> 3.10
  • Better record support
  • Multi-Release JAR (also two jars, equalsverifier and equalsverifier-nodep -- -nodep is a shaded fat jar)
  • Fix an issue when testing sealed classes
  • Full changelog: ​https://github.com/jqno/equalsverifier/blob/equalsverifier-3.10/CHANGELOG.md
• awaitility: 4.1.1 -> 4.2.0
  • Fixes some bugs with respect to shutdown behavior and small intervals
  • Full changelog: ​https://github.com/awaitility/awaitility/blob/awaitility-4.2.0/changelog.txt

tools/ivy.xml:

• javacc 7.0.10 -> 7.0.11
  • Full changelog: ​https://github.com/javacc/javacc/blob/javacc-7.0.11/docs/release-notes.md
• checkstyle: 9.2.1 -> 9.3 (end of the line for Java 8 -- checkstyle 10 requires Java 11+)
  • Fix OOM
  • Support JEP 406
  • Add UnusedVariable check
  • Full changelog: ​https://checkstyle.sourceforge.io/releasenotes.html#Release_9.3
• proguard-ant: 7.2.0-beta5 -> 7.2.1
  • Better support for Java 18
  • Full changelog: ​https://github.com/Guardsquare/proguard/releases/tag/v7.2.1
• pmd: 6.41.0 -> 6.44.0
  • Supports Java 18
  • FinalParameterInAbstractMethod
  • Full release notes: ​https://pmd.github.io/pmd-6.44.0/pmd_release_notes.html
• spotbugs: 4.5.2 -> 4.6.0
  • SSD_DO_NOT_USE_INSTANCE_LOCK_ON_SHARED_STATIC_DATA
  • Full changelog: ​https://github.com/spotbugs/spotbugs/releases/tag/4.6.0
• animal-sniffer-ant-tasks: 1.20 -> 1.21
  • Cache signatures to speed up multiple runs
  • Full changelog: ​https://github.com/mojohaus/animal-sniffer/releases/tag/animal-sniffer-parent-1.21

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -8 +8 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Properties;
 import java.util.logging.Handler;
@@ -17 +18 @@
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.apache.commons.jcs3.auxiliary.AuxiliaryCache;
 import org.apache.commons.jcs3.auxiliary.AuxiliaryCacheFactory;
 import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes;
@@ -187 +187 @@
      * @return cache access object
      */
-    @SuppressWarnings("unchecked")
     public static <K, V> CacheAccess<K, V> getCache(String cacheName, int maxMemoryObjects, int maxDiskObjects, String cachePath) {
         CacheAccess<K, V> cacheAccess = getCacheAccess(cacheName, getCacheAttributes(maxMemoryObjects));
@@ -195 +194 @@
             try {
                 IDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath, cacheName);
-                if (cc.getAuxCaches().length == 0) {
-                    cc.setAuxCaches(new AuxiliaryCache[]{DISK_CACHE_FACTORY.createCache(
-                            diskAttributes, null, null, new StandardSerializer())});
+                if (cc.getAuxCacheList().isEmpty()) {
+                    cc.setAuxCaches(Collections.singletonList(DISK_CACHE_FACTORY.createCache(
+                            diskAttributes, null, null, new StandardSerializer())));
                 }
             } catch (Exception e) { // NOPMD
                 // in case any error in setting auxiliary cache, do not use disk cache at all - only memory
-                cc.setAuxCaches(new AuxiliaryCache[0]);
+                cc.setAuxCaches(Collections.emptyList());
                 Logging.debug(e);
             }