Ticket #21667: 21667.patch

File 21667.patch, 1.5 KB (added by taylor.smock, 4 years ago)

  • plugins/build-common.xml 

    diff --git a/dist/apache-commons.jar b/dist/apache-commons.jar
index 3a70632be..5fe6c0b2d 100644
Binary files a/dist/apache-commons.jar and b/dist/apache-commons.jar differ
diff --git a/dist/apache-http.jar b/dist/apache-http.jar
index 8650c0b15..803f1c09d 100644
Binary files a/dist/apache-http.jar and b/dist/apache-http.jar differ
diff --git a/dist/log4j.jar b/dist/log4j.jar
index 5846b3707..239076ecc 100644
Binary files a/dist/log4j.jar and b/dist/log4j.jar differ
diff --git a/plugins/build-common.xml b/plugins/build-common.xml
index f8392f1c2..32b347eb1 100644
    a b  
    240240        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="${manifest}" manifestencoding="UTF-8" duplicate="preserve" level="9">
    241241            <restrict>
    242242                <not><or>
    243                     <name name="META-INF/maven/*"/>
     243                    <!-- Do not exclude META-INF/maven/* - it removes dependency version information -->
    244244                    <name name="META-INF/DEPENDENCIES"/>
    245245                    <name name="META-INF/LICENSE"/>
    246246                    <name name="META-INF/NOTICE"/>
    … …  
    761761        <ivy:resolve />
    762762        <ivy:retrieve pattern="${plugin.lib.dir}/[artifact]-[revision](-[classifier]).[ext]" conf="default" />
    763763    </target>
     764    <target name="ivy-checkdepsupdate" description="Display dependency updates on the console" depends="fetch_dependencies">
     765        <ivy:checkdepsupdate/>
     766    </target>
    764767</project>