From c152770f7d1091d0996ff43a5f93518d7a721d3c Mon Sep 17 00:00:00 2001 From: Christian Pesch Date: Tue, 25 Mar 2014 11:41:14 +0100 Subject: [PATCH] follow Maven conventions: development is done on SNAPSHOT, release have a version number without --- brouter-core/pom.xml | 2 +- brouter-core/src/main/java/btools/router/OsmTrack.java | 10 +++++----- brouter-expressions/pom.xml | 2 +- brouter-map-creator/pom.xml | 2 +- brouter-mapaccess/pom.xml | 2 +- brouter-routing-app/pom.xml | 2 +- .../src/main/java/btools/routingapp/BRouterView.java | 2 +- brouter-server/pom.xml | 2 +- .../src/main/java/btools/server/BRouter.java | 2 +- .../src/main/java/btools/server/RouteServer.java | 2 +- brouter-util/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index e75292b..ec821cc 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-core diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 2f2a485..82b669c 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -197,21 +197,21 @@ public final class OsmTrack { String message = messageList.get(i); if ( i < messageList.size()-1 ) message = "(alt-index " + i + ": " + message + " )"; - if ( message != null ) sb.append( "\n" ); + if ( message != null ) sb.append("\n"); } sb.append( "\n" ); + sb.append( " creator=\"BRouter-0.9.8\" version=\"1.1\">\n" ); sb.append( " \n" ); - sb.append( " " + name + "\n" ); + sb.append(" ").append(name).append("\n"); sb.append( " \n" ); for( OsmPathElement n : nodes ) { String sele = n.getSElev() == Short.MIN_VALUE ? "" : "" + n.getElev() + ""; - sb.append( " " + sele + "\n" ); + sb.append(" ").append(sele).append("\n"); } sb.append( " \n" ); @@ -257,7 +257,7 @@ public final class OsmTrack 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( " \n" ); diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index a58eda5..f85ca66 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 3b93909..13a94bd 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index 364de1d..be37410 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-mapaccess diff --git a/brouter-routing-app/pom.xml b/brouter-routing-app/pom.xml index b72774c..7dcd401 100644 --- a/brouter-routing-app/pom.xml +++ b/brouter-routing-app/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-routing-app diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java index 4890792..d19845a 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -506,7 +506,7 @@ private long startTime = 0L; } else { - String result = "version = BRouter-0.98\n" + String result = "version = BRouter-0.9.8\n" + "distance = " + cr.getDistance()/1000. + " km\n" + "filtered ascend = " + cr.getAscend() + " m\n" + "plain ascend = " + cr.getPlainAscend(); diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index ede752c..c2075c5 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-server diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index 7bd3dfc..ced4489 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -88,7 +88,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 0.98 / 12012014 / abrensch"); + System.out.println("BRouter 0.9.8 / 12012014 / abrensch"); if ( args.length < 6 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 195b62c..c2f499e 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -182,7 +182,7 @@ public class RouteServer extends Thread 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 ) { System.out.println("serve YOURS protocol for BRouter"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index 4bad419..80c093f 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 0.98 + 0.9.8-SNAPSHOT ../pom.xml brouter-util diff --git a/pom.xml b/pom.xml index 474dee7..bb4af46 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 0.98 + 0.9.8-SNAPSHOT pom http://brensche.de/brouter/ brouter