Changeset 16397 in josm

Timestamp:

2020-05-10T11:18:13+02:00 (5 years ago)

Author:

simon04

Message:

fix #19173 - JCS LogManager needs META-INF/services/org.apache.commons.jcs.log.LogFactory

org.apache.commons.jcs.log.JulLogFactory is loaded using ServiceLoader and needs to be registered in the META-INF/services file.

Location:

trunk

Files:

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

trunk/build.xml

@@ -1069 +1069 @@
             <fileset refid="runtime.fileset"/>
             <patternset>
-                <exclude name="META-INF/**"/>
+                <exclude name="META-INF/*"/>
+                <exclude name="META-INF/maven/**"/>
+                <exclude name="META-INF/versions/**"/>
                 <exclude name="*"/>
                 <exclude name="org/openstreetmap/gui/jmapviewer/Demo*"/>

trunk/ivy.xml

@@ -24 +24 @@
         <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
         <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
-        <dependency conf="api->default" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
         <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.20"/>
@@ -35 +34 @@
         <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
         <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
-        <dependency conf="sources->sources" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
         <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.20"/>