Changeset 36349 in osm


Ignore:
Timestamp:
2024-10-28T19:18:41+01:00 (2 months ago)
Author:
taylor.smock
Message:

Dependency updates

Most plugins have been moved to require a minimum version of r19044 (mostly for
Java 11+ build reasons).

Location:
applications/editors/josm/plugins
Files:
1 deleted
89 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/ColumbusCSV/build.xml

    r35978 r36349  
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- Enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="18494"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Plugin meta data -->

  • applications/editors/josm/plugins/ColumbusCSV/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>18494</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Oliver Wieland</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.columbusCSV.ColumbusCSVPlugin</plugin.class>

  • applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml

    r35760 r36349  
    55    <property name="commit.message" value="CustomizePublicTransportStop: recompile for compatibility with JOSM r17896"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="17896"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Rodion Scherbakov"/>

  • applications/editors/josm/plugins/CustomizePublicTransportStop/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>17896</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Rodion Scherbakov</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.customizepublictransportstop.CustomizePublicTransportStopPlugin</plugin.class>

  • applications/editors/josm/plugins/DirectDownload/build.xml

    r35944 r36349  
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15502"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/DirectDownload/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>15502</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Hartmut Holzgraefe</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.directdownload.DirectDownload</plugin.class>

  • applications/editors/josm/plugins/DirectUpload/build.xml

    r35858 r36349  
    55    <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18173"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/DirectUpload/pom.xml

    r36325 r36349  
    1818        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    1919        <plugin.src.dir>src</plugin.src.dir>
    20         <plugin.main.version>18173</plugin.main.version>
     20        <plugin.main.version>19044</plugin.main.version>
    2121        <plugin.author>Subhodip Biswas</plugin.author>
    2222        <plugin.class>org.openstreetmap.josm.plugins.DirectUpload.UploadDataGuiPlugin</plugin.class>

  • applications/editors/josm/plugins/ElevationProfile/build.xml

    r36309 r36349  
    44    <property name="commit.message" value="[josm_elevationprofile]"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="18970"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/ElevationProfile/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>18494</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Oliver Wieland</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.elevation.ElevationProfilePlugin</plugin.class>

  • applications/editors/josm/plugins/NanoLog/build.xml

    r35978 r36349  
    55    <property name="commit.message" value="NanoLog"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18494"/>
     7    <property name="plugin.main.version" value="19044"/>
    88    <property name="plugin.author" value="Ilya Zverev"/>
    99    <property name="plugin.class" value="nanolog.NanoLogPlugin"/>

  • applications/editors/josm/plugins/NanoLog/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>18494</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Ilya Zverev</plugin.author>
    2121        <plugin.class>nanolog.NanoLogPlugin</plugin.class>

  • applications/editors/josm/plugins/apache-commons/pom.xml

    r36325 r36349  
    3030            <groupId>com.github.luben</groupId>
    3131            <artifactId>zstd-jni</artifactId>
    32             <version>1.5.6-3</version>
     32            <version>1.5.6-6</version>
    3333            <scope>compile</scope>
    3434        </dependency>
    … …  
    5454            <groupId>commons-io</groupId>
    5555            <artifactId>commons-io</artifactId>
    56             <version>2.16.1</version>
     56            <version>2.17.0</version>
    5757            <scope>compile</scope>
    5858        </dependency>
    … …  
    6060            <groupId>commons-logging</groupId>
    6161            <artifactId>commons-logging</artifactId>
    62             <version>1.3.2</version>
     62            <version>1.3.4</version>
    6363            <scope>compile</scope>
    6464        </dependency>

  • applications/editors/josm/plugins/apache-http/pom.xml

    r36325 r36349  
    3232            <groupId>org.apache.httpcomponents.client5</groupId>
    3333            <artifactId>httpclient5</artifactId>
    34             <version>5.3.1</version>
     34            <version>5.4</version>
    3535            <scope>compile</scope>
    3636        </dependency>

  • applications/editors/josm/plugins/canvec_helper/build.xml

    r34098 r36349  
    44    <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="13559"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/canvec_helper/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>13559</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Michael Bishop</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.canvec_helper.CanvecHelper</plugin.class>

  • applications/editors/josm/plugins/colorscheme/build.xml

    r35643 r36349  
    55    <property name="commit.message" value="Uses new constructor for Plugin"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="17314"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Christof Dallermassl"/>

  • applications/editors/josm/plugins/colorscheme/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>17314</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919
    2020        <plugin.author>Christof Dallermassl</plugin.author>

  • applications/editors/josm/plugins/dataimport/build.xml

    r35932 r36349  
    55    <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/dataimport/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>15496</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Dieter Muecke</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.dataimport.DataImportPlugin</plugin.class>

  • applications/editors/josm/plugins/editgpx/build.xml

    r35931 r36349  
    44    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="17715"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/editgpx/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>17715</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Martin Garbe</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.editgpx.EditGpxPlugin</plugin.class>

  • applications/editors/josm/plugins/epci-fr/build.xml

    r33521 r36349  
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="12663"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/epci-fr/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>12663</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Don-vip</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.fr.epci.EpciPlugin</plugin.class>

  • applications/editors/josm/plugins/eventbus/build.xml

    r35485 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="16563"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/eventbus/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>16563</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Don-vip</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.eventbus.EventBusPlugin</plugin.class>

  • applications/editors/josm/plugins/flatlaf/pom.xml

    r36348 r36349  
    3131            <groupId>com.formdev</groupId>
    3232            <artifactId>flatlaf</artifactId>
    33             <version>3.2.2</version>
     33            <version>3.5.2</version>
    3434        </dependency>
    3535    </dependencies>

  • applications/editors/josm/plugins/geochat/build.xml

    r36147 r36349  
    55    <property name="commit.message" value="[josm_geochat] copypaste from keyboard, font size advanced parameters"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18723"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Ilya Zverev"/>

  • applications/editors/josm/plugins/geochat/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>18723</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020
    2121        <plugin.author>Ilya Zverev</plugin.author>

  • applications/editors/josm/plugins/geotools/ivy_settings.xml

    r36273 r36349  
    22<ivysettings>
    33  <!-- When geotools is updated, run `ant merge-geotools-services` -->
    4   <property name="gt.version" value="31.1"/>
     4  <property name="gt.version" value="32.0"/>
    55  <include file="${josm.ivysettings}" optional="true" /> <!-- optional for IDEs -->
    66  <settings defaultResolver="ordered-resolvers"/>

  • applications/editors/josm/plugins/globalsat/build.xml

    r35938 r36349  
    55    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/globalsat/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>15496</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Raphael Mack</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.globalsat.GlobalsatPlugin</plugin.class>

  • applications/editors/josm/plugins/gpsblam/build.xml

    r35221 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15502"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/gpsblam/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>15502</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Russell Edwards</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.gpsblam.GPSBlamPlugin</plugin.class>

  • applications/editors/josm/plugins/imagery-xml-bounds/build.xml

    r35546 r36349  
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="15115"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/imagery-xml-bounds/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>15115</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Don-vip</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.imageryxmlbounds.ImageryXmlBoundsPlugin</plugin.class>

  • applications/editors/josm/plugins/imagery_cachexport/build.xml

    r35437 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="16398"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/imagery_cachexport/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>16398</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>holgermappt</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.imagery_cachexport.ImageryCacheExportPlugin</plugin.class>

  • applications/editors/josm/plugins/imagewaypoint/build.xml

    r33557 r36349  
    44    <property name="commit.message" value="[josm/ImageWayPoint] move opening to File/Open"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="12671"/>
     6    <property name="plugin.main.version" value="19044"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/imagewaypoint/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>12671</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Flint</plugin.author>
    2121        <plugin.class>org.insignificant.josm.plugins.imagewaypoint.ImageWayPointPlugin</plugin.class>

  • applications/editors/josm/plugins/indoor_sweepline/build.xml

    r34521 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14153"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Roland M. Olbricht"/>

  • applications/editors/josm/plugins/indoor_sweepline/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>14153</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Roland M. Olbricht</plugin.author>
    2121        <plugin.class>indoor_sweepline.IndoorSweepline</plugin.class>

  • applications/editors/josm/plugins/infomode/build.xml

    r35978 r36349  
    55    <property name="commit.message" value="InfoMode : for shortcurt parser"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18494"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/infomode/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>18494</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Alexei Kasatkin</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.infomode.InfoModePlugin</plugin.class>

  • applications/editors/josm/plugins/jackson/pom.xml

    r36325 r36349  
    2828            <groupId>com.fasterxml.jackson.core</groupId>
    2929            <artifactId>jackson-core</artifactId>
    30             <version>2.17.1</version>
     30            <version>2.18.0</version>
    3131        </dependency>
    3232    </dependencies>

  • applications/editors/josm/plugins/jaxb/build.xml

    r35014 r36349  
    44    <property name="commit.message" value="Commit message"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="10580"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88        <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/jaxb/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>10580</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Don-vip</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.jaxb.JaxbPlugin</plugin.class>

  • applications/editors/josm/plugins/jna/pom.xml

    r36325 r36349  
    2222        <plugin.icon>images/jnalogo.jpg</plugin.icon>
    2323        <plugin.stage>10</plugin.stage>
    24         <jna.version>5.14.0</jna.version>
     24        <jna.version>5.15.0</jna.version>
    2525    </properties>
    2626    <dependencies>

  • applications/editors/josm/plugins/jts/pom.xml

    r36348 r36349  
    2525        <plugin.canloadatruntime>true</plugin.canloadatruntime>
    2626        <plugin.stage>10</plugin.stage>
    27         <jts.version>1.19.0</jts.version>
     27        <jts.version>1.20.0</jts.version>
    2828    </properties>
    2929    <dependencies>

  • applications/editors/josm/plugins/lwjgl/build.xml

    r35926 r36349  
    1010  <property name="commit.message" value="Commit message"/>
    1111  <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    12   <property name="plugin.main.version" value="10580"/>
     12  <property name="plugin.main.version" value="19044"/>
    1313  <property name="plugin.author" value="Taylor Smock"/>
    1414  <property name="plugin.class" value="org.openstreetmap.josm.plugins.lwjgl.LWJGLPlugin"/>

  • applications/editors/josm/plugins/lwjgl/ivy_settings.xml

    r36176 r36349  
    11<?xml version="1.0"?>
    22<ivysettings>
    3   <property name="joml.version" value="1.10.5"/>
     3  <property name="joml.version" value="1.10.8"/>
    44  <property name="lwjgl.version" value="3.3.3"/>
    55  <property name="lwjgl3-awt.version" value="0.1.8"/>

  • applications/editors/josm/plugins/lwjgl/modules/pom.xml

    r36325 r36349  
    2020    <properties>
    2121        <plugin.src.dir>../src/main/java</plugin.src.dir>
    22         <plugin.main.version>10580</plugin.main.version>
     22        <plugin.main.version>19044</plugin.main.version>
    2323        <plugin.dist.dir>../../../dist</plugin.dist.dir>
    2424        <plugin.author>Taylor Smock</plugin.author>
    … …  
    2626        <plugin.description>Provides the common LWJGL interfaces for other plugins</plugin.description>
    2727        <plugin.canloadatruntime>true</plugin.canloadatruntime>
    28         <joml.version>1.10.5</joml.version>
     28        <joml.version>1.10.8</joml.version>
    2929        <lwjgl.version>3.3.3</lwjgl.version>
    3030        <lwjgl3-awt.version>0.1.8</lwjgl3-awt.version>

  • applications/editors/josm/plugins/michigan_left/build.xml

    r34531 r36349  
    44    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="19044"/>
    77       
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/michigan_left/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>14153</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Nakor</plugin.author>
    2121        <plugin.class>MichiganLeft.MichiganLeft</plugin.class>

  • applications/editors/josm/plugins/namemanager/build.xml

    r34532 r36349  
    44    <property name="commit.message" value="..."/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/namemanager/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>14153</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Rafal Jachowicz &lt;rjachow@gmail.com&gt;</plugin.author>
    2121        <plugin.class>org.openstreetmap.josm.plugins.namemanager.NameManagerPlugin</plugin.class>

  • applications/editors/josm/plugins/o5m/build.xml

    r35850 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="17749"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/o5m/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>17749</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.canloadatruntime>true</plugin.canloadatruntime>
    2121        <plugin.author>Gerd Petermann</plugin.author>

  • applications/editors/josm/plugins/openvisible/build.xml

    r34536 r36349  
    55    <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14153"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/openvisible/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>14153</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Christof Dallermassl</plugin.author>
    2020        <plugin.class>at.dallermassl.josm.plugin.openvisible.OpenVisiblePlugin</plugin.class>

  • applications/editors/josm/plugins/pmtiles/build.xml

    r36145 r36349  
    88    <property name="commit.message" value="Commit message"/>
    99    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    10     <property name="plugin.main.version" value="18831"/>
     10    <property name="plugin.main.version" value="19044"/>
    1111
    1212    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/pmtiles/pom.xml

    r36325 r36349  
    2121        <plugin.test.dir>src/test/java</plugin.test.dir>
    2222        <plugin.resources.dir>src/main/resources</plugin.resources.dir>
    23         <plugin.main.version>18831</plugin.main.version>
     23        <plugin.main.version>19044</plugin.main.version>
    2424        <plugin.author>Taylor Smock</plugin.author>
    2525        <plugin.class>org.openstreetmap.josm.plugins.pmtiles.PMTilesPlugin</plugin.class>

  • applications/editors/josm/plugins/pointInfo/build.xml

    r36203 r36349  
    55    <property name="commit.message" value="PointInfo: Fix yet another NPE issue with empty strings"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18723"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- plugin can load at runtime -->

  • applications/editors/josm/plugins/pointInfo/pom.xml

    r36325 r36349  
    1919        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    2020        <plugin.src.dir>src</plugin.src.dir>
    21         <plugin.main.version>18723</plugin.main.version>
     21        <plugin.main.version>19044</plugin.main.version>
    2222        <plugin.canloadatruntime>true</plugin.canloadatruntime>
    2323        <plugin.author>Marián Kyral</plugin.author>

  • applications/editors/josm/plugins/poly/build.xml

    r34546 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14153"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/poly/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>14153</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>Zverik</plugin.author>
    2121        <plugin.class>poly.PolyPlugin</plugin.class>

  • applications/editors/josm/plugins/print/build.xml

    r34972 r36349  
    55    <property name="commit.message" value="Added a field to specify the map scale."/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14977"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Kai Pastor"/>

  • applications/editors/josm/plugins/print/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>14977</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Kai Pastor</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.print.PrintPlugin</plugin.class>

  • applications/editors/josm/plugins/rasterfilters/build.xml

    r36315 r36349  
    1010       
    1111        <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    12         <property name="plugin.main.version" value="18723" />
    13         <property name="plugin.version" value="1.0.4"/>
     12        <property name="plugin.main.version" value="19044" />
     13        <property name="plugin.version" value="1.0.5"/>
    1414
    1515  <property name="plugin.icon" value="images/josm_filters_48.png"/>

  • applications/editors/josm/plugins/rasterfilters/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>18723</plugin.main.version>
    19         <plugin.version>1.0.4</plugin.version>
     18        <plugin.main.version>19044</plugin.main.version>
     19        <plugin.version>1.0.5</plugin.version>
    2020
    2121        <plugin.icon>images/josm_filters_48.png</plugin.icon>

  • applications/editors/josm/plugins/routes/build.xml

    r34477 r36349  
    44    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/routes/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>14153</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Jiri Klement</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.routes.RoutesPlugin</plugin.class>

  • applications/editors/josm/plugins/seachart/build.xml

    r34098 r36349  
    44    <property name="commit.message" value="[Seachart] Publish new release"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="13558"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88    <property name="plugin.author" value="Malcolm Herring"/>

  • applications/editors/josm/plugins/seachart/pom.xml

    r36325 r36349  
    1818        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    1919        <plugin.src.dir>src</plugin.src.dir>
    20         <plugin.main.version>13558</plugin.main.version>
     20        <plugin.main.version>19044</plugin.main.version>
    2121        <plugin.author>Malcolm Herring</plugin.author>
    2222        <plugin.class>seachart.Seachart</plugin.class>

  • applications/editors/josm/plugins/splinex/build.xml

    r35936 r36349  
    55    <property name="commit.message" value="Update spline shortcut key"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="14960"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/splinex/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>14960</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Upliner</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.Splinex.SplinexPlugin</plugin.class>

  • applications/editors/josm/plugins/sumoconvert/build.xml

    r33921 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="12643"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/sumoconvert/pom.xml

    r36325 r36349  
    1919    <properties>
    2020        <plugin.src.dir>src</plugin.src.dir>
    21         <plugin.main.version>12643</plugin.main.version>
     21        <plugin.main.version>19044</plugin.main.version>
    2222        <plugin.author>Ignacio Palermo - Julio Rivera</plugin.author>
    2323        <plugin.class>org.openstreetmap.josm.plugins.sumoconvert.SumoConvertPlugin</plugin.class>

  • applications/editors/josm/plugins/touchscreenhelper/build.xml

    r33832 r36349  
    44    <property name="commit.message" value="JOSM/touchscreenhelper: Added T shortcut, hold T to activate temporarily"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="12630"/>
     6    <property name="plugin.main.version" value="19044"/>
    77    <property name="plugin.author" value="glebius@glebius.int.ru"/>
    88    <property name="plugin.class" value="touchscreenhelper.TouchScreenHelperPlugin"/>

  • applications/editors/josm/plugins/touchscreenhelper/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>12630</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020        <plugin.author>glebius@glebius.int.ru</plugin.author>
    2121        <plugin.class>touchscreenhelper.TouchScreenHelperPlugin</plugin.class>

  • applications/editors/josm/plugins/tracer/build.xml

    r35975 r36349  
    44    <property name="commit.message" value="Tracer plugin can load at runtime"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="18464"/>
     6    <property name="plugin.main.version" value="19044"/>
    77    <property name="plugin.canloadatruntime" value="true"/>
    88

  • applications/editors/josm/plugins/tracer/pom.xml

    r36325 r36349  
    2121        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    2222        <plugin.src.dir>src</plugin.src.dir>
    23         <plugin.main.version>18464</plugin.main.version>
     23        <plugin.main.version>19044</plugin.main.version>
    2424        <plugin.canloadatruntime>true</plugin.canloadatruntime>
    2525

  • applications/editors/josm/plugins/trustosm/build.xml

    r35978 r36349  
    55    <property name="commit.message" value="trustosm: recompile for compatibility with JOSM r17896" />
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="18494"/>
     7    <property name="plugin.main.version" value="19044"/>
    88    <property name="plugin.author" value="Christoph Wagner" />
    99    <property name="plugin.class" value="org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin" />
    … …  
    2222        <include name="plastic_laf.jar"/>
    2323    </fileset>
    24     <!-- create a property containing all .jar files, prefix lib/, and seperated with a space -->
    25     <pathconvert property="libs.project" pathsep=" ">
    26         <mapper>
    27             <chainedmapper>
    28                 <!-- remove absolute path -->
    29                 <flattenmapper/>
    30                 <!-- add lib/ prefix -->
    31                 <globmapper from="*" to="${ant.project.name}/lib/*"/>
    32             </chainedmapper>
    33         </mapper>
    34         <path>
    35             <!-- plugin.lib.dir contains all jar files -->
    36             <fileset dir="${plugin.lib.dir}">
    37                 <include name="**/*.jar"/>
    38                 <exclude name="**/*-sources.jar"/>
    39                 <exclude name="**/*-javadoc.jar"/>
    40             </fileset>
    41         </path>
    42     </pathconvert>
    43     <!-- additional entry in manifest -->
    44     <target name="additional-manifest">
    45         <manifest file="MANIFEST" mode="update">
    46             <attribute name="Class-Path" value="${libs.project}"/>
    47         </manifest>
    48     </target>
    49     <!--
    50     **********************************************************
    51     ** setup-dist - copies files for distribution
    52     **********************************************************
    53     -->
    54     <target name="setup-dist">
    55         <antcall target="setup-dist-default" />
    56         <copy todir="${plugin.build.dir}/lib">
    57             <fileset dir="${plugin.lib.dir}"/>
    58         </copy>
    59     </target>
    60     <!--
    61     **********************************************************
    62     ** dist - creates the plugin jar
    63     **********************************************************
    64     -->
    65     <target name="dist" depends="compile,revision">
    66         <echo message="creating ${ant.project.name}.jar ... "/>
    67         <antcall target="setup-dist" />
    68         <delete file="MANIFEST" failonerror="no"/>
    69         <manifest file="MANIFEST" mode="update">
    70             <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    71             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    72             <attribute name="Plugin-Class" value="${plugin.class}" />
    73             <attribute name="Plugin-Description" value="${plugin.description}" />
    74             <attribute name="Plugin-Date" value="${version.entry.commit.date}" />
    75             <attribute name="Author" value="${plugin.author}"/>
    76         </manifest>
    77         <antcall target="add-manifest-attribute">
    78             <param name="manifest.attribute" value="Plugin-Link"/>
    79             <param name="property.name" value="plugin.link"/>
    80             <param name="property.value" value="${plugin.link}"/>
    81         </antcall>
    82         <antcall target="add-manifest-attribute">
    83             <param name="manifest.attribute" value="Plugin-Icon"/>
    84             <param name="property.name" value="plugin.icon"/>
    85             <param name="property.value" value="${plugin.icon}"/>
    86         </antcall>
    87         <antcall target="add-manifest-attribute">
    88             <param name="manifest.attribute" value="Plugin-Early"/>
    89             <param name="property.name" value="plugin.early"/>
    90             <param name="property.value" value="${plugin.early}"/>
    91         </antcall>
    92         <antcall target="add-manifest-attribute">
    93             <param name="manifest.attribute" value="Plugin-Requires"/>
    94             <param name="property.name" value="plugin.requires"/>
    95             <param name="property.value" value="${plugin.requires}"/>
    96         </antcall>
    97         <antcall target="add-manifest-attribute">
    98             <param name="manifest.attribute" value="Plugin-Stage"/>
    99             <param name="property.name" value="plugin.stage"/>
    100             <param name="property.value" value="${plugin.stage}"/>
    101         </antcall>
    102         <antcall target="additional-manifest" />
    103         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="MANIFEST" manifestencoding="UTF-8"/>
    104         <delete file="MANIFEST" failonerror="no"/>
    105         <antcall target="post-dist" />
     24
     25    <target name="pre-compile" depends="fetch_dependencies">
     26        <!-- include fetch_dependencies task -->
    10627    </target>
    10728</project>

  • applications/editors/josm/plugins/trustosm/pom.xml

    r36325 r36349  
    1616    <properties>
    1717        <plugin.src.dir>src</plugin.src.dir>
    18         <plugin.main.version>18494</plugin.main.version>
     18        <plugin.main.version>19044</plugin.main.version>
    1919        <plugin.author>Christoph Wagner</plugin.author>
    2020        <plugin.class>org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin</plugin.class>
    … …  
    2727        <dependency>
    2828            <groupId>org.bouncycastle</groupId>
    29             <artifactId>bcpg-jdk15on</artifactId>
    30             <version>1.51</version>
     29            <artifactId>bcpg-jdk18on</artifactId>
     30            <version>1.78.1</version>
    3131        </dependency>
    3232        <dependency>

  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java

    r34599 r36349  
    77import java.awt.Dimension;
    88import java.awt.GridBagLayout;
    9 import java.awt.event.ActionEvent;
    10 import java.awt.event.ActionListener;
    119import java.awt.event.ComponentAdapter;
    1210import java.awt.event.ComponentEvent;
    … …  
    1513import java.io.FileOutputStream;
    1614import java.io.IOException;
    17 import java.nio.charset.Charset;
    1815import java.nio.charset.StandardCharsets;
    1916import java.security.KeyPair;
    … …  
    106103    private PGPSecretKeyRingCollection pgpSec;
    107104    private PGPPublicKeyRingCollection pgpPub;
    108     private static int digest = PGPUtil.SHA1;
     105    private static final int digest = PGPUtil.SHA1;
    109106    private PGPSecretKey pgpSecKey;
    110107    public boolean keepkey = false;
    … …  
    122119
    123120    public PGPPublicKey getPublicKeyFromRing(long keyID) {
    124         try {
    125             if (pgpPub.contains(keyID))
    126                 return pgpPub.getPublicKey(keyID);
    127             else if (pgpSec.contains(keyID))
    128                 return pgpSec.getSecretKey(keyID).getPublicKey();
    129         } catch (PGPException e) {
    130             System.err.println("Could not read a PGPPublic key from your KeyRingCollectionFile. Stacktrace:");
    131             e.printStackTrace();
     121        if (pgpPub.contains(keyID)) {
     122            return pgpPub.getPublicKey(keyID);
     123        } else if (pgpSec.contains(keyID)) {
     124            return pgpSec.getSecretKey(keyID).getPublicKey();
    132125        }
    133126        return null;
    … …  
    216209        JButton detailsButton = new JButton(tr("Details"), ImageProvider.get("keydetails"));
    217210        detailsButton.setAlignmentX(Component.LEFT_ALIGNMENT);
    218         detailsButton.addActionListener(new ActionListener() {
    219             @Override
    220             public void actionPerformed(ActionEvent arg0) {
    221                 PGPSecretKey sk = sigKeys.get(keyBox.getSelectedIndex());
    222                 showKeyDetails(getPublicKeyFromRing(sk.getKeyID()));
    223             } });
     211        detailsButton.addActionListener(arg0 -> {
     212            PGPSecretKey sk = sigKeys.get(keyBox.getSelectedIndex());
     213            showKeyDetails(getPublicKeyFromRing(sk.getKeyID()));
     214        });
    224215        p.add(detailsButton);
    225216
    … …  
    232223        JButton createButton = new JButton(tr("Create new Key"), ImageProvider.get("key"));
    233224        createButton.setAlignmentX(Component.LEFT_ALIGNMENT);
    234         createButton.addActionListener(new ActionListener() {
    235 
    236             @Override
    237             public void actionPerformed(ActionEvent arg0) {
    238                 try {
    239                     PGPSecretKey secKey = generateKey();
    240                     if (secKey != null) {
    241                         keyBox.addItem(secKeytoString(secKey));
    242                         sigKeys.add(secKey);
    243                     }
    244                 } catch (NoSuchAlgorithmException | NoSuchProviderException | PGPException | IOException e) {
    245                     Logging.error(e);
     225        createButton.addActionListener(arg0 -> {
     226            try {
     227                PGPSecretKey secKey = generateKey();
     228                if (secKey != null) {
     229                    keyBox.addItem(secKeytoString(secKey));
     230                    sigKeys.add(secKey);
    246231                }
    247             } });
     232            } catch (NoSuchAlgorithmException | NoSuchProviderException | PGPException | IOException e) {
     233                Logging.error(e);
     234            }
     235        });
    248236        p.add(createButton);
    249237        p.add(Box.createRigidArea(d));
    … …  
    265253    }
    266254
    267     public void readGpgFiles() throws PGPException, IOException, NoSuchAlgorithmException, NoSuchProviderException {
     255    public void readGpgFiles() throws PGPException, IOException {
    268256        FileInputStream pubIn;
    269257        FileInputStream secIn;
    … …  
    283271    }
    284272
    285     public void writeGpgFiles() throws FileNotFoundException, IOException {
     273    public void writeGpgFiles() throws IOException {
    286274        String path = Preferences.main().getPluginsDirectory().getPath();
    287275        try (FileOutputStream pubOut = new FileOutputStream(path + "/trustosm/gnupg/pubring.gpg");
    … …  
    450438     */
    451439    public static double searchTolerance(PGPSignature sig) {
    452         /** Take the first NotationData packet that seems to have Tolerance information */
     440        /* Take the first NotationData packet that seems to have Tolerance information */
    453441        for (NotationData nd : sig.getHashedSubPackets().getNotationDataOccurrences()) {
    454442            if (nd.getNotationName().equals(TrustGPG.NOTATION_DATA_KEY)) {
    … …  
    470458
    471459        JFormattedTextField meters = new JFormattedTextField(NumberFormat.getNumberInstance());
    472         meters.setValue(Double.valueOf(10));
     460        meters.setValue(10.0);
    473461        meters.setColumns(5);
    474462
    … …  
    480468
    481469        if (n == JOptionPane.OK_OPTION) {
    482             spGen.setNotationData(false, true, TrustGPG.NOTATION_DATA_KEY, "Tolerance:"+meters.getValue()+"m");
     470            spGen.addNotationData(false, true, TrustGPG.NOTATION_DATA_KEY, "Tolerance:" + meters.getValue() + "m");
    483471            return spGen;
    484472        }
    … …  
    512500            if (web.isSelected()) sources += ":web";
    513501            if (trusted.isSelected()) sources += ":trusted";
    514             spGen.setNotationData(false, true, TrustGPG.NOTATION_DATA_KEY, sources);
     502            spGen.addNotationData(false, true, TrustGPG.NOTATION_DATA_KEY, sources);
    515503            return spGen;
    516504        }
    … …  
    548536            Iterator<?> it = pgpSecKey.getPublicKey().getUserIDs();
    549537            if (it.hasNext()) {
    550                 spGen.setSignerUserID(false, (String) it.next());
     538                spGen.addSignerUserID(false, (String) it.next());
    551539            }
    552540            sGen.setHashedSubpackets(spGen.generate());
    553             sGen.update(tosign.getBytes(Charset.forName("UTF-8")));
     541            sGen.update(tosign.getBytes(StandardCharsets.UTF_8));
    554542            sig = sGen.generate();
    555543            //System.out.println(new String(sGen.generateOnePassVersion(false).getEncoded(),Charset.forName("UTF-8")));
    … …  
    586574            PGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider().setProvider(provider);
    587575            sig.init(contentVerifierBuilderProvider, pgpPub.getPublicKey(sig.getKeyID()));
    588             sig.update(sigtext.getBytes(Charset.forName("UTF-8")));
     576            sig.update(sigtext.getBytes(StandardCharsets.UTF_8));
    589577            return sig.verify();
    590578        } catch (Exception e) {
    … …  
    630618        String keyid = "0x"+Long.toHexString(key.getKeyID()).substring(8).toUpperCase(Locale.ENGLISH);
    631619
    632         String algorithm = "";
     620        final String algorithm;
    633621        int algo = key.getAlgorithm();
    634622        switch(algo) {
    … …  
    637625        case PGPPublicKey.DSA:
    638626            algorithm = "Digital Signature Algorithm (DSA)"; break;
    639         case PGPPublicKey.EC:
     627        case PGPPublicKey.ECDH:
    640628            algorithm = "Elliptic Curve (EC)"; break;
    641629        case PGPPublicKey.ECDSA:
    … …  
    703691
    704692    public PGPSecretKey generateKey()
    705             throws NoSuchAlgorithmException, NoSuchProviderException, PGPException, FileNotFoundException, IOException {
     693            throws NoSuchAlgorithmException, NoSuchProviderException, PGPException, IOException {
    706694
    707695        JTextField userId = new JTextField();
    … …  
    738726        final String[] algos = {"DSA", "RSA"};
    739727        final JComboBox<?> algoBox = new JComboBox<Object>(algos);
    740         algoBox.addActionListener(new ActionListener() {
    741 
    742             @Override
    743             public void actionPerformed(ActionEvent e) {
    744                 JComboBox<?> cb = (JComboBox<?>) e.getSource();
    745                 String alg = (String) cb.getSelectedItem();
    746                 if (alg.equals("DSA")) {
    747                     strengthBox.setSelectedItem("1024");
    748                     strengthBox.setEnabled(false);
    749                 } else
    750                     strengthBox.setEnabled(true);
    751                 /*if (alg.equals("ECDSA")) {
    752                     curveBox.setEnabled(true);
    753                     strengthBox.setModel(new DefaultComboBoxModel(curvesizes));
    754                     strengthBox.setSelectedItem(curvesizes[curveBox.getSelectedIndex()]);
    755                     strengthBox.setEnabled(false);
    756                 } else {
    757                     curveBox.setEnabled(false);
    758                     strengthBox.setModel(new DefaultComboBoxModel(sizes));
    759                     strengthBox.setEnabled(true);
    760                 }*/
    761             }
     728        algoBox.addActionListener(e -> {
     729            JComboBox<?> cb = (JComboBox<?>) e.getSource();
     730            String alg = (String) cb.getSelectedItem();
     731            if ("DSA".equals(alg)) {
     732                strengthBox.setSelectedItem("1024");
     733                strengthBox.setEnabled(false);
     734            } else
     735                strengthBox.setEnabled(true);
     736            /*if (alg.equals("ECDSA")) {
     737                curveBox.setEnabled(true);
     738                strengthBox.setModel(new DefaultComboBoxModel(curvesizes));
     739                strengthBox.setSelectedItem(curvesizes[curveBox.getSelectedIndex()]);
     740                strengthBox.setEnabled(false);
     741            } else {
     742                curveBox.setEnabled(false);
     743                strengthBox.setModel(new DefaultComboBoxModel(sizes));
     744                strengthBox.setEnabled(true);
     745            }*/
    762746        });
    763747
    … …  
    836820
    837821        PGPSignatureSubpacketVector subPck = null;
    838         PGPSignatureSubpacketGenerator spGen = null;
    839822        Date expire = cal.getDate();
    840823        if (expire != null && expire.after(now)) {
    841             spGen = new PGPSignatureSubpacketGenerator();
     824            final PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator();
    842825            spGen.setKeyExpirationTime(true, (expire.getTime()-now.getTime())/1000);
    843826            subPck = spGen.generate();

  • applications/editors/josm/plugins/undelete/build.xml

    r35848 r36349  
    44    <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="17838"/>
     6    <property name="plugin.main.version" value="19044"/>
    77
    88    <property name="plugin.author" value="Nakor"/>

  • applications/editors/josm/plugins/undelete/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>17838</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020
    2121        <plugin.author>Nakor</plugin.author>

  • applications/editors/josm/plugins/wms-turbo-challenge2/build.xml

    r35939 r36349  
    55    <property name="commit.message" value="Commit message"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="15496"/>
     7    <property name="plugin.main.version" value="19044"/>
    88
    99    <property name="plugin.author" value="Andrzej Zaborowski"/>

  • applications/editors/josm/plugins/wms-turbo-challenge2/pom.xml

    r36325 r36349  
    1717    <properties>
    1818        <plugin.src.dir>src</plugin.src.dir>
    19         <plugin.main.version>15496</plugin.main.version>
     19        <plugin.main.version>19044</plugin.main.version>
    2020
    2121        <plugin.author>Andrzej Zaborowski</plugin.author>
Note: See TracChangeset for help on using the changeset viewer.