Changeset 16195 in josm

Timestamp:

2020-03-22T23:48:14+01:00 (5 years ago)

Author:

simon04

Message:

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

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (2 diffs)
• ivysettings.xml (modified) (1 diff)

trunk/build.xml

@@ -298 +298 @@
     <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**,org/apache/commons/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**" nowarn="on" encoding="iso-8859-1"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
-            <exclude name="org/apache/commons/jcs/JCS.java"/>
-            <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
-            <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
-            <exclude name="org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java"/>
-            <exclude name="org/apache/commons/jcs/access/exception/InvalidGroupException.java"/>
-            <exclude name="org/apache/commons/jcs/admin/servlet/**"/>
-            <exclude name="org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java"/>
-            <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/>
-            <exclude name="org/apache/commons/jcs/auxiliary/lateral/**"/>
-            <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/>
-            <exclude name="org/apache/commons/jcs/engine/CacheAdaptor.java"/>
-            <exclude name="org/apache/commons/jcs/engine/CacheGroup.java"/>
-            <exclude name="org/apache/commons/jcs/engine/CacheWatchRepairable.java"/>
-            <exclude name="org/apache/commons/jcs/engine/Zombie*.java"/>
-            <exclude name="org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java"/>
-            <exclude name="org/apache/commons/jcs/utils/access/**"/>
-            <exclude name="org/apache/commons/jcs/utils/discovery/**"/>
-            <exclude name="org/apache/commons/jcs/utils/net/**"/>
-            <exclude name="org/apache/commons/jcs/utils/props/**"/>
-            <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
             <classpath>
                 <path refid="runtime.path"/>

trunk/ivy.xml

@@ -22 +22 @@
         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="api->default"/>
         <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="api->default"/>
+        <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="api->default"/>
         <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="api->default"/>
         <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
@@ -31 +32 @@
         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="sources->sources"/>
         <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="sources->sources"/>
+        <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="sources->sources"/>
         <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="sources->sources"/>
         <dependency org="org.tukaani" name="xz" rev="1.8" conf="sources->sources"/>

trunk/ivysettings.xml

@@ -6 +6 @@
     <chain name="chain">
       <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
+      <ibiblio name="josm-nexus-snapshots" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" />
       <ibiblio name="jcenter" m2compatible="true" root="https://jcenter.bintray.com/" />
     </chain>