See #23875: Use SNAPSHOT instead of 1.0-SNAPSHOT since that is what o…

…ur 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. git-svn-id: https://josm.openstreetmap.de/osmsvn/applications/editors/josm/plugins@36325 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
JOSM · Aug 28, 2024 · 4642e1d · 4642e1d
1 parent 4b77d42
commit 4642e1d
Show file tree

Hide file tree

Showing 112 changed files with 185 additions and 175 deletions.
diff --git a/ColumbusCSV/pom.xml b/ColumbusCSV/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>ColumbusCSV</artifactId>
 

diff --git a/CommandLine/pom.xml b/CommandLine/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>CommandLine</artifactId>
 

diff --git a/Create_grid_of_ways/pom.xml b/Create_grid_of_ways/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>Create_grid_of_ways</artifactId>
 

diff --git a/CustomizePublicTransportStop/pom.xml b/CustomizePublicTransportStop/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>CustomizePublicTransportStop</artifactId>
 

diff --git a/DirectDownload/pom.xml b/DirectDownload/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>DirectDownload</artifactId>
 

diff --git a/DirectUpload/pom.xml b/DirectUpload/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>DirectUpload</artifactId>
 

diff --git a/ElevationProfile/pom.xml b/ElevationProfile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>ElevationProfile</artifactId>
 

diff --git a/FIT/pom.xml b/FIT/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>FIT</artifactId>
 

diff --git a/FastDraw/pom.xml b/FastDraw/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>FastDraw</artifactId>
 

diff --git a/FixAddresses/pom.xml b/FixAddresses/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>FixAddresses</artifactId>
 

diff --git a/HouseNumberTaggingTool/pom.xml b/HouseNumberTaggingTool/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>HouseNumberTaggingTool</artifactId>
 

diff --git a/ImportImagePlugin/pom.xml b/ImportImagePlugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>ImportImagePlugin</artifactId>
 
@@ -40,19 +40,19 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>jts</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>ejml</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>geotools</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/MicrosoftStreetside/pom.xml b/MicrosoftStreetside/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>MicrosoftStreetside</artifactId>
 
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>apache-commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>javafx</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Provided by runtime -->

diff --git a/NanoLog/pom.xml b/NanoLog/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>NanoLog</artifactId>
 

diff --git a/OpeningHoursEditor/pom.xml b/OpeningHoursEditor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>OpeningHoursEditor</artifactId>
 

diff --git a/OsmInspectorPlugin/pom.xml b/OsmInspectorPlugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>OsmInspectorPlugin</artifactId>
 
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>jts</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>geotools</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/SaudiNationalAddress/pom.xml b/SaudiNationalAddress/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>SaudiNationalAddress</artifactId>
 

diff --git a/addrinterpolation/pom.xml b/addrinterpolation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>addrinterpolation</artifactId>
 

diff --git a/alignways/pom.xml b/alignways/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>alignways</artifactId>
 

diff --git a/apache-commons/ivy.xml b/apache-commons/ivy.xml
diff --git a/apache-commons/pom.xml b/apache-commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>apache-commons</artifactId>
 

diff --git a/apache-http/pom.xml b/apache-http/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>apache-http</artifactId>
     <developers>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>apache-commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/build-common.xml b/build-common.xml
@@ -803,6 +803,7 @@
         <!-- resolver.repositories makes it global -->
         <mvn:remoterepos id="resolver.repositories">
             <mvn:remoterepo id="JOSM" url="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
+            <mvn:remoterepo id="JOSM-snapshots" url="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" snapshots="true" />
         </mvn:remoterepos>
         <mkdir dir="${plugin.lib.dir}"/>
         <mvn:resolve>
@@ -815,7 +816,6 @@
             </mvn:dependencies>
             <mvn:files refid="lib.files" dir="${plugin.lib.dir}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!test"/>
         </mvn:resolve>
-        <echo message="${toString:lib.files}"/>
         <mvn:resolve>
             <mvn:path refid="classpath.provided" scopes="provided"/>
         </mvn:resolve>
@@ -841,7 +841,13 @@
             </mvn:dependencies>
             <mvn:path refid="spotbugs.classpath" classpath="compile"/>
         </mvn:resolve>
-        <path id="plugin.classpath.actual">
+        <condition property="classpath.provided.present">
+            <isreference refid="classpath.provided" type="path"/>
+        </condition>
+        <path id="plugin.classpath.actual" unless:set="classpath.provided.present">
+            <path refid="plugin.classpath"/>
+        </path>
+        <path id="plugin.classpath.actual" if:set="classpath.provided.present">
             <path refid="plugin.classpath"/>
             <path refid="classpath.provided"/>
         </path>

diff --git a/buildings_tools/pom.xml b/buildings_tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>buildings_tools</artifactId>
 

diff --git a/cadastre-fr/pom.xml b/cadastre-fr/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>cadastre-fr</artifactId>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>apache-commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- We need to override this from the parent pom; otherwise, it will be test only -->
@@ -46,19 +46,19 @@
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>ejml</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>jts</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.openstreetmap.josm.plugins</groupId>
             <artifactId>geotools</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/canvec_helper/pom.xml b/canvec_helper/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>canvec_helper</artifactId>
 

diff --git a/colorscheme/pom.xml b/colorscheme/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>colorscheme</artifactId>
 

diff --git a/comfort0/pom.xml b/comfort0/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openstreetmap.josm.plugins</groupId>
         <artifactId>plugin-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>SNAPSHOT</version>
     </parent>
     <artifactId>comfort0</artifactId>