Changeset 16399 in josm

Timestamp:

2020-05-10T12:37:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19208 - ant dist-optimized: fix for jcs3

File:

• trunk/build.xml (modified) (2 diffs)

trunk/build.xml

@@ -1037 +1037 @@
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
-        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs/**/*.class"/>
+        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs3/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jmapviewer.jar" includes="org/openstreetmap/gui/**/*.class"/>
         <exec executable="jdeps" dir="${modules.dir}">
@@ -1132 +1132 @@
                 <exclude name="org/apache/commons/logging/impl/LogKitLogger*"/>
                 <exclude name="org/apache/commons/logging/impl/ServletContextCleaner*"/>
-                <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/>
-                <exclude name="org/apache/commons/jcs/auxiliary/remote/http/client/**"/>
-                <exclude name="org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet*"/>
-                <exclude name="org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet*"/>
-                <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
+                <exclude name="org/apache/commons/jcs3/auxiliary/disk/jdbc/**"/>
+                <exclude name="org/apache/commons/jcs3/auxiliary/remote/http/client/**"/>
+                <exclude name="org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet*"/>
+                <exclude name="org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet*"/>
+                <exclude name="org/apache/commons/jcs3/log/Log4j2Factory*"/>
+                <exclude name="org/apache/commons/jcs3/log/Log4j2LogAdapter*"/>
+                <exclude name="org/apache/commons/jcs3/utils/servlet/**"/>
             </patternset>
         </unzip>