From 30f7ca69f85fc215873b32d6bddbd9f98d99439e Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 9 Feb 2016 01:46:53 +0100 Subject: [PATCH] Start v0.3.5-SNAPSHOT --- 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_app.sh | 2 +- package/mac/create_app.sh | 2 +- package/windows/Bitsquare.iss | 2 +- package/windows/create_app.bat | 6 +++--- pom.xml | 2 +- seednode/pom.xml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 247371afaf..29edb2ea41 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 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 c8f83f6ed2..3e13dc8ad7 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.3.4"; + public static final String VERSION = "0.3.5"; // 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 3fc718c82d..61121b2e2f 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT core diff --git a/gui/pom.xml b/gui/pom.xml index ddef5cf526..2020a2b42c 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index e0eb5bc401..2a95fc5164 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 61f9b2269f..3ba855c31e 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 787b9a3117..2a9f54be94 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index f4121abc1f..d735db7b5c 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0 diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index eedb6e8d0f..dae584c26d 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.4 +fullVersion=0.3.5 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 f348bc5c3b..5583678de7 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.4" +fullVersion="0.3.5" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index e43d3f65a3..21a5de20bc 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.3.4 +AppVersion=0.3.5 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index a5f82e3e51..54bf1d06ac 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.4 +:: edit iss file -> AppVersion=0.3.5 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows -:: edit -> -BappVersion=0.3.4 and -srcfiles +:: edit -> -BappVersion=0.3.5 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.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.3.4.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.3.5 -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.5.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 e8f68a196c..59d9e18e4a 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.4 + 0.3.5-SNAPSHOT Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index 8460623522..a98bd1a12d 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.4 + 0.3.5-SNAPSHOT 4.0.0