From 5b4a360b26b541d361baaf89fa86fee43469752d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 18 Nov 2015 17:32:02 +0100 Subject: [PATCH] RC version 0.3.1 --- common/pom.xml | 2 +- common/src/main/java/io/bitsquare/app/Log.java | 4 ++-- common/src/main/java/io/bitsquare/app/Version.java | 10 ++++++++++ core/pom.xml | 2 +- gui/pom.xml | 2 +- gui/src/main/java/io/bitsquare/app/BitsquareApp.java | 4 +++- gui/src/main/resources/logback.xml | 2 +- jsocks/pom.xml | 2 +- jtorctl/pom.xml | 2 +- jtorproxy/pom.xml | 2 +- network/pom.xml | 2 +- package/linux/create_app.sh | 4 ++-- package/mac/create_app.sh | 2 +- pom.xml | 2 +- seednode/pom.xml | 2 +- seednode/src/main/resources/logback.xml | 2 +- 16 files changed, 29 insertions(+), 17 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 0dfc01c0c1..e1f0a73254 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/common/src/main/java/io/bitsquare/app/Log.java b/common/src/main/java/io/bitsquare/app/Log.java index e2ef885561..bd29278ece 100644 --- a/common/src/main/java/io/bitsquare/app/Log.java +++ b/common/src/main/java/io/bitsquare/app/Log.java @@ -53,7 +53,7 @@ public class Log { PatternLayoutEncoder encoder = new PatternLayoutEncoder(); encoder.setContext(loggerContext); - encoder.setPattern("%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n)"); + encoder.setPattern("%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n"); encoder.start(); appender.setEncoder(encoder); @@ -62,7 +62,7 @@ public class Log { appender.start(); logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); - logbackLogger.setLevel(releaseVersion ? Level.INFO : Level.TRACE); + logbackLogger.setLevel(releaseVersion ? Level.DEBUG : Level.TRACE); logbackLogger.addAppender(appender); } diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java index c22f4d8bc7..f4ba0e66a2 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bitsquare/app/Version.java @@ -45,4 +45,14 @@ public class Version { // The version for the bitcoin network (Mainnet = 0, TestNet = 1, Regtest = 2) public static int NETWORK_ID; + public static void printVersion() { + log.info("Version{" + + "VERSION=" + VERSION + + ", NETWORK_PROTOCOL_VERSION=" + NETWORK_PROTOCOL_VERSION + + ", LOCAL_DB_VERSION=" + LOCAL_DB_VERSION + + ", PROTOCOL_VERSION=" + PROTOCOL_VERSION + + ", NETWORK_ID=" + NETWORK_ID + + '}'); + } + } diff --git a/core/pom.xml b/core/pom.xml index 227898bd0b..6c96f62926 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 core diff --git a/gui/pom.xml b/gui/pom.xml index 0326f6bdac..fc469da03d 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java index 3435643dca..d2cd75d03e 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -73,7 +73,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY; public class BitsquareApp extends Application { private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); - public static final boolean DEV_MODE = true; + public static final boolean DEV_MODE = false; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true; private static Environment env; @@ -102,6 +102,8 @@ public class BitsquareApp extends Application { Log.setup(logPath, IS_RELEASE_VERSION); log.info("Log files under: " + logPath); + Version.printVersion(); + UserThread.setExecutor(Platform::runLater); // setup UncaughtExceptionHandler diff --git a/gui/src/main/resources/logback.xml b/gui/src/main/resources/logback.xml index 4ce891478d..cc18b4ecc4 100644 --- a/gui/src/main/resources/logback.xml +++ b/gui/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - %highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n) + %highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n) diff --git a/jsocks/pom.xml b/jsocks/pom.xml index ab811aa608..f241ee69f9 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 26171321f3..d10e1ce5e7 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 470f01f413..b62df49954 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index 431057a09a..d08ca7e196 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index e4dc185c34..0a39eb4d1f 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -1,12 +1,12 @@ #!/bin/bash cd ../../ -mkdir gui/deploy +mkdir -p gui/deploy set -e # Edit versions -fullVersion=0.3.1 +fullVersion=0.3.2 # Copy jar file from mac build (1.jar from processed folder) to linux box # Note: fakeroot needs to be installed on linux diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh index 9e2974dd36..d2167e8c61 100644 --- a/package/mac/create_app.sh +++ b/package/mac/create_app.sh @@ -1,7 +1,7 @@ #!/bin/bash cd ../../ -mkdir gui/deploy +mkdir -p gui/deploy set -e diff --git a/pom.xml b/pom.xml index 90b5543bb7..0001f4cb6f 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.2-SNAPSHOT + 0.3.2.1 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index 431f9739a5..36e0ff18d7 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2-SNAPSHOT + 0.3.2.1 4.0.0 diff --git a/seednode/src/main/resources/logback.xml b/seednode/src/main/resources/logback.xml index 63a641558c..03f89f41f9 100644 --- a/seednode/src/main/resources/logback.xml +++ b/seednode/src/main/resources/logback.xml @@ -19,7 +19,7 @@ - %highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n) + %highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n)