Merge pull request #5036 from bisq-network/hotfix/v1.5.4

Merge v1.5.4 hotfix
bisq-network · Jan 3, 2021 · 0004ded · 0004ded
2 parents df5baaf + 0f77562
commit 0004ded
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.3-SNAPSHOT'
+    version = '1.5.4-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
@@ -30,7 +30,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.5.3";
+    public static final String VERSION = "1.5.4";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.

diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile
@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.5.3-SNAPSHOT
+ENV version 1.5.4-SNAPSHOT
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh
@@ -6,7 +6,7 @@
 #   - Update version below
 #   - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
 
-version=1.5.3-SNAPSHOT
+version=1.5.4-SNAPSHOT
 version_base=$(echo $version | awk -F'[_-]' '{print $1}')
 if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
 	if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then

diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh
@@ -4,7 +4,7 @@
 # Prior to running this script:
 #   - Update version below
 
-version=1.5.3-SNAPSHOT
+version=1.5.4-SNAPSHOT
 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
 package_dir=$base_dir/desktop/package
 release_dir=$base_dir/desktop/release/$version

diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist
@@ -5,10 +5,10 @@
         <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
 
         <key>CFBundleVersion</key>
-        <string>1.5.3</string>
+        <string>1.5.4</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>1.5.3</string>
+        <string>1.5.4</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>

diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh
@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="1.5.3-SNAPSHOT"
+version="1.5.4-SNAPSHOT"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar

diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.5.3-SNAPSHOT"
+version="1.5.4-SNAPSHOT"
 
 target_dir="releases/$version"
 

diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.5.3
+version=1.5.4
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-cd $(dirname $0)/../../../
+cd $(dirname $0)/../../../.
 
-oldVersion=1.5.2
-newVersion=1.5.3
+oldVersion=1.5.3
+newVersion=1.5.4
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat
@@ -11,7 +11,7 @@
 
 @echo off
 
-set version=1.5.3-SNAPSHOT
+set version=1.5.4-SNAPSHOT
 if not exist "%JAVA_HOME%\bin\javapackager.exe" (
     if not exist "%ProgramFiles%\Java\jdk-10.0.2" (
         echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.

diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat
@@ -6,7 +6,7 @@
 
 @echo off
 
-set version=1.5.3-SNAPSHOT
+set version=1.5.4-SNAPSHOT
 set release_dir=%~dp0..\..\..\releases\%version%
 set package_dir=%~dp0..
 

diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt
@@ -1 +1 @@
-1.5.3-SNAPSHOT
+1.5.4-SNAPSHOT
diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java
@@ -41,7 +41,7 @@
 @Slf4j
 public class SeedNodeMain extends ExecutableForAppWithP2p {
     private static final long CHECK_CONNECTION_LOSS_SEC = 30;
-    private static final String VERSION = "1.5.3";
+    private static final String VERSION = "1.5.4";
     private SeedNode seedNode;
     private Timer checkConnectionLossTime;