Changeset 16229 in josm for trunk


Ignore:
Timestamp:
2020-04-04T16:54:07+02:00 (5 years ago)
Author:
Don-vip
Message:

see #16860 - resolve test libraries using Ivy

Location:
trunk
Files:
14 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1616test_BLOCK_v2.*
        1717validator-*
         18.josm-local

  • trunk/.classpath

    r16176 r16229  
    2323                </attributes>
    2424        </classpathentry>
    25         <classpathentry kind="lib" path="test/lib/jmockit.jar">
    26                 <attributes>
    27                         <attribute name="test" value="true"/>
    28                 </attributes>
    29         </classpathentry>
    3025        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
    3126                <attributes>
    … …  
    3429        </classpathentry>
    3530        <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=ivysettings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=&amp;propertyFiles="/>
    36         <classpathentry kind="lib" path="test/lib/jfcunit.jar">
    37                 <attributes>
    38                         <attribute name="test" value="true"/>
    39                 </attributes>
    40         </classpathentry>
    41         <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-3.1.2.jar">
    42                 <attributes>
    43                         <attribute name="test" value="true"/>
    44                 </attributes>
    45         </classpathentry>
    46         <classpathentry kind="lib" path="test/lib/classgraph-4.6.32.jar" sourcepath="C:/Users/vippy/.m2/repository/io/github/classgraph/classgraph/4.6.32/classgraph-4.6.32-sources.jar">
    47                 <attributes>
    48                         <attribute name="test" value="true"/>
    49                 </attributes>
    50         </classpathentry>
    51         <classpathentry kind="lib" path="test/lib/system-rules-1.19.0.jar">
    52                 <attributes>
    53                         <attribute name="test" value="true"/>
    54                 </attributes>
    55         </classpathentry>
    56         <classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar">
    57                 <attributes>
    58                         <attribute name="test" value="true"/>
    59                 </attributes>
    60         </classpathentry>
    61         <classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.20.0.jar">
    62                 <attributes>
    63                         <attribute name="test" value="true"/>
    64                 </attributes>
    65         </classpathentry>
    66         <classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.5.jar">
    67                 <attributes>
    68                         <attribute name="test" value="true"/>
    69                 </attributes>
    70         </classpathentry>
    7131        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
    7232                <attributes>
    … …  
    8040                </accessrules>
    8141        </classpathentry>
    82         <classpathentry kind="lib" path="tools/commons-lang3-3.8.1.jar">
    83                 <attributes>
    84                         <attribute name="test" value="true"/>
    85                 </attributes>
    86         </classpathentry>
    87         <classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar">
    88                 <attributes>
    89                         <attribute name="test" value="true"/>
    90                 </attributes>
    91         </classpathentry>
    9242        <classpathentry kind="output" path="bin"/>
    9343</classpath>

  • trunk/.settings/org.eclipse.core.resources.prefs

    r16006 r16229  
    11eclipse.preferences.version=1
    22encoding//native/windows/locale=ISO-8859-1
     3encoding//resources/data/validator/addresses.mapcss=UTF-8
     4encoding//resources/data/validator/combinations.mapcss=UTF-8
     5encoding//resources/data/validator/deprecated.mapcss=UTF-8
     6encoding//resources/data/validator/geometry.mapcss=UTF-8
     7encoding//resources/data/validator/highway.mapcss=UTF-8
     8encoding//resources/data/validator/multiple.mapcss=UTF-8
     9encoding//resources/data/validator/numeric.mapcss=UTF-8
     10encoding//resources/data/validator/relation.mapcss=UTF-8
     11encoding//resources/data/validator/religion.mapcss=UTF-8
     12encoding//resources/data/validator/territories.mapcss=UTF-8
     13encoding//resources/data/validator/unnecessary.mapcss=UTF-8
     14encoding//resources/data/validator/wikipedia.mapcss=UTF-8
    315encoding/<project>=UTF-8

  • trunk/build.xml

    r16197 r16229  
    6868        <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
    6969        <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
    70         <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3-3.8.1.jar"/>
    7170        <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    7271        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    … …  
    103102            <isset property="isJava9"/>
    104103        </condition>
    105         <path id="test.classpath">
    106             <fileset dir="${test.dir}/lib">
    107                 <include name="**/*.jar"/>
    108             </fileset>
    109             <pathelement path="${build.dir}"/>
    110             <pathelement path="${resources.dir}"/>
    111             <pathelement path="${failureaccess.jar}"/>
    112             <pathelement path="${commons-lang3.jar}"/>
    113             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    114         </path>
    115104        <path id="processor.path">
    116105            <pathelement location="${error_prone_core.jar}"/>
    … …  
    400389        <init-test-preferences testfamily="functional"/>
    401390        <init-test-preferences testfamily="performance"/>
     391        <path id="test.classpath">
     392            <path refid="test.path"/>
     393            <pathelement path="${build.dir}"/>
     394            <pathelement path="${resources.dir}"/>
     395        </path>
     396        <ivy:retrieve pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
     397        <ivy:retrieve pattern="${tools.dir}/[conf].[ext]" conf="jacocoant"/>
    402398        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
    403399    </target>
    … …  
    922918                pluginList=""
    923919                excludeFilter="${spotbugs.dir}/josm-filter.xml"
    924                     onlyAnalyze="org.openstreetmap.josm.-"
     920                onlyAnalyze="org.openstreetmap.josm.-"
    925921                effort="max"
    926922                reportLevel="low"
    927923                >
    928                 <class location="${dist.jar}" />
     924            <class location="${dist.jar}" />
    929925        </spotbugs>
    930926    </target>
    … …  
    11461142    <target name="bootstrap-workspace" description="Copy libraries from ivy cache to workspace folders for IDE" depends="resolve">
    11471143        <delete dir="${lib.dir}"/>
    1148         <ivy:retrieve pattern="${lib.dir}/compile/[artifact]-[type].[ext]" conf="compile"/>
    1149         <ivy:retrieve pattern="${lib.dir}/runtime/[artifact]-[type].[ext]" conf="runtime"/>
    1150         <ivy:retrieve pattern="${lib.dir}/sources/[artifact]-[type].[ext]" conf="sources"/>
    1151         <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle" file="${tools.ivy}"/>
     1144        <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type].[ext]" conf="compile,runtime,sources,test"/>
     1145        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
     1146    </target>
     1147    <target name="api-dependency-tree" description="Displays Ivy dependency tree for JOSM API" depends="resolve">
     1148        <ivy:dependencytree conf="api"/>
     1149    </target>
     1150    <target name="test-dependency-tree" description="Displays Ivy dependency tree for JOSM tests" depends="resolve">
     1151        <ivy:dependencytree conf="test"/>
    11521152    </target>
    11531153</project>

  • trunk/ivy.xml

    r16195 r16229  
    44    <info organisation="org.openstreetmap" module="josm"/>
    55    <configurations>
    6         <!--  configuration that should be used when specifying dependencies -->
     6        <!--  configurations that should be used when specifying dependencies -->
    77        <conf name="implementation" description="All libs JOSM uses that plugins should not use"/>
    88        <conf name="api" description="All libs that JOSM uses and are available for plugins"/>
    … …  
    1010        <conf name="provided" description="The libs we need during compilation but not on application start"/>
    1111        <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
    12         <!--  Meta configuration used in build scripts -->
     12        <!-- Special configurations used to retrieve jar files of test lib/tools referred by file path -->
     13        <conf name="jmockit" description="JMockit test library"/>
     14        <conf name="jacocoant" description="Jacoco Ant test library"/>
     15        <!--  Meta configurations used in build scripts -->
    1316        <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
    1417        <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
    15         <conf name="test" description="Libraries only needed for testing" extends="compile,runtime"/>
     18        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime,jmockit"/>
    1619        <conf name="sources" description="Source code of used libraries"/>
    1720    </configurations>
    1821    <dependencies>
    1922        <!-- api->default -->
    20         <dependency org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13" conf="api->default"/>
    21         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="api->default"/>
    22         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="api->default"/>
    23         <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="api->default"/>
    24         <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="api->default"/>
    25         <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="api->default"/>
    26         <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
    27         <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.13.0" conf="api->default"/>
    28         <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="api->default"/>
     23        <dependency conf="api->default" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13"/>
     24        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
     25        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
     26        <dependency conf="api->default" org="commons-logging" name="commons-logging" rev="1.2"/>
     27        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
     28        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.20"/>
     29        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.8"/>
     30        <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.13.0"/>
     31        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.21.1"/>
    2932        <!-- sources->sources -->
    30         <dependency org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13" conf="sources->sources"/>
    31         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>
    32         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="sources->sources"/>
    33         <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="sources->sources"/>
    34         <dependency org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT" conf="sources->sources"/>
    35         <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="sources->sources"/>
    36         <dependency org="org.tukaani" name="xz" rev="1.8" conf="sources->sources"/>
    37         <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.13.0" conf="sources->sources"/>
    38         <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="sources->sources"/>
     33        <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13"/>
     34        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
     35        <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
     36        <dependency conf="sources->sources" org="commons-logging" name="commons-logging" rev="1.2"/>
     37        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
     38        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.20"/>
     39        <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.8"/>
     40        <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.13.0"/>
     41        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.21.1"/>
     42        <!-- jacocoant->default -->
     43        <dependency conf="jacocoant->default" org="org.jacoco" name="org.jacoco.ant" rev="0.8.6-SNAPSHOT">
     44                <artifact name="org.jacoco.ant" type="jar" maven:classifier="nodeps"/>
     45        </dependency>
     46        <!-- jmockit->default - Don't upgrade JMockit until https://josm.openstreetmap.de/ticket/18200 is resolved -->
     47        <dependency conf="jmockit->default" org="org.jmockit" name="jmockit" rev="1.44"/>
     48        <!-- test->default -->
     49        <dependency conf="test->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.0.1"/>
     50        <dependency conf="test->default" org="com.github.stefanbirkner" name="system-rules" rev="1.19.0">
     51                <exclude module="junit-dep" />
     52        </dependency>
     53        <dependency conf="test->default" org="com.github.tomakehurst" name="wiremock" rev="2.26.3"/>
     54        <dependency conf="test->default" org="io.github.classgraph" name="classgraph" rev="4.8.67"/>
     55        <dependency conf="test->default" org="junit" name="junit" rev="4.12"/>
     56        <dependency conf="test->default" org="net.trajano.commons" name="commons-testing" rev="2.1.0"/>
     57        <dependency conf="test->default" org="nl.jqno.equalsverifier" name="equalsverifier" rev="3.1.13"/>
     58        <dependency conf="test->default" org="org.apache.commons" name="commons-lang3" rev="3.10"/>
     59        <dependency conf="test->default" org="org.awaitility" name="awaitility" rev="4.0.2"/>
    3960    </dependencies>
    4061</ivy-module>

  • trunk/ivysettings.xml

    r16195 r16229  
    88      <ibiblio name="josm-nexus-snapshots" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" />
    99      <ibiblio name="jcenter" m2compatible="true" root="https://jcenter.bintray.com/" />
     10      <ibiblio name="oss-sonatype-snapshots" m2compatible="true" root="https://oss.sonatype.org/content/repositories/snapshots/" />
    1011    </chain>
    1112  </resolvers>

  • trunk/test/lib

    • Property svn:ignore set to
      *.jar

  • trunk/tools

    • Property svn:ignore

      •  

        old new  
        11ivy-report
         2jacocoant.jar

  • trunk/tools/checkstyle/META-INF/MANIFEST.MF

    r15588 r16229  
    33Bundle-Name: JOSM Checkstyle Eclipse Plugin
    44Bundle-SymbolicName: org.openstreetmap.josm.checkstyle-eclipse-plugin;singleton:=true
    5 Bundle-Version: 8.27.0.qualifier
     5Bundle-Version: 8.29.0.qualifier
    66Require-Bundle: net.sf.eclipsecs.checkstyle,
    77 net.sf.eclipsecs.core,

  • trunk/tools/ivy

    • Property svn:ignore

      •  

        old new  
        11OpeningHoursParser*.jar
        22annotations*.jar
         3ivy-*.jar

  • trunk/tools/ivy.xml

    r16171 r16229  
    1414        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.3" conf="javacc->default"/>
    1515        <!-- checkstyle->default -->
    16         <dependency org="com.puppycrawl.tools" name="checkstyle" rev="8.27" conf="checkstyle->default"/>
     16        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="8.29" conf="checkstyle->default"/>
    1717        <!-- proguard->default -->
    1818        <dependency org="net.sf.proguard" name="proguard-anttask" rev="6.2.2" conf="proguard->default"/>
    … …  
    2525        </dependency>
    2626        <!-- spotbugs->default -->
    27         <dependency org="com.github.spotbugs" name="spotbugs" rev="3.1.12" conf="spotbugs->default"/>
    28         <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="3.1.12" conf="spotbugs->default"/>
     27        <dependency org="com.github.spotbugs" name="spotbugs" rev="4.0.1" conf="spotbugs->default"/>
     28        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="4.0.1" conf="spotbugs->default"/>
    2929    </dependencies>
    3030</ivy-module>
Note: See TracChangeset for help on using the changeset viewer.