Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-20 04:44:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

RC version 0.3.1

Browse source
This commit is contained in:
Manfred Karrer 2015-11-18 17:32:02 +01:00
parent b235beb56b
commit 5b4a360b26
16 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
common/src/main/java/io/bitsquare/app/Log.java
View file

@ -53,7 +53,7 @@ public class Log {
PatternLayoutEncoder encoder = new PatternLayoutEncoder(); PatternLayoutEncoder encoder = new PatternLayoutEncoder();
encoder.setContext(loggerContext); 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(); encoder.start();
appender.setEncoder(encoder); appender.setEncoder(encoder);
@ -62,7 +62,7 @@ public class Log {
appender.start(); appender.start();
logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); 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); logbackLogger.addAppender(appender);
} }

10
common/src/main/java/io/bitsquare/app/Version.java
View file

@ -45,4 +45,14 @@ public class Version {
// The version for the bitcoin network (Mainnet = 0, TestNet = 1, Regtest = 2) // The version for the bitcoin network (Mainnet = 0, TestNet = 1, Regtest = 2)
public static int NETWORK_ID; 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 +
'}');
}
} }

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -73,7 +73,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
public class BitsquareApp extends Application { public class BitsquareApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); 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; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
private static Environment env; private static Environment env;
@ -102,6 +102,8 @@ public class BitsquareApp extends Application {
Log.setup(logPath, IS_RELEASE_VERSION); Log.setup(logPath, IS_RELEASE_VERSION);
log.info("Log files under: " + logPath); log.info("Log files under: " + logPath);
Version.printVersion();
UserThread.setExecutor(Platform::runLater); UserThread.setExecutor(Platform::runLater);
// setup UncaughtExceptionHandler // setup UncaughtExceptionHandler

2
gui/src/main/resources/logback.xml
View file

@ -2,7 +2,7 @@
<configuration> <configuration>
<appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n)</pattern> <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n)</pattern>
</encoder> </encoder>
</appender> </appender>

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
package/linux/create_app.sh
View file

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
cd ../../ cd ../../
mkdir gui/deploy mkdir -p gui/deploy
set -e set -e
# Edit versions # Edit versions
fullVersion=0.3.1 fullVersion=0.3.2
# Copy jar file from mac build (1.jar from processed folder) to linux box # Copy jar file from mac build (1.jar from processed folder) to linux box
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux

2
package/mac/create_app.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
cd ../../ cd ../../
mkdir gui/deploy mkdir -p gui/deploy
set -e set -e

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
<description>Bitsquare - The decentralized bitcoin exchange</description> <description>Bitsquare - The decentralized bitcoin exchange</description>
<url>https://bitsquare.io</url> <url>https://bitsquare.io</url>

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2-SNAPSHOT</version> <version>0.3.2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
seednode/src/main/resources/logback.xml
View file

@ -19,7 +19,7 @@
<configuration> <configuration>
<appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender"> <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n)</pattern> <pattern>%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n)</pattern>
</encoder> </encoder>
</appender> </appender>