Changeset 14019 in josm


Ignore:
Timestamp:
2018-07-08T17:12:38+02:00 (6 years ago)
Author:
Don-vip
Message:

update to Groovy 2.5.0 and Eclipse Photon (4.8.0)

Location:
trunk
Files:
8 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
         1*-josm.xml
        12bin
        23bin2
         4bintest
         5build
         6build2
        37dist
        4 build
         8foobar
         9hs_err_pid*
         10imagery_*
         11javadoc
         12junit*.properties
        513plugin-check
        6 *-josm.xml
        7 javadoc
         14taginfo-img
        815taginfo_*.json
        9 taginfo-img
        10 build2
        11 junit*.properties
        12 foobar
        13 imagery_*
         16test_BLOCK_v2.*
        1417validator-*
        15 test_BLOCK_v2.*
        16 hs_err_pid*

  • trunk/.classpath

    r14002 r14019  
    33        <classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/XZUtils.java|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/compressors/zstandard/|org/apache/commons/compress/parallel/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/" kind="src" path="src"/>
    44        <classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
    5         <classpathentry kind="src" path="test/unit"/>
    6         <classpathentry kind="src" path="test/functional"/>
    7         <classpathentry kind="src" path="test/performance"/>
    8         <classpathentry kind="src" path="scripts"/>
    9         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
    10         <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
    11         <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
    12         <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
    13         <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
    14         <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
    15         <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
    16         <classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
    17         <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.8.jar"/>
    18         <classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
    19         <classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
    20         <classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
    21         <classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
    22         <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
    23         <classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
    24         <classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.0.jar"/>
    25         <classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar"/>
     5        <classpathentry kind="src" output="bintest" path="test/unit">
     6                <attributes>
     7                        <attribute name="test" value="true"/>
     8                </attributes>
     9        </classpathentry>
     10        <classpathentry kind="src" output="bintest" path="test/functional">
     11                <attributes>
     12                        <attribute name="test" value="true"/>
     13                </attributes>
     14        </classpathentry>
     15        <classpathentry kind="src" output="bintest" path="test/performance">
     16                <attributes>
     17                        <attribute name="test" value="true"/>
     18                </attributes>
     19        </classpathentry>
     20        <classpathentry kind="src" output="bintest" path="scripts">
     21                <attributes>
     22                        <attribute name="test" value="true"/>
     23                </attributes>
     24        </classpathentry>
     25        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
     26                <attributes>
     27                        <attribute name="test" value="true"/>
     28                </attributes>
     29        </classpathentry>
     30        <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar">
     31                <attributes>
     32                        <attribute name="test" value="true"/>
     33                </attributes>
     34        </classpathentry>
     35        <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar">
     36                <attributes>
     37                        <attribute name="test" value="true"/>
     38                </attributes>
     39        </classpathentry>
     40        <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar">
     41                <attributes>
     42                        <attribute name="test" value="true"/>
     43                </attributes>
     44        </classpathentry>
     45        <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar">
     46                <attributes>
     47                        <attribute name="test" value="true"/>
     48                </attributes>
     49        </classpathentry>
     50        <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar">
     51                <attributes>
     52                        <attribute name="test" value="true"/>
     53                </attributes>
     54        </classpathentry>
     55        <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar">
     56                <attributes>
     57                        <attribute name="test" value="true"/>
     58                </attributes>
     59        </classpathentry>
     60        <classpathentry kind="lib" path="test/lib/jfcunit.jar">
     61                <attributes>
     62                        <attribute name="test" value="true"/>
     63                </attributes>
     64        </classpathentry>
     65        <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.8.jar">
     66                <attributes>
     67                        <attribute name="test" value="true"/>
     68                </attributes>
     69        </classpathentry>
     70        <classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar">
     71                <attributes>
     72                        <attribute name="test" value="true"/>
     73                </attributes>
     74        </classpathentry>
     75        <classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar">
     76                <attributes>
     77                        <attribute name="test" value="true"/>
     78                </attributes>
     79        </classpathentry>
     80        <classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar">
     81                <attributes>
     82                        <attribute name="test" value="true"/>
     83                </attributes>
     84        </classpathentry>
     85        <classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar">
     86                <attributes>
     87                        <attribute name="test" value="true"/>
     88                </attributes>
     89        </classpathentry>
     90        <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar">
     91                <attributes>
     92                        <attribute name="test" value="true"/>
     93                </attributes>
     94        </classpathentry>
     95        <classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar">
     96                <attributes>
     97                        <attribute name="test" value="true"/>
     98                </attributes>
     99        </classpathentry>
     100        <classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.0.jar">
     101                <attributes>
     102                        <attribute name="test" value="true"/>
     103                </attributes>
     104        </classpathentry>
     105        <classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar">
     106                <attributes>
     107                        <attribute name="test" value="true"/>
     108                </attributes>
     109        </classpathentry>
    26110        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    27         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
    28         <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar"/>
    29         <classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar"/>
    30         <classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar"/>
    31         <classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
    32         <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
    33         <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
    34         <classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar"/>
     111        <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT">
     112                <attributes>
     113                        <attribute name="test" value="true"/>
     114                </attributes>
     115        </classpathentry>
     116        <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar">
     117                <attributes>
     118                        <attribute name="test" value="true"/>
     119                </attributes>
     120        </classpathentry>
     121        <classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar">
     122                <attributes>
     123                        <attribute name="test" value="true"/>
     124                </attributes>
     125        </classpathentry>
     126        <classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar">
     127                <attributes>
     128                        <attribute name="test" value="true"/>
     129                </attributes>
     130        </classpathentry>
     131        <classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar">
     132                <attributes>
     133                        <attribute name="test" value="true"/>
     134                </attributes>
     135        </classpathentry>
     136        <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar">
     137                <attributes>
     138                        <attribute name="test" value="true"/>
     139                </attributes>
     140        </classpathentry>
     141        <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT">
     142                <attributes>
     143                        <attribute name="test" value="true"/>
     144                </attributes>
     145        </classpathentry>
     146        <classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar">
     147                <attributes>
     148                        <attribute name="test" value="true"/>
     149                </attributes>
     150        </classpathentry>
     151        <classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.0.jar">
     152                <attributes>
     153                        <attribute name="test" value="true"/>
     154                </attributes>
     155        </classpathentry>
     156        <classpathentry kind="lib" path="tools/groovy/groovy-json-2.5.0.jar">
     157                <attributes>
     158                        <attribute name="test" value="true"/>
     159                </attributes>
     160        </classpathentry>
     161        <classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.0.jar">
     162                <attributes>
     163                        <attribute name="test" value="true"/>
     164                </attributes>
     165        </classpathentry>
    35166        <classpathentry kind="output" path="bin"/>
    36167</classpath>

  • trunk/.settings/org.eclipse.jdt.groovy.core.prefs

    r8632 r14019  
    11eclipse.preferences.version=1
    2 groovy.compiler.level=24
     2groovy.compiler.level=25
     3groovy.script.filters=**/*.dsld,y,**/*.gradle,n

  • trunk/build.xml

    r13962 r14019  
    3939        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    4040        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
    41         <property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
    4241        <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
    4342        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    … …  
    7574            </not>
    7675        </condition>
     76        <path id="groovy.classpath">
     77            <fileset dir="${tools.dir}/groovy">
     78                <include name="*.jar"/>
     79            </fileset>
     80        </path>
    7781        <path id="test.classpath">
    7882            <fileset dir="${test.dir}/lib">
    … …  
    8084            </fileset>
    8185            <pathelement path="${dist.jar}"/>
    82             <pathelement path="${groovy.jar}"/>
     86            <pathelement path="${toString:groovy.classpath}"/>
    8387            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    8488        </path>
    … …  
    468472    </macrodef>
    469473    <target name="test-compile" depends="test-init,dist">
    470         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/>
     474        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
    471475        <call-groovyc testfamily="unit">
    472476            <cp-elements>
    … …  
    801805
    802806    <target name="taginfo" depends="dist">
    803         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
     807        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
    804808        <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
    805809        <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
    … …  
    810814
    811815    <target name="imageryindex" depends="init-properties">
    812         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
     816        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
    813817        <echo message="Checking editor imagery difference"/>
    814818        <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">

  • trunk/scripts/SyncEditorLayerIndex.groovy

    r13997 r14019  
    1818 */
    1919import java.text.DecimalFormat
     20
    2021import javax.json.Json
    2122import javax.json.JsonArray
    … …  
    3334import org.openstreetmap.josm.io.imagery.ImageryReader
    3435import org.openstreetmap.josm.spi.preferences.Config
     36
     37import groovy.cli.commons.CliBuilder
    3538
    3639class SyncEditorLayerIndex {
    … …  
    727730            } catch(IllegalArgumentException err) {
    728731                def desc = getDescription(e)
    729                 myprintln("* Invalid data in ELI geometry for $desc: ${err.getMessage()}") 
     732                myprintln("* Invalid data in ELI geometry for $desc: ${err.getMessage()}")
    730733            }
    731734            if (s == null || !josmUrls.containsKey(url)) {

  • trunk/scripts/TagInfoExtract.groovy

    r13022 r14019  
    5353
    5454import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
     55import groovy.cli.commons.CliBuilder
    5556import groovy.json.JsonBuilder
    5657

  • trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy

    r9214 r14019  
    2020class ChildOrParentSelectorTest {
    2121    static private Logger logger = Logger.getLogger(ChildOrParentSelectorTest.class.getName());
    22 
    23     def shouldFail = new GroovyTestCase().&shouldFail
    2422
    2523    def DataSet ds;

  • trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy

    r10837 r14019  
    22package org.openstreetmap.josm.gui.mappaint.mapcss;
    33
     4import static groovy.test.GroovyAssert.shouldFail
    45import static org.junit.Assert.*
    56
    … …  
    1617
    1718class KeyConditionTest {
    18 
    19     def shouldFail = new GroovyTestCase().&shouldFail
    2019
    2120    def DataSet ds;

  • trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy

    r10837 r14019  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.gui.mappaint.mapcss;
     3
     4import static groovy.test.GroovyAssert.shouldFail
    35
    46import org.junit.*
    … …  
    1517import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
    1618
    17 
    1819class KeyValueConditionTest {
    19 
    20     def shouldFail = new GroovyTestCase().&shouldFail
    2120
    2221    def DataSet ds;

  • trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy

    r11035 r14019  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.io
     3
     4import static groovy.test.GroovyAssert.shouldFail
     5
     6import java.time.OffsetDateTime
     7import java.time.ZoneOffset
    38
    49import org.junit.Test
    … …  
    611import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser
    712
    8 import java.time.OffsetDateTime
    9 import java.time.ZoneOffset
    10 
    1113class ChangesetQueryUrlParserTest {
    12     final shouldFail = new GroovyTestCase().&shouldFail
    1314
    1415    @Test

  • trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy

    r10222 r14019  
    22package org.openstreetmap.josm.io;
    33
     4import static groovy.test.GroovyAssert.shouldFail
    45import static org.junit.Assert.*
    56
    … …  
    3031    public void testParse_NOK_Cases() {
    3132        def DiffResultProcessor processor  = new DiffResultProcessor([])
    32 
    33         final shouldFail = new GroovyTestCase().&shouldFail
    3433
    3534        shouldFail(IllegalArgumentException) {

  • trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy

    r9214 r14019  
    11package org.openstreetmap.josm.io;
    22
     3import static groovy.test.GroovyAssert.shouldFail
    34import static org.junit.Assert.*
    45
    … …  
    3839        def Changeset cs = new Changeset(1)
    3940        OsmChangeBuilder builder = new OsmChangeBuilder(cs)
    40 
    41         final shouldFail = new GroovyTestCase().&shouldFail
    4241
    4342        // should be OK

  • trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy

    r8510 r14019  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.io;
     3
     4import static groovy.test.GroovyAssert.shouldFail
    35
    46import java.nio.charset.StandardCharsets
    … …  
    1517
    1618class OsmChangesetContentParserTest {
    17     final shouldFail = new GroovyTestCase().&shouldFail
    1819
    1920    @Test

  • trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy

    r8510 r14019  
    22package org.openstreetmap.josm.io;
    33
     4import static groovy.test.GroovyAssert.shouldFail
    45import static org.junit.Assert.*
    56
    … …  
    167168        """
    168169
    169         final shouldFail = new GroovyTestCase().&shouldFail
    170 
    171170        shouldFail(IllegalDataException) {
    172171            DataSet ds = getDataSet(doc)
    … …  
    184183        </osm>
    185184        """
    186 
    187         final shouldFail = new GroovyTestCase().&shouldFail
    188185
    189186        shouldFail(IllegalDataException) {
    … …  
    203200            """
    204201
    205         final shouldFail = new GroovyTestCase().&shouldFail
    206 
    207202        shouldFail(IllegalDataException) {
    208203            DataSet ds = getDataSet(doc)
Note: See TracChangeset for help on using the changeset viewer.