diff --git a/common/pom.xml b/common/pom.xml index 5e2c8619b0..066c24a23e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 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 4adb79695c..0de3cc0cd7 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.9.5"; + public static final String VERSION = "0.4.9.6"; // 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 45dbafb6f3..905f127e13 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 core diff --git a/doc/build.md b/doc/build.md index e04ec0bad0..0034ad4cb7 100644 --- a/doc/build.md +++ b/doc/build.md @@ -73,11 +73,11 @@ You need to get the Bitsquare dependencies first as we need to copy the BountyCa ### 4. Copy the jdkfix jar file -Copy the jdkfix-0.4.9.5.jar from the Bitsquare jdkfix/target directory to $JAVA_HOME/jre/lib/ext/. -jdkfix-0.4.9.5.jar includes a bugfix of the SortedList class which will be released with the next JDK version. +Copy the jdkfix-0.4.9.6.jar from the Bitsquare jdkfix/target directory to $JAVA_HOME/jre/lib/ext/. +jdkfix-0.4.9.6.jar includes a bugfix of the SortedList class which will be released with the next JDK version. We need to load that class before the default java class. This step will be removed once the bugfix is in the official JDK. - $ sudo cp bitsquare/jdkfix/target/jdkfix-0.4.9.5.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.5.jar + $ sudo cp bitsquare/jdkfix/target/jdkfix-0.4.9.6.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.6.jar ### 5. Copy the BountyCastle provider jar file diff --git a/doc/install_on_unix.sh b/doc/install_on_unix.sh index 5c8b696c6e..bab0557813 100755 --- a/doc/install_on_unix.sh +++ b/doc/install_on_unix.sh @@ -36,7 +36,7 @@ cd bitsquare mvn clean package -DskipTests -Dmaven.javadoc.skip=true echo "Copy the jdkfix jar file" -cp bitsquare/jdkfix/target/jdkfix-0.4.9.5.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.5.jar +cp bitsquare/jdkfix/target/jdkfix-0.4.9.6.jar $JAVA_HOME/jre/lib/ext/jdkfix-0.4.9.6.jar echo "Add BountyCastle.jar" cd ~ diff --git a/gui/pom.xml b/gui/pom.xml index 7447db6326..ce6db9c02a 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/headless/pom.xml b/headless/pom.xml index 991dca486c..4ccc9fd52f 100644 --- a/headless/pom.xml +++ b/headless/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/jdkfix/pom.xml b/jdkfix/pom.xml index 600d3fcd61..bd1c257124 100644 --- a/jdkfix/pom.xml +++ b/jdkfix/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/jsocks/pom.xml b/jsocks/pom.xml index b72468037f..0b7564ccde 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 97a8c094c9..22c7450cdc 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 899b770b9e..a2b699a7c6 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/monitor/pom.xml b/monitor/pom.xml index 2d8f360757..2c3d931e6a 100644 --- a/monitor/pom.xml +++ b/monitor/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 20f282b3d9..018dfe5b92 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index 513be64ac8..ace62b50e9 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.4.9.5 +version=0.4.9.6 jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bitsquare-$version.jar" jdkfixFile="/media/sf_vm_shared_ubuntu14_32bit/jdkfix-$version.jar" diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index a4be033a69..46073465a7 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.4.9.5 +version=0.4.9.6 jarFile="/media/sf_vm_shared_ubuntu/Bitsquare-$version.jar" jdkfixFile="/media/sf_vm_shared_ubuntu/jdkfix-$version.jar" diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index e66cd85ac4..0047c44e4f 100755 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -5,7 +5,7 @@ mkdir -p gui/deploy set -e -version="0.4.9.5" +version="0.4.9.6" mvn clean package -DskipTests -Dmaven.javadoc.skip=true diff --git a/package/mac/finalize.sh b/package/mac/finalize.sh index 2b3edc20cc..33addbf73f 100644 --- a/package/mac/finalize.sh +++ b/package/mac/finalize.sh @@ -1,6 +1,6 @@ #!/bin/bash -version="0.4.9.5" +version="0.4.9.6" target_dir="/Users/mk/Documents/__bitsquare/_releases/$version" src_dir="/Users/mk/Documents/_intellij/bitsquare" diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat index 6bd3136ab3..4a2d00f5db 100644 --- a/package/windows/32bitBuild.bat +++ b/package/windows/32bitBuild.bat @@ -6,7 +6,7 @@ :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.4.9.5 +SET version=0.4.9.6 SET jdk=C:\Program Files\Java\jdk1.8.0_92 SET outdir=\\VBOXSVR\vm_shared_windows_32bit diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat index 663434b5d2..22c5ab1c61 100644 --- a/package/windows/64bitBuild.bat +++ b/package/windows/64bitBuild.bat @@ -8,7 +8,7 @@ :: Did not get -BjvmOptions=-Xbootclasspath working on windows, but if the jdkfix jar is copied into the jdk/jre dir it will override the default classes -SET version=0.4.9.5 +SET version=0.4.9.6 SET jdk=C:\Program Files\Java\jdk1.8.0_92 SET outdir=\\VBOXSVR\vm_shared_windows diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index 96da37f32f..a682222a52 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.4.9.5 +AppVersion=0.4.9.6 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/pom.xml b/pom.xml index 1f99d1e3aa..c13608b8e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.4.9.5 + 0.4.9.6 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index dfd1642fc3..911001aaeb 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0 diff --git a/statistics/pom.xml b/statistics/pom.xml index 0f7265d23f..f701e36c7b 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.4.9.5 + 0.4.9.6 4.0.0