Changeset 18434 in josm


Ignore:
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:

tools/ivy.xml:

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ivy.xml

    r18379 r18434  
    2424        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    2525        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    26         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.0"/>
     26        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
    2727        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.21"/>
    2828        <dependency conf="api->default" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
    2929        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.9"/>
    3030        <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
    31         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.16.0" transitive="false"/>
     31        <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.17.0" transitive="false"/>
    3232        <dependency conf="api->default" org="com.formdev" name="svgSalamander" rev="1.1.3"/>
    3333        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.26.0"/>
    … …  
    3838        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    3939        <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    40         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.0"/>
     40        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.1"/>
    4141        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.21"/>
    4242        <dependency conf="sources->sources" org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
    4343        <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.9"/>
    4444        <dependency conf="sources->sources" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
    45         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.16.0" transitive="false"/>
     45        <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.17.0" transitive="false"/>
    4646        <dependency conf="sources->sources" org="com.formdev" name="svgSalamander" rev="1.1.3"/>
    4747        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.26.0"/>
    … …  
    5151        <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
    5252        <!-- jacocoant->default -->
    53         <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.7">
     53        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.8">
    5454            <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
    5555        </dependency>
    5656        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.49.a"/>
    5757        <!-- test->default -->
    58         <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.5.2"/>
     58        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.6.0"/>
    5959        <dependency conf="test->default" org="com.ginsberg" name="junit5-system-exit" rev="1.1.2"/>
    60         <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.32.0"/>
    61         <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.138"/>
     60        <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock-jre8" rev="2.33.1"/>
     61        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.146"/>
    6262        <dependency conf="test->default" org="org.junit.platform" name="junit-platform-launcher" rev="1.8.2"/>
    6363        <dependency conf="test->default" org="org.junit.vintage" name="junit-vintage-engine" rev="5.8.2"/>
    … …  
    6767        <dependency conf="test->default" org="org.junit.jupiter" name="junit-jupiter-migrationsupport" rev="5.8.2"/>
    6868        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
    69         <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.8.1"/>
     69        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.10"/>
    7070        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
    71         <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.1.1"/>
     71        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.2.0"/>
    7272    </dependencies>
    7373</ivy-module>

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

    r18213 r18434  
    88import java.nio.file.StandardOpenOption;
    99import java.util.Arrays;
     10import java.util.Collections;
    1011import java.util.Properties;
    1112import java.util.logging.Handler;
    … …  
    1718import org.apache.commons.jcs3.JCS;
    1819import org.apache.commons.jcs3.access.CacheAccess;
    19 import org.apache.commons.jcs3.auxiliary.AuxiliaryCache;
    2020import org.apache.commons.jcs3.auxiliary.AuxiliaryCacheFactory;
    2121import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes;
    … …  
    187187     * @return cache access object
    188188     */
    189     @SuppressWarnings("unchecked")
    190189    public static <K, V> CacheAccess<K, V> getCache(String cacheName, int maxMemoryObjects, int maxDiskObjects, String cachePath) {
    191190        CacheAccess<K, V> cacheAccess = getCacheAccess(cacheName, getCacheAttributes(maxMemoryObjects));
    … …  
    195194            try {
    196195                IDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath, cacheName);
    197                 if (cc.getAuxCaches().length == 0) {
    198                     cc.setAuxCaches(new AuxiliaryCache[]{DISK_CACHE_FACTORY.createCache(
    199                             diskAttributes, null, null, new StandardSerializer())});
     196                if (cc.getAuxCacheList().isEmpty()) {
     197                    cc.setAuxCaches(Collections.singletonList(DISK_CACHE_FACTORY.createCache(
     198                            diskAttributes, null, null, new StandardSerializer())));
    200199                }
    201200            } catch (Exception e) { // NOPMD
    202201                // in case any error in setting auxiliary cache, do not use disk cache at all - only memory
    203                 cc.setAuxCaches(new AuxiliaryCache[0]);
     202                cc.setAuxCaches(Collections.emptyList());
    204203                Logging.debug(e);
    205204            }

  • trunk/test/unit/org/openstreetmap/josm/TestUtils.java

    r18208 r18434  
    6464import com.github.tomakehurst.wiremock.WireMockServer;
    6565import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
    66 
    6766import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
    6867import io.github.classgraph.ClassGraph;
    … …  
    492491    @SuppressWarnings("null")
    493492    public static void assumeWorkingEqualsVerifier() {
    494         if (Utils.getJavaVersion() >= 16) {
     493        // See https://github.com/raphw/byte-buddy/blob/master/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
     494        // for currently supported Java versions.
     495        if (Utils.getJavaVersion() >= 19) {
    495496            // Byte Buddy often supports new class file versions for current EA releases if its experimental flag is set to true
    496497            System.setProperty("net.bytebuddy.experimental", "true");
     498        } else {
     499            return;
    497500        }
    498501        try {
    499502            // Workaround to https://github.com/jqno/equalsverifier/issues/177
    500503            // Inspired by https://issues.apache.org/jira/browse/SOLR-11606
    501             nl.jqno.equalsverifier.internal.lib.bytebuddy.ClassFileVersion.ofThisVm();
     504            // Note: if we change to the equalsverifier fat jar, use nl.jqno.equalsverifier.internal.lib instead of net
     505            net.bytebuddy.ClassFileVersion.ofThisVm();
    502506        } catch (IllegalArgumentException e) {
    503507            assumeFalse(e != null);

  • trunk/tools/ivy.xml

    r18360 r18434  
    1515    <dependencies>
    1616        <!-- javacc->default -->
    17         <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.10" conf="javacc->default"/>
     17        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.11" conf="javacc->default"/>
    1818        <!-- checkstyle->default -->
    19         <dependency org="com.puppycrawl.tools" name="checkstyle" rev="9.2.1" conf="checkstyle->default"/>
     19        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="9.3" conf="checkstyle->default"/>
    2020        <!-- proguard->default -->
    21         <dependency org="com.guardsquare" name="proguard-ant" rev="7.2.0-beta5" conf="proguard->default"/>
     21        <dependency org="com.guardsquare" name="proguard-ant" rev="7.2.1" conf="proguard->default"/>
    2222        <!-- pmd->default -->
    23         <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.41.0" conf="pmd->default"/>
    24         <dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.41.0" conf="pmd->default"/>
     23        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.44.0" conf="pmd->default"/>
     24        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.44.0" conf="pmd->default"/>
    2525        <dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
    2626            <artifact name="saxon" type="jar"/>
    … …  
    2828        </dependency>
    2929        <!-- spotbugs->default -->
    30         <dependency org="com.github.spotbugs" name="spotbugs" rev="4.5.2" conf="spotbugs->default"/>
    31         <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.5.2" conf="spotbugs->default"/>
     30        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.6.0" conf="spotbugs->default"/>
     31        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.6.0" conf="spotbugs->default"/>
    3232        <!-- errorprone->default -->
    3333        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.10.0" conf="errorprone->default"/>
    … …  
    3535        <dependency org="com.google.errorprone" name="javac" rev="9+181-r4173-1" conf="errorprone_javac->default"/>
    3636        <!-- animal->default -->
    37         <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.20" conf="animal->default"/>
     37        <dependency org="org.codehaus.mojo" name="animal-sniffer-ant-tasks" rev="1.21" conf="animal->default"/>
    3838    </dependencies>
    3939</ivy-module>
Note: See TracChangeset for help on using the changeset viewer.