Modify ↓

Opened 4 years ago

Closed 4 years ago

#21197 closed defect (fixed)

[PATCH] plugins `build-common.xml` should use `plugin.version` if it is defined

Reported by: taylor.smock Owned by: Don-vip
Priority: normal Milestone:
Component: Plugin Version:
Keywords: Cc:

Description

I noticed this when we updated auto_tools today (see ​https://github.com/JOSM/auto-tools/releases/tag/v1.3.4 and compare that version to the one on https://josm.openstreetmap.de/wiki/Plugins (79)).

  • 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}" />

Attachments (1)

21197.patch​ (877 bytes ) - added by taylor.smock 4 years ago.

Download all attachments as: .zip

Change History (3)

by taylor.smock, 4 years ago

Attachment: 21197.patch​ added

comment:1 by Don-vip, 4 years ago

Owner: changed from team to Don-vip
Status: new → assigned

comment:2 by Don-vip, 4 years ago

Resolution: → fixed
Status: assigned → closed

In 35802/osm:

fix #21197 - use plugin.version if it is defined (patch by taylor.smock)

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Don-vip.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment
E-mail address and name can be saved in the Preferences .
Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.