From a9de00f34bd52c4ff0bdfb58c4eee71a89f15997 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 25 May 2016 15:56:05 +0200 Subject: [PATCH] v0.4.7 --- 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/create_app.sh | 2 +- package/mac/finalize.sh | 2 +- 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, 21 insertions(+), 21 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 09bca2d0f8..76307dbcba 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 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 2eeb8aa43a..810fa50c34 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.6"; + public static final String VERSION = "0.4.7"; // 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 ec0db52f84..1552e44591 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 core diff --git a/gui/pom.xml b/gui/pom.xml index 36588d1447..96f85ff124 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index c9e233d81d..732de18425 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 1fbeec821f..b6bfc5068f 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 01181f00cb..90b902b647 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index e300254188..eeeceaae38 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0 diff --git a/package/linux/create_32bit_app.sh b/package/linux/create_32bit_app.sh index a7b279e22d..534aeb3a33 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.6 +fullVersion=0.4.7 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 3ce337df34..b471e6014d 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.6 +fullVersion=0.4.7 jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" # Note: fakeroot needs to be installed on linux diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index b75a40b79d..56eaadb5eb 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.6" +fullVersion="0.4.7" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/mac/finalize.sh b/package/mac/finalize.sh index fa2109f77d..cca273e277 100644 --- a/package/mac/finalize.sh +++ b/package/mac/finalize.sh @@ -1,6 +1,6 @@ #!/bin/bash -version="0.4.6" +version="0.4.7" target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index f61378d0d3..3341ac20a8 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.4.6 +AppVersion=0.4.7 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_32bit_app.bat b/package/windows/create_32bit_app.bat index 8e02a77e34..545c67cd0c 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.6 +:: edit iss file -> AppVersion :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.6 and -srcfiles +:: edit -> -BappVersion 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.6 -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.6.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.7 -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.7.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 2995a21048..c32e02a632 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.6 +:: edit iss file -> AppVersion :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.4.6 and -srcfiles +:: edit -> -BappVersion 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.6 -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.6.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.7 -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.7.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 8271d47394..23ad10d6cc 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.4.6 + 0.4.7 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index ec4a5cf65a..cd9a1573ae 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.6 + 0.4.7 4.0.0