From d6e125b60b5eefb062ab5cc42398f2dcef131a7c Mon Sep 17 00:00:00 2001
From: Arndt <Arndt.Brenschede@web.de>
Date: Fri, 6 May 2016 09:17:41 +0200
Subject: [PATCH] 1.4 preparation

---
 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                               | 8 ++++----
 .../src/main/java/btools/routingapp/BRouterView.java      | 2 +-
 brouter-server/pom.xml                                    | 2 +-
 brouter-server/src/main/java/btools/server/BRouter.java   | 2 +-
 .../src/main/java/btools/server/RouteServer.java          | 2 +-
 brouter-util/pom.xml                                      | 2 +-
 pom.xml                                                   | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml
index 1999496..6c3f1af 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.3.2</version>
+        <version>1.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-codec</artifactId>
diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml
index 24a79ce..e1f0c9e 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.3.2</version>
+        <version>1.4</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 fed48ca..63da30e 100644
--- a/brouter-core/src/main/java/btools/router/OsmTrack.java
+++ b/brouter-core/src/main/java/btools/router/OsmTrack.java
@@ -338,7 +338,7 @@ public final class OsmTrack
     }
     else
     {
-      sb.append( " creator=\"BRouter-1.3.2\" version=\"1.1\">\n" );
+      sb.append( " creator=\"BRouter-1.4\" version=\"1.1\">\n" );
     }
 
     if ( turnInstructionMode == 3) // osmand style
diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml
index bd3a64a..2f0d6ca 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.3.2</version>
+        <version>1.4</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 7e35583..4bbd214 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.3.2</version>
+        <version>1.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-map-creator</artifactId>
diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml
index 0c9705c..c8bb7ff 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.3.2</version>
+        <version>1.4</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 3733d3c..6bfa20d 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.3.2</version>
+        <version>1.4</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 f933813..f9b1499 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="9"
-      android:versionName="1.3.2" package="btools.routingapp">
+      android:versionCode="11"
+      android:versionName="1.4" 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 ae9af25..f2ba0f1 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.3.2</version>
+        <version>1.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-routing-app</artifactId>
@@ -60,9 +60,9 @@
                             <include>${project.build.directory}/${project.artifactId}.apk</include>
                         </includes>
                         <keystore>\sign\mystore</keystore>
-                        <alias>myalias</alias>
-                        <storepass>mypasswd</storepass>
-                        <keypass>mypasswd</keypass>
+                        <alias>abrensch</alias>
+                        <storepass>peru1511</storepass>
+                        <keypass>peru1511</keypass>
                         <verbose>true</verbose>
                     </configuration>
                 </execution>
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 0b23feb..b159218 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.3.2\n" + "distance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend()
+          String result = "version = BRouter-1.4\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 df34774..e79609f 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.3.2</version>
+        <version>1.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-server</artifactId>
diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java
index 4f01beb..851396e 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.3.2 / 31102015 / abrensch");
+    System.out.println("BRouter 1.4 / 06052016 / 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 ae6b72a..cae00d0 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.3.2 / 31102015");
+        System.out.println("BRouter 1.4 / 06052016");
         if ( args.length != 5 )
         {
           System.out.println("serve BRouter protocol");
diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml
index 6320159..a4f40b6 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.3.2</version>
+        <version>1.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brouter-util</artifactId>
diff --git a/pom.xml b/pom.xml
index dd63d70..1116f1d 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.3.2</version>
+    <version>1.4</version>
     <packaging>pom</packaging>
     <url>http://brouter.de/brouter/</url>
     <name>brouter</name>