From 037ab7d7342c4cdb36c9311af305a908a2eac701 Mon Sep 17 00:00:00 2001
From: Arndt <Arndt.Brenschede@web.de>
Date: Mon, 16 May 2016 18:10:45 +0200
Subject: [PATCH] 1.4.2 versioning

---
 brouter-codec/pom.xml                                       | 2 +-
 brouter-core/pom.xml                                        | 2 +-
 brouter-core/src/main/java/btools/router/OsmTrack.java      | 2 +-
 brouter-expressions/pom.xml                                 | 2 +-
 brouter-map-creator/pom.xml                                 | 2 +-
 brouter-mapaccess/pom.xml                                   | 2 +-
 brouter-mem-router/pom.xml                                  | 2 +-
 brouter-routing-app/AndroidManifest.xml                     | 4 ++--
 brouter-routing-app/pom.xml                                 | 2 +-
 .../src/main/java/btools/routingapp/BRouterView.java        | 2 +-
 brouter-server/pom.xml                                      | 6 +++---
 brouter-server/src/main/java/btools/server/BRouter.java     | 2 +-
 brouter-server/src/main/java/btools/server/RouteServer.java | 2 +-
 brouter-util/pom.xml                                        | 2 +-
 pom.xml                                                     | 4 ++--
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml
index 8825d77..38174aa 100644
--- a/brouter-codec/pom.xml
+++ b/brouter-codec/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-codec</artifactId>
diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml
index bb0dd87..ce02833 100644
--- a/brouter-core/pom.xml
+++ b/brouter-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-core</artifactId>
diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java
index a2989b1..ba2005f 100644
--- a/brouter-core/src/main/java/btools/router/OsmTrack.java
+++ b/brouter-core/src/main/java/btools/router/OsmTrack.java
@@ -339,7 +339,7 @@ public final class OsmTrack
     }
     else
     {
-      sb.append( " creator=\"BRouter-1.4.1\" version=\"1.1\">\n" );
+      sb.append( " creator=\"BRouter-1.4.2\" version=\"1.1\">\n" );
     }
 
     if ( turnInstructionMode == 3) // osmand style
diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml
index d39ed4e..7d141c2 100644
--- a/brouter-expressions/pom.xml
+++ b/brouter-expressions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-expressions</artifactId>
diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml
index 7c30c9d..71a148b 100644
--- a/brouter-map-creator/pom.xml
+++ b/brouter-map-creator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-map-creator</artifactId>
diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml
index beb0165..2c7c0fd 100644
--- a/brouter-mapaccess/pom.xml
+++ b/brouter-mapaccess/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-mapaccess</artifactId>
diff --git a/brouter-mem-router/pom.xml b/brouter-mem-router/pom.xml
index fce9610..03916e3 100644
--- a/brouter-mem-router/pom.xml
+++ b/brouter-mem-router/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-mem-router</artifactId>
diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml
index dd9da2f..6f15b66 100644
--- a/brouter-routing-app/AndroidManifest.xml
+++ b/brouter-routing-app/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="12"
-      android:versionName="1.4.1" package="btools.routingapp">
+      android:versionCode="13"
+      android:versionName="1.4.2" package="btools.routingapp">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".BRouterActivity"
                   android:label="@string/app_name"
diff --git a/brouter-routing-app/pom.xml b/brouter-routing-app/pom.xml
index baceffe..a4cd102 100644
--- a/brouter-routing-app/pom.xml
+++ b/brouter-routing-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-routing-app</artifactId>
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 f2ff6ef..71f6c6d 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java
@@ -680,7 +680,7 @@ public class BRouterView extends View
         }
         else
         {
-          String result = "version = BRouter-1.4.1\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
+          String result = "version = BRouter-1.4.2\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
               + " m\n" + "plain ascend = " + cr.getPlainAscend();
 
           rawTrack = cr.getFoundRawTrack();
diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml
index 419a5a6..e80122a 100644
--- a/brouter-server/pom.xml
+++ b/brouter-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-server</artifactId>
@@ -51,11 +51,11 @@
             <artifactId>brouter-map-creator</artifactId>
             <version>${project.version}</version>
 		</dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.btools</groupId>
             <artifactId>brouter-mem-router</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency> -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java
index a167a5c..3dc52f2 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 1.4.1 / 09052016 / abrensch");
+    System.out.println("BRouter 1.4.2 / 16052016 / 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 8aec264..1d6f7a2 100644
--- a/brouter-server/src/main/java/btools/server/RouteServer.java
+++ b/brouter-server/src/main/java/btools/server/RouteServer.java
@@ -155,7 +155,7 @@ public class RouteServer extends Thread
 
   public static void main(String[] args) throws Exception
   {
-        System.out.println("BRouter 1.4.1 / 09052016");
+        System.out.println("BRouter 1.4.2 / 16052016");
         if ( args.length != 5 )
         {
           System.out.println("serve BRouter protocol");
diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml
index c0a95ef..39d18f0 100644
--- a/brouter-util/pom.xml
+++ b/brouter-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.btools</groupId>
         <artifactId>brouter</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-util</artifactId>
diff --git a/pom.xml b/pom.xml
index 6edacb0..2bbacdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.btools</groupId>
     <artifactId>brouter</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>pom</packaging>
     <url>http://brouter.de/brouter/</url>
     <name>brouter</name>
@@ -17,7 +17,7 @@
         <module>brouter-mapaccess</module>
         <module>brouter-core</module>
         <module>brouter-map-creator</module>
-        <module>brouter-mem-router</module>
+        <!-- <module>brouter-mem-router</module> -->
         <module>brouter-server</module>
         <module>brouter-routing-app</module>
     </modules>