Changeset 31281 in osm for applications/editors

Timestamp:

2015-06-18T23:39:19+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix #josm11570 - invalid jar for log4j plugin

Location:

applications/editors/josm

Files:

• dist/log4j.jar (modified) ( previous)
• plugins/build-common.xml (modified) (5 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -144 +144 @@
         <antcall target="additional-manifest" />
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="MANIFEST">
-            <zipgroupfileset dir="${plugin.lib.dir}" includes="*.jar" excludes="*-sources.jar, *-javadoc.jar" erroronmissingdir="no"/>
+            <restrict>
+                <not><or>
+                    <name name="META-INF/maven/*"/>
+                    <name name="META-INF/DEPENDENCIES"/>
+                    <name name="META-INF/LICENSE"/>
+                    <name name="META-INF/NOTICE"/>
+                </or></not>
+                <archives>
+                    <zips>
+                        <fileset dir="${plugin.lib.dir}" includes="*.jar" excludes="*-sources.jar, *-javadoc.jar" erroronmissingdir="no"/>
+                    </zips>
+                </archives>
+            </restrict>
         </jar>
         <delete file="MANIFEST" failonerror="no"/>
@@ -150 +162 @@
     </target>
     <target name="post-dist">
-        <!-- to be overidden by plugins that need to perform additional tasks on resulting jar -->
+        <!-- to be overidden by plugins that need to perform additional tasks on resulting jar -->
     </target>
     <target name="add-manifest-attribute" depends="check-manifest-attribute" if="have-${property.name}">
@@ -386 +398 @@
     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
     </target>
-        
+
     <path id="test.classpath">
         <fileset dir="../00_core_test_lib">
@@ -467 +479 @@
         </sequential>
     </target>
-        
+
     <target name="runjosm" depends="install">
         <java jar="${josm}" fork="true">
@@ -488 +500 @@
     * dist        This default target builds the plugin jar file
     * clean       Cleanup automatical created files
-        * test        Run unit tests (if any)
+    * test        Run unit tests (if any)
     * publish     Checkin source code, build jar and checkin plugin jar
                   (requires proper entry for SVN commit message!)