Changeset 16024 in josm

Timestamp:

2020-03-03T23:57:45+01:00 (5 years ago)

Author:

simon04

Message:

see #16860 - Resolve commons-logging:commons-logging via Apache Ivy

Location:

trunk

Files:

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

trunk/build.xml

@@ -319 +319 @@
             <exclude name="org/apache/commons/jcs/utils/props/**"/>
             <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
-            <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"/>
-            <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"/>
-            <exclude name="org/apache/commons/logging/impl/Log4JLogger.java"/>
-            <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"/>
-            <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
+            <exclude name="org/apache/commons/logging/**"/>
         </javac>
     </target>
@@ -1137 +1133 @@
                 <exclude name="org/apache/commons/compress/parallel/**"/>
                 <exclude name="org/apache/commons/compress/utils/ArchiveUtils.class"/>
+                <exclude name="org/apache/commons/logging/impl/AvalonLogger.class"/>
+                <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.class"/>
+                <exclude name="org/apache/commons/logging/impl/Log4JLogger.class"/>
+                <exclude name="org/apache/commons/logging/impl/LogKitLogger.class"/>
+                <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.class"/>
             </patternset>
         </unzip>

trunk/ivy.xml

@@ -18 +18 @@
     <dependencies>
         <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-compress" rev="1.20" conf="api->default"/>
         <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>