Changeset 36282 in osm


Ignore:
Timestamp:
2024-06-07T15:20:22+02:00 (19 months ago)
Author:
taylor.smock
Message:

Fix #8269: Add initial maven pom files

This additionally deletes most IDE specific configuration, in favor of Maven
configuration.

What this does not do:

  • Convert from ivy to maven for dependency management. This should happen eventually with maven-resolver-ant-tasks (probably with the next dependency update).
  • Deprecate the current ant scripts.
Location:
applications/editors/josm
Files:
111 added
355 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/build-common.xml

    r36208 r36282  
    1717    <property name="josm.ivysettings"       location="../../core/ivysettings.xml"/>
    1818    <property name="josm.test.build.dir"    location="../../core/test/build"/>
    19     <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
    20     <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
    2119    <property name="core.tools.ivy"         location="../00_core_tools/ivy.xml"/>
    2220    <property name="plugin.tools.dir"       location="../00_tools"/>
    … …  
    553551        <ivy:settings file="${josm.ivysettings}" id="ivy.core.settings"/>
    554552        <ivy:resolve settingsRef="ivy.core.settings" file="${josm.ivy}" conf="test,jacocoant"/>
     553        <!-- The following ivy:retrieve calls are for IDEs without Ivy support; since we don't have sync=true, these may not have the "latest" versions -->
     554        <!--
    555555        <ivy:retrieve settingsRef="ivy.core.settings" pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
    556556        <ivy:retrieve settingsRef="ivy.core.settings" pattern="../00_core_tools/[conf].[ext]" conf="jacocoant"/>
    557         <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="../00_core_tools/jacocoant.jar"/>
     557        -->
     558        <ivy:cachepath settingsRef="ivy.core.settings" pathid=".local.test.classpath" conf="test" />
     559        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jacocotest.classpath" conf="test,jacocoant"/>
     560        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jmockit.classpath" file="${josm.ivy}" conf="jmockit" transitive="false"/>
     561        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jacocoant.classpath" file="${josm.ivy}" conf="jacocoant"/>
     562        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${toString:jacocoant.classpath}"/>
    558563        <path id="test.classpath">
    559564            <!-- JMockit must be included before JUnit in the classpath -->
    560             <pathelement path="${jmockit.jar}"/>
    561             <fileset dir="../00_core_test_lib">
    562                 <include name="**/*.jar"/>
    563                 <exclude name="**/jmockit*.jar"/>
    564             </fileset>
     565            <path refid="jmockit.classpath"/>
     566            <path refid="jacocotest.classpath"/>
     567            <path refid=".local.test.classpath"/>
    565568            <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
    566569                <include name="**/*.jar"/>
    … …  
    578581            <pathelement path="${josm}"/>
    579582            <pathelement path="${plugin.jar}"/>
    580             <pathelement path="${annotations.jar}"/>
    581583        </path>
    582584    </target>
    … …  
    619621                        <jvmarg value="${jacocoagent}" if:set="jacocoagent" />
    620622                        <jvmarg value="-Dfile.encoding=UTF-8"/>
    621                         <jvmarg value="-javaagent:${jmockit.jar}"/>
     623                        <jvmarg value="-javaagent:${toString:jmockit.classpath}"/>
    622624                        <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
    623625                        <jvmarg value="-Djunit.jupiter.execution.parallel.enabled=true"/>
Note: See TracChangeset for help on using the changeset viewer.