Changeset 14021 in josm

Timestamp:

2018-07-08T20:57:55+02:00 (7 years ago)

Author:

Don-vip

Message:

more changes required by Groovy 2.5.0

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• scripts/TagInfoExtract.groovy (modified) (3 diffs)
• tools/commons-cli-1.3.1.jar (deleted)
• tools/groovy/commons-cli-1.4.jar (added)

trunk/build.xml

@@ -791 +791 @@
         <sequential>
             <echo message="Generating Taginfo for type @{type} to @{output}"/>
-            <groovy src="${taginfoextract}" classpath="${dist.jar}:${spotbugs.dir}/spotbugs-annotations.jar">
+            <groovy src="${taginfoextract}" classpath="${dist.jar};${toString:groovy.classpath};${spotbugs.dir}/spotbugs-annotations.jar">
                 <arg value="-t"/>
                 <arg value="@{type}"/>
@@ -805 +805 @@
 
     <target name="taginfo" depends="dist">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
+        <!-- http://docs.groovy-lang.org/2.5.0/html/documentation/#_the_groovy_ant_task -->
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
         <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
         <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
@@ -814 +815 @@
 
     <target name="imageryindex" depends="init-properties">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
         <echo message="Checking editor imagery difference"/>
         <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">

trunk/scripts/TagInfoExtract.groovy

@@ -13 +13 @@
 import java.nio.file.Files
 import java.nio.file.Path
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 import javax.imageio.ImageIO
@@ -53 +56 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
-import groovy.cli.commons.CliBuilder
 import groovy.json.JsonBuilder
 
@@ -368 +370 @@
                 contact_email: "josm-dev@openstreetmap.org",
         ]
-        json data_format: 1, data_updated: new Date().format("yyyyMMdd'T'hhmmss'Z'", TimeZone.getTimeZone('UTC')), project: project, tags: tags
+        json data_format: 1, data_updated: DateTimeFormatter.ofPattern("yyyyMMdd'T'hhmmss'Z'").withZone(ZoneId.of("Z")).format(Instant.now()), project: project, tags: tags
 
         if (output_file != null) {