mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-22 14:42:37 +01:00
Set v0.6.0
This commit is contained in:
parent
f74280b641
commit
677d7dc477
18 changed files with 38 additions and 38 deletions
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>consensus</artifactId>
|
||||
|
||||
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>core</artifactId>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
#CMD cd ~/Dex && java -jar Dex.jar
|
||||
|
|
|
@ -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 <Class-Path>lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar</Class-Path> 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
|
||||
cd package/osx
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 ^
|
||||
|
|
|
@ -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 ^
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
[Setup]
|
||||
AppId={{bisq}}
|
||||
AppName=Bisq
|
||||
AppVersion=0.5.3
|
||||
AppVersion=0.6.0
|
||||
AppVerName=Bisq
|
||||
AppPublisher=Bisq
|
||||
AppComments=Bisq
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -6,7 +6,7 @@
|
|||
<groupId>io.bisq</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
<description>Bisq - The decentralized exchange network</description>
|
||||
<url>https://bisq.io</url>
|
||||
|
||||
|
@ -64,7 +64,7 @@
|
|||
<plugin>
|
||||
<groupId>org.xolstice.maven.plugins</groupId>
|
||||
<artifactId>protobuf-maven-plugin</artifactId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
<configuration>
|
||||
<protocExecutable>/usr/local/bin/protoc</protocExecutable>
|
||||
</configuration>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -150,4 +150,4 @@
|
|||
<version>2.5.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -144,4 +144,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.5.3</version>
|
||||
<version>0.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -143,4 +143,4 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
Loading…
Add table
Reference in a new issue