From 677d7dc4775f6ed579fb7575705c28d74e4b0ab7 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 8 Nov 2017 11:11:51 -0500 Subject: [PATCH] Set v0.6.0 --- common/pom.xml | 2 +- common/src/main/java/io/bisq/common/app/Version.java | 2 +- consensus/pom.xml | 4 ++-- core/pom.xml | 2 +- gui/pom.xml | 2 +- network/pom.xml | 2 +- package/linux/32bitBuild.sh | 6 +++--- package/linux/64bitBuild.sh | 6 +++--- package/linux/Dockerfile | 4 ++-- package/osx/create_app.sh | 10 +++++----- package/osx/finalize.sh | 6 +++--- package/win/32bitBuild.bat | 6 +++--- package/win/64bitBuild.bat | 6 +++--- package/win/Bisq.iss | 2 +- pom.xml | 4 ++-- provider/pom.xml | 4 ++-- seednode/pom.xml | 4 ++-- statistics/pom.xml | 4 ++-- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 26839fd659..f7af4fa549 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 diff --git a/common/src/main/java/io/bisq/common/app/Version.java b/common/src/main/java/io/bisq/common/app/Version.java index cbf241864a..8158a55df6 100644 --- a/common/src/main/java/io/bisq/common/app/Version.java +++ b/common/src/main/java/io/bisq/common/app/Version.java @@ -29,7 +29,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 = "0.5.3"; + public static final String VERSION = "0.6.0"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/consensus/pom.xml b/consensus/pom.xml index 161b6fa6e5..c85e3319df 100644 --- a/consensus/pom.xml +++ b/consensus/pom.xml @@ -5,11 +5,11 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 consensus - \ No newline at end of file + diff --git a/core/pom.xml b/core/pom.xml index 32831f24aa..1a22ca8a8e 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bisq - 0.5.3 + 0.6.0 core diff --git a/gui/pom.xml b/gui/pom.xml index 3b2c19655a..5fd0a01c40 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 740d6f97c3..89ebccc0b5 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index e3122a1208..e9960dfec2 100644 --- a/package/linux/32bitBuild.sh +++ b/package/linux/32bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit version -version=0.5.3 +version=0.6.0 jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar" @@ -29,8 +29,8 @@ $JAVA_HOME/bin/javapackager \ -appclass io.bisq.gui.app.BisqAppMain \ -BjvmOptions=-Xss1280k \ -outfile Bisq - -# when we have support for security manager we use that + +# when we have support for security manager we use that # \ # -BjvmOptions=-Djava.security.manager \ # -BjvmOptions=-Djava.security.debug=failure \ diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index 653fb55f8a..4f5fcee8b4 100644 --- a/package/linux/64bitBuild.sh +++ b/package/linux/64bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p gui/deploy set -e # Edit version -version=0.5.3 +version=0.6.0 jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar" @@ -29,8 +29,8 @@ $JAVA_HOME/bin/javapackager \ -appclass io.bisq.gui.app.BisqAppMain \ -BjvmOptions=-Xss1280k \ -outfile Bisq - -# when we have support for security manager we use that + +# when we have support for security manager we use that # \ # -BjvmOptions=-Djava.security.manager \ # -BjvmOptions=-Djava.security.debug=failure \ diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index 957146004a..0c34ffd145 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 0.5.3 +ENV version 0.6.0 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot @@ -17,4 +17,4 @@ apt-get install -y vim fakeroot COPY 64bitBuild.sh /root COPY bisq-$version.jar /root # cd to the Dex directory and execute the jar. -#CMD cd ~/Dex && java -jar Dex.jar \ No newline at end of file +#CMD cd ~/Dex && java -jar Dex.jar diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index a3dd049259..bfebfd2095 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -5,7 +5,7 @@ mkdir -p gui/deploy set -e -version="0.5.3" +version="0.6.0" mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true @@ -32,10 +32,10 @@ $JAVA_HOME/bin/javapackager \ -srcfiles "gui/deploy/Bisq-$version.jar" \ -appclass io.bisq.gui.app.BisqAppMain \ -outfile Bisq - - + + # TODO lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar not included in build -# when we have support for security manager we use that +# when we have support for security manager we use that # \ # -BjvmOptions=-Djava.security.manager \ # -BjvmOptions=-Djava.security.debug=failure \ @@ -48,4 +48,4 @@ rm "gui/deploy/Bisq.jnlp" mv "gui/deploy/bundles/Bisq-$version.dmg" "gui/deploy/Bisq-$version.dmg" rm -r "gui/deploy/bundles" -cd package/osx \ No newline at end of file +cd package/osx diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh index 1921171e75..5b2d69a07f 100644 --- a/package/osx/finalize.sh +++ b/package/osx/finalize.sh @@ -1,6 +1,6 @@ #!/bin/bash -version="0.5.3" +version="0.6.0" target_dir="/Users/dev/Documents/__bisq/_releases/$version" src_dir="/Users/dev/Documents/intellij/bisq" @@ -26,13 +26,13 @@ deb32="Bisq-32bit-$version.deb" cp "/Users/dev/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/" deb64="Bisq-64bit-$version.deb" -cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/" +cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/" #rpm32="Bisq-32bit-$version.rpm" #cp "/Users/dev/vm_shared_ubuntu14_32bit/$rpm32" "$target_dir/" #rpm64="Bisq-64bit-$version.rpm" -#cp "/Users/dev/vm_shared_ubuntu/$rpm64" "$target_dir/" +#cp "/Users/dev/vm_shared_ubuntu/$rpm64" "$target_dir/" exe="Bisq-$version.exe" diff --git a/package/win/32bitBuild.bat b/package/win/32bitBuild.bat index f5a187f8ec..efa05e0b54 100644 --- a/package/win/32bitBuild.bat +++ b/package/win/32bitBuild.bat @@ -5,7 +5,7 @@ :: 32 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.5.3 +SET version=0.6.0 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows_32bit @@ -23,8 +23,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^ -srcfiles %outdir%\Bisq.jar ^ -outfile Bisq ^ -Bruntime="%JAVA_HOME%\jre" - -:: when we have support for security manager we use that + +:: when we have support for security manager we use that :: -BjvmOptions=-Djava.security.manager ^ :: -BjvmOptions=-Djava.security.debug=failure ^ :: -BjvmOptions=-Djava.security.policy=file:bisq.policy ^ diff --git a/package/win/64bitBuild.bat b/package/win/64bitBuild.bat index 47535ac0fc..fc34be6a39 100644 --- a/package/win/64bitBuild.bat +++ b/package/win/64bitBuild.bat @@ -5,7 +5,7 @@ :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.5.3 +SET version=0.6.0 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows @@ -23,8 +23,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^ -srcfiles %outdir%\Bisq.jar ^ -outfile Bisq ^ -Bruntime="%JAVA_HOME%\jre" - -:: when we have support for security manager we use that + +:: when we have support for security manager we use that :: -BjvmOptions=-Djava.security.manager ^ :: -BjvmOptions=-Djava.security.debug=failure ^ :: -BjvmOptions=-Djava.security.policy=file:bisq.policy ^ diff --git a/package/win/Bisq.iss b/package/win/Bisq.iss index 8f9dff0561..45cbcc0d1e 100755 --- a/package/win/Bisq.iss +++ b/package/win/Bisq.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bisq}} AppName=Bisq -AppVersion=0.5.3 +AppVersion=0.6.0 AppVerName=Bisq AppPublisher=Bisq AppComments=Bisq diff --git a/pom.xml b/pom.xml index e7f7469df5..fc7601ddb8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bisq parent pom - 0.5.3 + 0.6.0 Bisq - The decentralized exchange network https://bisq.io @@ -64,7 +64,7 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.5.3 + 0.6.0 /usr/local/bin/protoc diff --git a/provider/pom.xml b/provider/pom.xml index 96b01af881..0ef9597154 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -22,7 +22,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 @@ -150,4 +150,4 @@ 2.5.2 - \ No newline at end of file + diff --git a/seednode/pom.xml b/seednode/pom.xml index 82af1c578b..767a68bfa4 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -22,7 +22,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 @@ -144,4 +144,4 @@ ${project.version} - \ No newline at end of file + diff --git a/statistics/pom.xml b/statistics/pom.xml index 448feb74ce..b80f3b5c93 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -22,7 +22,7 @@ parent io.bisq - 0.5.3 + 0.6.0 4.0.0 @@ -143,4 +143,4 @@ ${project.version} - \ No newline at end of file +