Changeset 14021 in josm for trunk


Ignore:
Timestamp:
2018-07-08T20:57:55+02:00 (12 months ago)
Author:
Don-vip
Message:

more changes required by Groovy 2.5.0

Location:
trunk
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r14019 r14021  
    791791        <sequential>
    792792            <echo message="Generating Taginfo for type @{type} to @{output}"/>
    793             <groovy src="${taginfoextract}" classpath="${dist.jar}:${spotbugs.dir}/spotbugs-annotations.jar">
     793            <groovy src="${taginfoextract}" classpath="${dist.jar};${toString:groovy.classpath};${spotbugs.dir}/spotbugs-annotations.jar">
    794794                <arg value="-t"/>
    795795                <arg value="@{type}"/>
     
    805805
    806806    <target name="taginfo" depends="dist">
    807         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
     807        <!-- http://docs.groovy-lang.org/2.5.0/html/documentation/#_the_groovy_ant_task -->
     808        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
    808809        <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
    809810        <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
     
    814815
    815816    <target name="imageryindex" depends="init-properties">
    816         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
     817        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
    817818        <echo message="Checking editor imagery difference"/>
    818819        <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">
  • trunk/scripts/TagInfoExtract.groovy

    r14019 r14021  
    1313import java.nio.file.Files
    1414import java.nio.file.Path
     15import java.time.Instant
     16import java.time.ZoneId
     17import java.time.format.DateTimeFormatter
    1518
    1619import javax.imageio.ImageIO
     
    5356
    5457import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
    55 import groovy.cli.commons.CliBuilder
    5658import groovy.json.JsonBuilder
    5759
     
    368370                contact_email: "josm-dev@openstreetmap.org",
    369371        ]
    370         json data_format: 1, data_updated: new Date().format("yyyyMMdd'T'hhmmss'Z'", TimeZone.getTimeZone('UTC')), project: project, tags: tags
     372        json data_format: 1, data_updated: DateTimeFormatter.ofPattern("yyyyMMdd'T'hhmmss'Z'").withZone(ZoneId.of("Z")).format(Instant.now()), project: project, tags: tags
    371373
    372374        if (output_file != null) {
Note: See TracChangeset for help on using the changeset viewer.