Ticket #21197: 21197.patch

File 21197.patch, 877 bytes (added by taylor.smock, 4 years ago)
  • plugins/build-common.xml

    diff --git a/plugins/build-common.xml b/plugins/build-common.xml
    index 0c20dacb0..f8392f1c2 100644
    a b  
    180180        </delete>
    181181        <manifest file="${manifest}" mode="update">
    182182            <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    183             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     183            <attribute name="Plugin-Version" value="${version.entry.commit.revision}" unless:set="plugin.version"/>
     184            <attribute name="Plugin-Version" value="${plugin.version}" if:set="plugin.version"/>
    184185            <attribute name="Plugin-Class" value="${plugin.class}" />
    185186            <attribute name="Plugin-Description" value="${plugin.description}" />
    186187            <attribute name="Plugin-Date" value="${version.entry.commit.date}" />