Merge branch 'master' into 6-api-xmr-trading

sqrrm · Dec 15, 2021 · 705e34e · 705e34e
2 parents 98b41cb + cf81fd4
commit 705e34e
Show file tree

Hide file tree

Showing 106 changed files with 3,983 additions and 1,019 deletions.
diff --git a/build.gradle b/build.gradle
@@ -461,7 +461,7 @@ configure(project(':desktop')) {
         modules = ['javafx.controls', 'javafx.fxml']
     }
 
-    version = '1.7.5-SNAPSHOT'
+    version = '1.8.0-SNAPSHOT'
 
     jar.manifest.attributes(
         "Implementation-Title": project.name,
@@ -574,6 +574,8 @@ configure(project(':monitor')) {
 configure(project(':pricenode')) {
     apply plugin: "org.springframework.boot"
 
+    apply plugin: 'io.spring.dependency-management'
+
     mainClassName = 'bisq.price.Main'
 
     version = file("src/main/resources/version.txt").text.trim()
@@ -582,6 +584,8 @@ configure(project(':pricenode')) {
         "Implementation-Title": project.name,
         "Implementation-Version": version)
 
+    ext['log4j2.version'] = '2.15.0'
+
     dependencies {
         implementation project(":common")
         implementation project(":core")

diff --git a/common/src/main/java/bisq/common/ClockWatcher.java b/common/src/main/java/bisq/common/ClockWatcher.java
@@ -80,7 +80,9 @@ public void start() {
     }
 
     public void shutDown() {
-        timer.stop();
+        if (timer != null) {
+            timer.stop();
+        }
         timer = null;
         counter = 0;
     }

diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
@@ -30,15 +30,15 @@ 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 = "1.7.5";
+    public static final String VERSION = "1.8.0";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
      * This must not contain each version but only those where we add new version-tagged resource files for
      * historical data stores.
      */
     public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2",
-            "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4");
+            "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);