From 4e0942818012c91e3c199c8fd1f1e0e6f13f7fb5 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 26 Apr 2016 17:29:11 +0200 Subject: [PATCH] Beta version 0.4.4 --- common/pom.xml | 2 +- common/src/main/java/io/bitsquare/app/Version.java | 2 +- core/pom.xml | 2 +- gui/pom.xml | 2 +- jsocks/pom.xml | 2 +- jtorctl/pom.xml | 2 +- jtorproxy/pom.xml | 2 +- network/pom.xml | 2 +- package/linux/create_32bit_app.sh | 2 +- package/linux/create_64bit_app.sh | 2 +- package/mac/collect_files.sh | 6 +++--- package/mac/create_app.sh | 4 ++-- package/windows/Bitsquare.iss | 2 +- package/windows/create_32bit_app.bat | 6 +++--- package/windows/create_64bit_app.bat | 6 +++--- pom.xml | 2 +- seednode/pom.xml | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 83d1dc6201..9fab13d4ad 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java index 3e6bdf4dfb..044c43ee54 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -24,7 +24,7 @@ public class Version { private static final Logger log = LoggerFactory.getLogger(Version.class); // The application versions - public static final String VERSION = "0.4.3"; + public static final String VERSION = "0.4.4"; // The version nr. for the objects sent over the network. A change will break the serialization of old objects. // If objects are used for both network and database the network version is applied. diff --git a/core/pom.xml b/core/pom.xml index 6ce292acb6..8aa30bf22f 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 core diff --git a/gui/pom.xml b/gui/pom.xml index 74df9d3137..a8df94bef4 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index 5c4a44825d..e26a610741 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 3133256d94..91f94d64e1 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 4f108e79c0..7c85388a13 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 8bb4a3d381..71aaaabc22 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0 diff --git a/package/linux/create_32bit_app.sh b/package/linux/create_32bit_app.sh index d0455db527..1c89f6b6d5 100644 --- a/package/linux/create_32bit_app.sh +++ b/package/linux/create_32bit_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.4.3 +fullVersion=0.4.4 jarFile="/home/bitsquare/Desktop/sf_vm_shared_ubuntu14_32bit/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/linux/create_64bit_app.sh b/package/linux/create_64bit_app.sh index 68e166db58..42715fbceb 100644 --- a/package/linux/create_64bit_app.sh +++ b/package/linux/create_64bit_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.4.3 +fullVersion=0.4.4 jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/mac/collect_files.sh b/package/mac/collect_files.sh index ab0369dca6..24a043028c 100644 --- a/package/mac/collect_files.sh +++ b/package/mac/collect_files.sh @@ -1,11 +1,11 @@ #!/bin/bash -version="0.4.3" +version="0.4.4" target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" -cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/bundles/Bitsquare-0.4.3.dmg" "$target_dir/Bitsquare-0.4.3.dmg " -cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-0.4.3.jar" "$target_dir/SeedNode-0.4.3.jar" +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/bundles/Bitsquare-0.4.4.dmg" "$target_dir/Bitsquare-0.4.4.dmg " +cp "/Users/mk/Documents/_intellij/bitsquare/gui/deploy/SeedNode-0.4.4.jar" "$target_dir/SeedNode-0.4.4.jar" linux32="Bitsquare-32bit-$version.deb" diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index 0265c41d2f..7a21f93354 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -5,7 +5,7 @@ mkdir -p gui/deploy set -e -fullVersion="0.4.3" +fullVersion="0.4.4" mvn clean package -DskipTests -Dmaven.javadoc.skip=true @@ -40,7 +40,7 @@ rm "gui/deploy/Bitsquare.jnlp" mv "gui/deploy/bundles/Bitsquare-$fullVersion.dmg" "gui/deploy/Bitsquare-$fullVersion.dmg" rm "gui/deploy/bundles" -mv "gui/deploy/SeedNode.jar" "gui/deploy/SeedNode-0.4.3.jar" +mv "gui/deploy/SeedNode.jar" "gui/deploy/SeedNode-0.4.4.jar" cd package/mac \ No newline at end of file diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index b3d3c58026..355a91ec02 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.4.3 +AppVersion=0.4.4 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_32bit_app.bat b/package/windows/create_32bit_app.bat index 12b9d9b619..9b324fe9e1 100644 --- a/package/windows/create_32bit_app.bat +++ b/package/windows/create_32bit_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.4.3 +:: edit iss file -> AppVersion=0.4.4 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.3 and -srcfiles +:: edit -> -BappVersion=0.4.4 and -srcfiles :: 32 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.4 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows_32bit" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows_32bit\Bitsquare-0.4.4.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/package/windows/create_64bit_app.bat b/package/windows/create_64bit_app.bat index 9b4d027d14..27065ca52c 100644 --- a/package/windows/create_64bit_app.bat +++ b/package/windows/create_64bit_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.4.3 +:: edit iss file -> AppVersion=0.4.4 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.3 and -srcfiles +:: edit -> -BappVersion=0.4.4 and -srcfiles :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_92\bin\javapackager.exe" -deploy -BappVersion=0.4.4 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.4.4.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_92\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c3687d21b..f9c37595fc 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.4.3 + 0.4.4 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index 45907dbd29..6ce3e5ee34 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.3 + 0.4.4 4.0.0