mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-01-19 14:44:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set version 0.6.1. Add versions for seed and statistics nodes

Browse Source
This commit is contained in:
Manfred Karrer 2017-11-24 14:23:49 -05:00
parent 79bd1d5e6c
commit 07d85b3f8b
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
23 changed files with 90 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bisq/common/app/Version.java
View File

@ -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.6.0";
public static final String VERSION = "0.6.1";
public static int getMajorVersion(String version) {
return getSubVersion(version, 0);

2
consensus/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
core/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<artifactId>core</artifactId>

2
gui/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
package/linux/32bitBuild.sh
View File

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.6.0
version=0.6.1
jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar"

2
package/linux/64bitBuild.sh
View File

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.6.0
version=0.6.1
jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar"

2
package/linux/Dockerfile
View File

@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
ENV version 0.6.0
ENV version 0.6.1
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
apt-get install -y vim fakeroot

2
package/osx/create_app.sh
View File

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e
version="0.6.0"
version="0.6.1"
mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true

2
package/osx/finalize.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
version="0.6.0"
version="0.6.1"
target_dir="/Users/dev/Documents/__bisq/_releases/$version"
src_dir="/Users/dev/Documents/intellij/exchange_bisq"

2
package/win/32bitBuild.bat
View File

@ -5,7 +5,7 @@
:: 32 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
SET version=0.6.0
SET version=0.6.1
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows_32bit

2
package/win/64bitBuild.bat
View File

@ -5,7 +5,7 @@
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
SET version=0.6.0
SET version=0.6.1
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows

2
package/win/Bisq.iss
View File

@ -3,7 +3,7 @@
[Setup]
AppId={{bisq}}
AppName=Bisq
AppVersion=0.6.0
AppVersion=0.6.1
AppVerName=Bisq
AppPublisher=Bisq
AppComments=Bisq

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>io.bisq</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>0.6.0</version>
<version>0.6.1</version>
<description>Bisq - The decentralized exchange network</description>
<url>https://bisq.io</url>

2
provider/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

1
provider/src/main/java/io/bisq/provider/ProviderVersion.java
View File

@ -18,5 +18,6 @@
package io.bisq.provider;
public class ProviderVersion {
// Bisq v0.6.1 did not change anything relevant for that project so we stick with 0.6.0
public static final String VERSION = "0.6.0";
}

2
seednode/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

15
seednode/src/main/java/io/bisq/seednode/SeedNode.java
View File

@ -9,6 +9,7 @@ import io.bisq.common.CommonOptionKeys;
import io.bisq.common.UserThread;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Log;
import io.bisq.common.app.Version;
import io.bisq.common.crypto.LimitedKeyStrengthException;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.locale.CurrencyUtil;
@ -49,10 +50,20 @@ public class SeedNode {
public SeedNode() {
String logPath = Paths.get(bisqEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bisq").toString();
Log.setup(logPath);
log.info("Log files under: {}.log", logPath);
Utilities.printSysInfo();
Log.setLevel(Level.toLevel(bisqEnvironment.getRequiredProperty(CommonOptionKeys.LOG_LEVEL_KEY)));
log.info("Log files under: " + logPath);
log.info("ProviderVersion.VERSION: " + SeedNodeVersion.VERSION);
log.info("Bisq exchange Version{" +
"VERSION=" + Version.VERSION +
", P2P_NETWORK_VERSION=" + Version.P2P_NETWORK_VERSION +
", LOCAL_DB_VERSION=" + Version.LOCAL_DB_VERSION +
", TRADE_PROTOCOL_VERSION=" + Version.TRADE_PROTOCOL_VERSION +
", BASE_CURRENCY_NETWORK=NOT SET" +
", getP2PNetworkId()=NOT SET" +
'}');
Utilities.printSysInfo();
// setup UncaughtExceptionHandler
Thread.UncaughtExceptionHandler handler = (thread, throwable) -> {
// Might come from another thread

23
seednode/src/main/java/io/bisq/seednode/SeedNodeVersion.java Normal file
View File

@ -0,0 +1,23 @@
/*
* This file is part of bisq.
*
* bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.seednode;
public class SeedNodeVersion {
// Bisq v0.6.1 did not change anything relevant for that project so we stick with 0.6.0
public static final String VERSION = "0.6.0";
}

2
statistics/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.6.0</version>
<version>0.6.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

14
statistics/src/main/java/io/bisq/statistics/Statistics.java
View File

@ -7,6 +7,7 @@ import io.bisq.common.CommonOptionKeys;
import io.bisq.common.UserThread;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Log;
import io.bisq.common.app.Version;
import io.bisq.common.crypto.LimitedKeyStrengthException;
import io.bisq.common.handlers.ResultHandler;
import io.bisq.common.locale.CurrencyUtil;
@ -57,9 +58,18 @@ public class Statistics {
public Statistics() {
String logPath = Paths.get(bisqEnvironment.getProperty(AppOptionKeys.APP_DATA_DIR_KEY), "bisq").toString();
Log.setup(logPath);
log.info("Log files under: " + logPath);
Utilities.printSysInfo();
Log.setLevel(Level.toLevel(bisqEnvironment.getRequiredProperty(CommonOptionKeys.LOG_LEVEL_KEY)));
log.info("Log files under: " + logPath);
log.info("ProviderVersion.VERSION: " + StatisticsVersion.VERSION);
log.info("Bisq exchange Version{" +
"VERSION=" + Version.VERSION +
", P2P_NETWORK_VERSION=" + Version.P2P_NETWORK_VERSION +
", LOCAL_DB_VERSION=" + Version.LOCAL_DB_VERSION +
", TRADE_PROTOCOL_VERSION=" + Version.TRADE_PROTOCOL_VERSION +
", BASE_CURRENCY_NETWORK=NOT SET" +
", getP2PNetworkId()=NOT SET" +
'}');
Utilities.printSysInfo();
// setup UncaughtExceptionHandler
Thread.UncaughtExceptionHandler handler = (thread, throwable) -> {

23
statistics/src/main/java/io/bisq/statistics/StatisticsVersion.java Normal file
View File

@ -0,0 +1,23 @@
/*
* This file is part of bisq.
*
* bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.statistics;
public class StatisticsVersion {
// Bisq v0.6.1 did not change anything relevant for that project so we stick with 0.6.0
public static final String VERSION = "0.6.0";
}