From 333d0bf789251b45a9798dcf66bc889a8d3d9b52 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 8 Apr 2016 22:53:38 +0200 Subject: [PATCH] Version 0.4.0 --- common/pom.xml | 2 +- common/src/main/java/io/bitsquare/app/Version.java | 6 +++--- 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_app.sh | 2 +- package/mac/create_app.sh | 2 +- package/windows/Bitsquare.iss | 2 +- package/windows/create_32bit_app.bat | 6 +++--- package/windows/create_app.bat | 6 +++--- pom.xml | 2 +- seednode/pom.xml | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 22cdea2174..bd38bfaa84 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 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 f67b945939..3b1cf71851 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -24,19 +24,19 @@ public class Version { private static final Logger log = LoggerFactory.getLogger(Version.class); // The application versions - public static final String VERSION = "0.3.7"; + public static final String VERSION = "0.4.0"; // 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. // VERSION = 0.3.4 -> P2P_NETWORK_VERSION = 1 // VERSION = 0.3.5 -> P2P_NETWORK_VERSION = 2 - // VERSION = 0.3.7 -> P2P_NETWORK_VERSION = 3 + // VERSION = 0.4.0 -> P2P_NETWORK_VERSION = 3 public static final int P2P_NETWORK_VERSION = 3; // The version nr. of the serialized data stored to disc. A change will break the serialization of old objects. // VERSION = 0.3.4 -> LOCAL_DB_VERSION = 1 // VERSION = 0.3.5 -> LOCAL_DB_VERSION = 2 - // VERSION = 0.3.7 -> LOCAL_DB_VERSION = 3 + // VERSION = 0.4.0 -> LOCAL_DB_VERSION = 3 public static final int LOCAL_DB_VERSION = 3; // The version nr. of the current protocol. The offer holds that version. diff --git a/core/pom.xml b/core/pom.xml index fc0f3c59a1..ccc31f8ed9 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 core diff --git a/gui/pom.xml b/gui/pom.xml index 891e42fd6d..b48fe9b63b 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index 0bd900e325..1f5af3bea3 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index e2108870ae..5a07fb350d 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index e4d27f617e..f89bb1e687 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 31169ae236..ed40fcf417 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0 diff --git a/package/linux/create_32bit_app.sh b/package/linux/create_32bit_app.sh index 3e8b232663..c7a29680fd 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.3.7 +fullVersion=0.4.0 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_app.sh b/package/linux/create_app.sh index 40116884dd..8df5b87b50 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.3.7 +fullVersion=0.4.0 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 ee7b1a58da..1a18559aa3 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.3.7" +fullVersion="0.4.0" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index 9ec5a02937..514782a70c 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.3.7 +AppVersion=0.4.0 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_32bit_app.bat b/package/windows/create_32bit_app.bat index 5ab71bd146..f8e4a5f642 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.3.7 +:: edit iss file -> AppVersion=0.4.0 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.3.7 and -srcfiles +:: edit -> -BappVersion=0.4.0 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_77\bin\javapackager.exe" -deploy -BappVersion=0.3.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.3.7.jar" -outfile Bitsquare-32bit -Bruntime="C:\Program Files\Java\jdk1.8.0_77\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_77\bin\javapackager.exe" -deploy -BappVersion=0.4.0 -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.0.jar" -outfile Bitsquare-32bit -Bruntime="C:\Program Files\Java\jdk1.8.0_77\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index f3a8601102..7c68ff8ade 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -1,13 +1,13 @@ cd ..\..\ mkdir gui\deploy -:: edit iss file -> AppVersion=0.3.7 +:: edit iss file -> AppVersion=0.4.0 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.3.7 and -srcfiles +:: edit -> -BappVersion=0.4.0 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_66\bin\javapackager.exe" -deploy -BappVersion=0.3.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.3.7.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true +call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.4.0 -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.0.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index e59209f021..56bf23d43c 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.7-SNAPSHOT + 0.4.0 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index febcfd916c..51b04aa103 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.7-SNAPSHOT + 0.4.0 4.0.0