Changeset 36034 in osm for applications/editors
- Timestamp:
- 2022-11-14T19:49:21+01:00 (2 years ago)
- Location:
- applications/editors/josm/plugins
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/MicrosoftStreetside/build.xml
r34772 r36034 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <project name="MicrosoftStreetside" default="dist" basedir="." xmlns:if="ant:if"> 3 4 <!-- Configure these properties (replace "..." accordingly). 2 <project xmlns:if="ant:if" xmlns:ivy="antlib:org.apache.ivy.ant" name="MicrosoftStreetside" default="dist" basedir="."> 3 <!-- Configure these properties (replace "..." accordingly). 5 4 See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins 6 5 --> 7 <!-- enter the SVN commit message --> 8 <property name="commit.message" value="Commit message" /> 9 10 <!-- edit the properties of this plugin in the file `gradle.properties` --> 11 <property file="${basedir}/gradle.properties"/> 12 13 <property name="josm" location="../../core/dist/josm-custom.jar"/> 14 <property name="plugin.dist.dir" value="../../dist"/> 15 16 <!--** include targets that all plugins have in common **--> 17 <import file="../build-common.xml"/> 18 19 <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}"> 20 <include name="apache-commons.jar"/> 21 <include name="apache-http.jar"/> 22 <include name="utilsplugin2.jar"/> 23 <include name="javafx-windows.jar" if:set="isWindows"/> 24 <include name="javafx-unixoid.jar" if:set="isUnix"/> 25 <include name="javafx-osx.jar" if:set="isMac"/> 26 </fileset> 27 28 <target name="pre-compile" depends="fetch_dependencies"> 29 <!-- include fetch_dependencies task --> 30 </target> 31 32 <target name="install-plugin" depends="clean, dist, install"> 33 <echo>Installed Microsoft Streetside plugin</echo> 34 </target> 35 36 <target name="test-run" depends="install-plugin, runjosm"> 37 </target> 6 <!-- enter the SVN commit message --> 7 <property name="commit.message" value="Commit message"/> 8 <!-- edit the properties of this plugin in the file `gradle.properties` --> 9 <property file="${basedir}/gradle.properties"/> 10 <property name="josm" location="../../core/dist/josm-custom.jar"/> 11 <property name="plugin.dist.dir" value="../../dist"/> 12 <!--** include targets that all plugins have in common **--> 13 <import file="../build-common.xml"/> 14 <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}"> 15 <include name="apache-commons.jar"/> 16 <include name="apache-http.jar"/> 17 <include name="jackson.jar"/> 18 <include name="javafx-osx.jar" if:set="isMac"/> 19 <include name="javafx-unixoid.jar" if:set="isUnix"/> 20 <include name="javafx-windows.jar" if:set="isWindows"/> 21 <include name="log4j.jar"/> 22 <include name="utilsplugin2.jar"/> 23 </fileset> 24 <target name="pre-compile" depends="fetch_dependencies"> 25 <!-- include fetch_dependencies task --> 26 <ivy:retrieve conf="provided,default"/> 27 <!--<ivy:cachepath pathid="compile.path" conf="default,provided"/>--> 28 </target> 29 <target name="build-jar"> 30 <ivy:resolve/> 31 <ivy:cachefileset setid="ivy.default.path" conf="default"/> 32 <jar destfile="${basedir}/dependencies.jar" duplicate="preserve" level="0"> 33 <zipgroupfileset refid="ivy.default.path"/> 34 </jar> 35 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="${manifest}" manifestencoding="UTF-8" duplicate="preserve" level="9" excludes="${basedir}/dependencies.jar"> 36 <zipfileset src="${basedir}/dependencies.jar" excludes="META-INF/maven/* META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE META-INF/*.RSA META-INF/*.SF module-info.class"/> 37 </jar> 38 <delete file="${basedir}/dependencies.jar"/> 39 </target> 38 40 </project> -
applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties
r35978 r36034 14 14 # If not, choose the next higher number that is available, or the gradle build will break. 15 15 plugin.compile.version=18494 16 plugin.requires=apache-commons;apache-http; utilsplugin2;javafx16 plugin.requires=apache-commons;apache-http;jackson;javafx;log4j;utilsplugin2 17 17 18 18 # Character encoding of Gradle files -
applications/editors/josm/plugins/MicrosoftStreetside/ivy.xml
r35779 r36034 1 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven"> 2 <info organisation="org.openstreetmap.josm.plugins" module="MicrosoftStreetside" revision="0.0.1" /> 3 <configurations defaultconf="default" defaultconfmapping="default->default"> 4 <conf name="default" /> 5 </configurations> 6 <dependencies> 7 <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="2.12.4"/> 8 <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.12.4"/> 9 <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.12.4"/> 10 <dependency org="us.monoid.web" name="resty" rev="0.3.2"/> 11 <dependency org="log4j" name="log4j" rev="1.2.17"/> 12 </dependencies> 1 <?xml version="1.0"?> 2 <ivy-module xmlns:m="http://ant.apache.org/ivy/maven" version="2.0"> 3 <info organisation="org.openstreetmap.josm.plugins" module="MicrosoftStreetside" revision="0.0.1"/> 4 <configurations defaultconf="default" defaultconfmapping="default->default"> 5 <conf name="default"/> 6 <conf name="provided" description="Needed for compile, but will be present at runtime"/> 7 </configurations> 8 <dependencies> 9 <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.12.4" conf="default->default"/> 10 <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.12.4" conf="default->default"/> 11 <dependency org="us.monoid.web" name="resty" rev="0.3.2" conf="default->default"/> 12 <dependency org="org.openjfx" name="javafx-swing" rev="19" conf="provided"> 13 <artifact name="javafx-swing" type="jar" m:classifier="linux"/> 14 <artifact name="javafx-swing" type="jar" m:classifier="mac"/> 15 <artifact name="javafx-swing" type="jar" m:classifier="win"/> 16 <artifact name="javafx-swing" type="jar" m:classifier="sources"/> 17 <artifact name="javafx-swing" type="jar" m:classifier="javadoc"/> 18 </dependency> 19 <dependency org="org.openjfx" name="javafx-controls" rev="19" conf="provided"> 20 <artifact name="javafx-controls" type="jar" m:classifier="linux"/> 21 <artifact name="javafx-controls" type="jar" m:classifier="mac"/> 22 <artifact name="javafx-controls" type="jar" m:classifier="win"/> 23 <artifact name="javafx-controls" type="jar" m:classifier="sources"/> 24 <artifact name="javafx-controls" type="jar" m:classifier="javadoc"/> 25 </dependency> 26 <dependency org="org.openjfx" name="javafx-base" rev="19" conf="provided"> 27 <artifact name="javafx-base" type="jar" m:classifier="linux"/> 28 <artifact name="javafx-base" type="jar" m:classifier="mac"/> 29 <artifact name="javafx-base" type="jar" m:classifier="win"/> 30 <artifact name="javafx-base" type="jar" m:classifier="sources"/> 31 <artifact name="javafx-base" type="jar" m:classifier="javadoc"/> 32 </dependency> 33 <dependency org="org.openjfx" name="javafx-graphics" rev="19" conf="provided"> 34 <artifact name="javafx-graphics" type="jar" m:classifier="linux"/> 35 <artifact name="javafx-graphics" type="jar" m:classifier="mac"/> 36 <artifact name="javafx-graphics" type="jar" m:classifier="win"/> 37 <artifact name="javafx-graphics" type="jar" m:classifier="sources"/> 38 <artifact name="javafx-graphics" type="jar" m:classifier="javadoc"/> 39 </dependency> 40 <!-- from jackson plugin --> 41 <exclude org="com.fasterxml.jackson.core" module="jackson-core"/> 42 <!-- not needed at runtime --> 43 <exclude org="net.java.dev.javacc" module="javacc"/> 44 </dependencies> 13 45 </ivy-module> -
applications/editors/josm/plugins/MicrosoftStreetside/ivy_settings.xml
r35955 r36034 6 6 <resolvers> 7 7 <ibiblio name="josm-nexus" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" m2compatible="true" /> 8 <ibiblio name="central" m2compatible="true"/>9 <ibiblio name="gluon" root="http://nexus.gluonhq.com/nexus/content/repositories/releases/" m2compatible="true" />10 <ibiblio name="sonatype_snapshots" root="https://oss.sonatype.org/content/repositories/snapshots/" m2compatible="true" />11 8 </resolvers> 12 9 <modules> 13 <module organisation="org.openjfx" resolver="sonatype_snapshots" />14 10 <module organisation="org.openstreetmap.jmapviewer" resolver="josm-nexus"/> 15 11 <module organisation="org.openstreetmap.josm" resolver="josm-nexus"/> -
applications/editors/josm/plugins/apache-commons/ivy.xml
r36003 r36034 4 4 <info organisation="org.openstreetmap.josm.plugins" module="apache-commons"/> 5 5 <dependencies> 6 <dependency org="com.github.luben" name="zstd-jni" rev="1.5.2- 3" conf="default->default"/>6 <dependency org="com.github.luben" name="zstd-jni" rev="1.5.2-5" conf="default->default"/> 7 7 <dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="default->default"/> 8 <dependency org="org.apache.commons" name="commons-compress" rev="1.2 1" conf="default->default"/>8 <dependency org="org.apache.commons" name="commons-compress" rev="1.22" conf="default->default"/> 9 9 <dependency org="org.apache.commons" name="commons-imaging" rev="1.0-alpha3" conf="default->default"/> 10 10 <!-- Apache Commons IO does not use the standard org name --> … … 14 14 <dependency org="org.apache.commons" name="commons-lang3" rev="3.12.0" conf="default->default"/> 15 15 <dependency org="org.apache.commons" name="commons-math3" rev="3.6.1" conf="default->default"/> 16 <dependency org="org.apache.commons" name="commons-text" rev="1. 9" conf="default->default"/>16 <dependency org="org.apache.commons" name="commons-text" rev="1.10.0" conf="default->default"/> 17 17 <dependency org="org.brotli" name="dec" rev="0.1.2" conf="default->default"/> 18 18 <dependency org="org.tukaani" name="xz" rev="1.9" conf="default->default"/> -
applications/editors/josm/plugins/flatlaf/ivy.xml
r35862 r36034 2 2 <info organisation="org.openstreetmap.josm.plugins" module="flatlaf"/> 3 3 <dependencies> 4 <dependency conf="default->default" org="com.formdev" name="flatlaf" rev=" 1.6.1"/>4 <dependency conf="default->default" org="com.formdev" name="flatlaf" rev="2.6"/> 5 5 </dependencies> 6 6 </ivy-module> -
applications/editors/josm/plugins/jackson/ivy.xml
r36006 r36034 4 4 <info organisation="org.openstreetmap.josm.plugins" module="geotools"/> 5 5 <dependencies> 6 <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="2.1 3.3" conf="default->default"/>6 <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="2.14.0" conf="default->default"/> 7 7 </dependencies> 8 8 </ivy-module> -
applications/editors/josm/plugins/javafx/ivy.xml
r35805 r36034 6 6 <dependencies> 7 7 <dependency org="org.testfx" name="openjfx-monocle" rev="jdk-11+26"/> 8 <dependency org="org.openjfx" name="javafx-swing" rev="1 6">8 <dependency org="org.openjfx" name="javafx-swing" rev="19"> 9 9 <artifact name="javafx-swing" type="jar" m:classifier="linux"/> 10 10 <artifact name="javafx-swing" type="jar" m:classifier="mac"/> … … 13 13 <artifact name="javafx-swing" type="jar" m:classifier="javadoc"/> 14 14 </dependency> 15 <dependency org="org.openjfx" name="javafx-fxml" rev="1 6">15 <dependency org="org.openjfx" name="javafx-fxml" rev="19"> 16 16 <artifact name="javafx-fxml" type="jar" m:classifier="linux"/> 17 17 <artifact name="javafx-fxml" type="jar" m:classifier="mac"/> … … 20 20 <artifact name="javafx-fxml" type="jar" m:classifier="javadoc"/> 21 21 </dependency> 22 <dependency org="org.openjfx" name="javafx-web" rev="1 6">22 <dependency org="org.openjfx" name="javafx-web" rev="19"> 23 23 <artifact name="javafx-web" type="jar" m:classifier="linux"/> 24 24 <artifact name="javafx-web" type="jar" m:classifier="mac"/> … … 27 27 <artifact name="javafx-web" type="jar" m:classifier="javadoc"/> 28 28 </dependency> 29 <dependency org="org.openjfx" name="javafx-media" rev="1 6">29 <dependency org="org.openjfx" name="javafx-media" rev="19"> 30 30 <artifact name="javafx-media" type="jar" m:classifier="linux"/> 31 31 <artifact name="javafx-media" type="jar" m:classifier="mac"/> … … 34 34 <artifact name="javafx-media" type="jar" m:classifier="javadoc"/> 35 35 </dependency> 36 <dependency org="org.openjfx" name="javafx-controls" rev="1 6">36 <dependency org="org.openjfx" name="javafx-controls" rev="19"> 37 37 <artifact name="javafx-controls" type="jar" m:classifier="linux"/> 38 38 <artifact name="javafx-controls" type="jar" m:classifier="mac"/> … … 41 41 <artifact name="javafx-controls" type="jar" m:classifier="javadoc"/> 42 42 </dependency> 43 <dependency org="org.openjfx" name="javafx-base" rev="1 6">43 <dependency org="org.openjfx" name="javafx-base" rev="19"> 44 44 <artifact name="javafx-base" type="jar" m:classifier="linux"/> 45 45 <artifact name="javafx-base" type="jar" m:classifier="mac"/> … … 48 48 <artifact name="javafx-base" type="jar" m:classifier="javadoc"/> 49 49 </dependency> 50 <dependency org="org.openjfx" name="javafx-graphics" rev="1 6">50 <dependency org="org.openjfx" name="javafx-graphics" rev="19"> 51 51 <artifact name="javafx-graphics" type="jar" m:classifier="linux"/> 52 52 <artifact name="javafx-graphics" type="jar" m:classifier="mac"/> -
applications/editors/josm/plugins/log4j/ivy.xml
r36007 r36034 4 4 <info organisation="org.openstreetmap.josm.plugins" module="log4j"/> 5 5 <dependencies> 6 <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.1 8.0" conf="default->default"/>7 <dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.1 8.0" conf="default->default"/>8 <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.1 8.0" conf="default->default"/>6 <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.19.0" conf="default->default"/> 7 <dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.19.0" conf="default->default"/> 8 <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.19.0" conf="default->default"/> 9 9 </dependencies> 10 10 </ivy-module> -
applications/editors/josm/plugins/lwjgl/ivy_settings.xml
r35926 r36034 1 1 <?xml version="1.0"?> 2 2 <ivysettings> 3 <property name="joml.version" value="1.10. 3"/>3 <property name="joml.version" value="1.10.5"/> 4 4 <property name="lwjgl.version" value="3.3.1"/> 5 5 <property name="lwjgl3-awt.version" value="0.1.8"/> -
applications/editors/josm/plugins/pbf/ivy.xml
r35825 r36034 2 2 <info organisation="org.openstreetmap.josm.plugins" module="pbf"/> 3 3 <dependencies> 4 <dependency conf="default->default" org="com.google.protobuf" name="protobuf-java" rev="3. 13.0"/>4 <dependency conf="default->default" org="com.google.protobuf" name="protobuf-java" rev="3.20.3"/> 5 5 <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.5.0"/> 6 6 </dependencies>
Note:
See TracChangeset
for help on using the changeset viewer.