follow Maven conventions: development is done on SNAPSHOT, release have a version number without

This commit is contained in:
Christian Pesch 2014-03-25 11:41:14 +01:00
parent e88465f5ec
commit c152770f7d
12 changed files with 16 additions and 16 deletions

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-core</artifactId> <artifactId>brouter-core</artifactId>

View file

@ -197,21 +197,21 @@ public final class OsmTrack
{ {
String message = messageList.get(i); String message = messageList.get(i);
if ( i < messageList.size()-1 ) message = "(alt-index " + i + ": " + message + " )"; if ( i < messageList.size()-1 ) message = "(alt-index " + i + ": " + message + " )";
if ( message != null ) sb.append( "<!-- " + message + " -->\n" ); if ( message != null ) sb.append("<!-- ").append(message).append(" -->\n");
} }
sb.append( "<gpx \n" ); sb.append( "<gpx \n" );
sb.append( " xmlns=\"http://www.topografix.com/GPX/1/1\" \n" ); sb.append( " xmlns=\"http://www.topografix.com/GPX/1/1\" \n" );
sb.append( " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" ); sb.append( " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" );
sb.append( " xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\" \n" ); sb.append( " xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\" \n" );
sb.append( " creator=\"BRouter-0.98\" version=\"1.1\">\n" ); sb.append( " creator=\"BRouter-0.9.8\" version=\"1.1\">\n" );
sb.append( " <trk>\n" ); sb.append( " <trk>\n" );
sb.append( " <name>" + name + "</name>\n" ); sb.append(" <name>").append(name).append("</name>\n");
sb.append( " <trkseg>\n" ); sb.append( " <trkseg>\n" );
for( OsmPathElement n : nodes ) for( OsmPathElement n : nodes )
{ {
String sele = n.getSElev() == Short.MIN_VALUE ? "" : "<ele>" + n.getElev() + "</ele>"; String sele = n.getSElev() == Short.MIN_VALUE ? "" : "<ele>" + n.getElev() + "</ele>";
sb.append( " <trkpt lon=\"" + formatPos( n.getILon() - 180000000 ) + "\" lat=\"" + formatPos( n.getILat() - 90000000 ) + "\">" + sele + "</trkpt>\n" ); sb.append(" <trkpt lon=\"").append(formatPos(n.getILon() - 180000000)).append("\" lat=\"").append(formatPos(n.getILat() - 90000000)).append("\">").append(sele).append("</trkpt>\n");
} }
sb.append( " </trkseg>\n" ); sb.append( " </trkseg>\n" );
@ -257,7 +257,7 @@ public final class OsmTrack
for( OsmPathElement n : nodes ) for( OsmPathElement n : nodes )
{ {
sb.append( formatPos( n.getILon() - 180000000 ) + "," + formatPos( n.getILat() - 90000000 ) + "\n" ); sb.append(formatPos(n.getILon() - 180000000)).append(",").append(formatPos(n.getILat() - 90000000)).append("\n");
} }
sb.append( " </coordinates>\n" ); sb.append( " </coordinates>\n" );

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-expressions</artifactId> <artifactId>brouter-expressions</artifactId>

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-map-creator</artifactId> <artifactId>brouter-map-creator</artifactId>

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-mapaccess</artifactId> <artifactId>brouter-mapaccess</artifactId>

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-routing-app</artifactId> <artifactId>brouter-routing-app</artifactId>

View file

@ -506,7 +506,7 @@ private long startTime = 0L;
} }
else else
{ {
String result = "version = BRouter-0.98\n" String result = "version = BRouter-0.9.8\n"
+ "distance = " + cr.getDistance()/1000. + " km\n" + "distance = " + cr.getDistance()/1000. + " km\n"
+ "filtered ascend = " + cr.getAscend() + " m\n" + "filtered ascend = " + cr.getAscend() + " m\n"
+ "plain ascend = " + cr.getPlainAscend(); + "plain ascend = " + cr.getPlainAscend();

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-server</artifactId> <artifactId>brouter-server</artifactId>

View file

@ -88,7 +88,7 @@ public class BRouter
} }
System.exit(0); System.exit(0);
} }
System.out.println("BRouter 0.98 / 12012014 / abrensch"); System.out.println("BRouter 0.9.8 / 12012014 / abrensch");
if ( args.length < 6 ) if ( args.length < 6 )
{ {
System.out.println("Find routes in an OSM map"); System.out.println("Find routes in an OSM map");

View file

@ -182,7 +182,7 @@ public class RouteServer extends Thread
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
System.out.println("BRouter 0.98 / 12012014 / abrensch"); System.out.println("BRouter 0.9.8 / 12012014 / abrensch");
if ( args.length != 3 ) if ( args.length != 3 )
{ {
System.out.println("serve YOURS protocol for BRouter"); System.out.println("serve YOURS protocol for BRouter");

View file

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>brouter-util</artifactId> <artifactId>brouter-util</artifactId>

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.btools</groupId> <groupId>org.btools</groupId>
<artifactId>brouter</artifactId> <artifactId>brouter</artifactId>
<version>0.98</version> <version>0.9.8-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>http://brensche.de/brouter/</url> <url>http://brensche.de/brouter/</url>
<name>brouter</name> <name>brouter</name>