Ignore:
Timestamp:
2024-08-28T20:42:06+02:00 (16 months ago)
Author:
taylor.smock
Message:

See #23875: Use SNAPSHOT instead of 1.0-SNAPSHOT since that is what our scripts currently publish

This should fix the Jenkins build for plugins.

Note: Maven warns that this may break in the future, in which case we'll have to
change our processes.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r36315 r36325  
    804804        <mvn:remoterepos id="resolver.repositories">
    805805            <mvn:remoterepo id="JOSM" url="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
     806            <mvn:remoterepo id="JOSM-snapshots" url="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" snapshots="true" />
    806807        </mvn:remoterepos>
    807808        <mkdir dir="${plugin.lib.dir}"/>
    … …  
    816817            <mvn:files refid="lib.files" dir="${plugin.lib.dir}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!test"/>
    817818        </mvn:resolve>
    818         <echo message="${toString:lib.files}"/>
    819819        <mvn:resolve>
    820820            <mvn:path refid="classpath.provided" scopes="provided"/>
    … …  
    842842            <mvn:path refid="spotbugs.classpath" classpath="compile"/>
    843843        </mvn:resolve>
    844         <path id="plugin.classpath.actual">
     844        <condition property="classpath.provided.present">
     845            <isreference refid="classpath.provided" type="path"/>
     846        </condition>
     847        <path id="plugin.classpath.actual" unless:set="classpath.provided.present">
     848            <path refid="plugin.classpath"/>
     849        </path>
     850        <path id="plugin.classpath.actual" if:set="classpath.provided.present">
    845851            <path refid="plugin.classpath"/>
    846852            <path refid="classpath.provided"/>
Note: See TracChangeset for help on using the changeset viewer.