Changeset 16195 in josm


Ignore:
Timestamp:
2020-03-22T23:48:14+01:00 (15 months ago)
Author:
simon04
Message:

see #16860 - Resolve commons-jcs-core using Apache Ivy

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16194 r16195  
    298298    <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
    299299        <!-- COTS -->
    300         <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**,org/apache/commons/**" nowarn="on" encoding="iso-8859-1"
     300        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**" nowarn="on" encoding="iso-8859-1"
    301301            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    302302            <!-- get rid of "internal proprietary API" warning -->
    303303            <compilerarg value="-XDignore.symbol.file"/>
    304             <exclude name="org/apache/commons/jcs/JCS.java"/>
    305             <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
    306             <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
    307             <exclude name="org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java"/>
    308             <exclude name="org/apache/commons/jcs/access/exception/InvalidGroupException.java"/>
    309             <exclude name="org/apache/commons/jcs/admin/servlet/**"/>
    310             <exclude name="org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java"/>
    311             <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/>
    312             <exclude name="org/apache/commons/jcs/auxiliary/lateral/**"/>
    313             <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/>
    314             <exclude name="org/apache/commons/jcs/engine/CacheAdaptor.java"/>
    315             <exclude name="org/apache/commons/jcs/engine/CacheGroup.java"/>
    316             <exclude name="org/apache/commons/jcs/engine/CacheWatchRepairable.java"/>
    317             <exclude name="org/apache/commons/jcs/engine/Zombie*.java"/>
    318             <exclude name="org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java"/>
    319             <exclude name="org/apache/commons/jcs/utils/access/**"/>
    320             <exclude name="org/apache/commons/jcs/utils/discovery/**"/>
    321             <exclude name="org/apache/commons/jcs/utils/net/**"/>
    322             <exclude name="org/apache/commons/jcs/utils/props/**"/>
    323             <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
    324304            <classpath>
    325305                <path refid="runtime.path"/>
  • trunk/ivy.xml

    r16194 r16195  
    2222        <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="api->default"/>
    2323        <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="api->default"/>
     24        <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="api->default"/>
    2425        <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="api->default"/>
    2526        <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
     
    3132        <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="sources->sources"/>
    3233        <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="sources->sources"/>
     34        <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="sources->sources"/>
    3335        <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="sources->sources"/>
    3436        <dependency org="org.tukaani" name="xz" rev="1.8" conf="sources->sources"/>
  • trunk/ivysettings.xml

    r15977 r16195  
    66    <chain name="chain">
    77      <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
     8      <ibiblio name="josm-nexus-snapshots" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" />
    89      <ibiblio name="jcenter" m2compatible="true" root="https://jcenter.bintray.com/" />
    910    </chain>
Note: See TracChangeset for help on using the changeset viewer.