Cleanup dependencies

common/pom.xml

@@ -17,12 +17,10 @@
             <artifactId>gson</artifactId>
             <version>2.2.4</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>4.1.1.RELEASE</version>
         </dependency>
-
     </dependencies>
 </project>

core/pom.xml

@@ -12,9 +12,7 @@
     <artifactId>core</artifactId>
 
     <build>
-
         <plugins>
-
             <!-- <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-enforcer-plugin</artifactId>
@@ -33,7 +31,6 @@
                      </execution>
                  </executions>
              </plugin>-->
-
         </plugins>
     </build>
 
@@ -49,40 +46,11 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.bitcoinj</groupId>
-            <artifactId>bitcoinj-core</artifactId>
-            <version>0.13.2</version>
-        </dependency>
-
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
             <version>4.8</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.glxn</groupId>
-            <artifactId>qrgen</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-graphite</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-
-        <!-- <dependency>
-           <groupId>com.google.code.findbugs</groupId>
-           <artifactId>jsr305</artifactId>
-           <version>2.0.1</version>
-       </dependency>-->
-        <!-- <dependency>
-             <groupId>net.jcip</groupId>
-             <artifactId>jcip-annotations</artifactId>
-             <version>1.0</version>
-         </dependency>-->
-
     </dependencies>
 </project>

core/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java

@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecuregcm.metrics;
-
-import com.codahale.metrics.Gauge;
-import com.sun.management.OperatingSystemMXBean;
-
-import java.lang.management.ManagementFactory;
-
-public class CpuUsageGauge implements Gauge<Integer> {
-    @Override
-    public Integer getValue() {
-        OperatingSystemMXBean mbean = (OperatingSystemMXBean)
-                ManagementFactory.getOperatingSystemMXBean();
-
-        return (int) Math.ceil(mbean.getSystemCpuLoad() * 100);
-    }
-}

core/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java

@@ -1,34 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.whispersystems.textsecuregcm.metrics;
-
-import com.codahale.metrics.Gauge;
-import com.sun.management.OperatingSystemMXBean;
-
-import java.lang.management.ManagementFactory;
-
-public class FreeMemoryGauge implements Gauge<Long> {
-
-    @Override
-    public Long getValue() {
-        OperatingSystemMXBean mbean = (OperatingSystemMXBean)
-                ManagementFactory.getOperatingSystemMXBean();
-
-        return mbean.getFreePhysicalMemorySize();
-    }
-}

core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkGauge.java

@@ -1,53 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.whispersystems.textsecuregcm.metrics;
-
-
-import com.codahale.metrics.Gauge;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-public abstract class NetworkGauge implements Gauge<Long> {
-
-    protected Pair<Long, Long> getSentReceived() throws IOException {
-        File proc = new File("/proc/net/dev");
-        BufferedReader reader = new BufferedReader(new FileReader(proc));
-        String header = reader.readLine();
-        String header2 = reader.readLine();
-
-        long bytesSent = 0;
-        long bytesReceived = 0;
-
-        String interfaceStats;
-
-        while ((interfaceStats = reader.readLine()) != null) {
-            String[] stats = interfaceStats.split("\\s+");
-
-            if (!stats[1].equals("lo:")) {
-                bytesReceived += Long.parseLong(stats[2]);
-                bytesSent += Long.parseLong(stats[10]);
-            }
-        }
-
-        return new Pair<>(bytesSent, bytesReceived);
-    }
-}

core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkReceivedGauge.java

@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecuregcm.metrics;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-import java.io.IOException;
-
-
-public class NetworkReceivedGauge extends NetworkGauge {
-
-    private final Logger logger = LoggerFactory.getLogger(NetworkSentGauge.class);
-
-    private long lastTimestamp;
-    private long lastReceived;
-
-    @Override
-    public Long getValue() {
-        try {
-            long timestamp = System.currentTimeMillis();
-            Pair<Long, Long> sentAndReceived = getSentReceived();
-            long result = 0;
-
-            if (lastTimestamp != 0) {
-                result = sentAndReceived.second() - lastReceived;
-                lastReceived = sentAndReceived.second();
-            }
-
-            lastTimestamp = timestamp;
-            return result;
-        } catch (IOException e) {
-            logger.warn("NetworkReceivedGauge", e);
-            return -1L;
-        }
-    }
-
-}

core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkSentGauge.java

@@ -1,53 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecuregcm.metrics;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-import java.io.IOException;
-
-
-public class NetworkSentGauge extends NetworkGauge {
-
-    private final Logger logger = LoggerFactory.getLogger(NetworkSentGauge.class);
-
-    private long lastTimestamp;
-    private long lastSent;
-
-    @Override
-    public Long getValue() {
-        try {
-            long timestamp = System.currentTimeMillis();
-            Pair<Long, Long> sentAndReceived = getSentReceived();
-            long result = 0;
-
-            if (lastTimestamp != 0) {
-                result = sentAndReceived.first() - lastSent;
-                lastSent = sentAndReceived.first();
-            }
-
-            lastTimestamp = timestamp;
-            return result;
-        } catch (IOException e) {
-            logger.warn("NetworkSentGauge", e);
-            return -1L;
-        }
-    }
-}

core/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2014 Open WhisperSystems
- * <p>
- * This program 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.
- * <p>
- * This program 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.
- * <p>
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecuregcm.util;
-
-import static com.google.common.base.Objects.equal;
-
-public class Pair<T1, T2> {
-    private final T1 v1;
-    private final T2 v2;
-
-    public Pair(T1 v1, T2 v2) {
-        this.v1 = v1;
-        this.v2 = v2;
-    }
-
-    public T1 first() {
-        return v1;
-    }
-
-    public T2 second() {
-        return v2;
-    }
-
-    public boolean equals(Object o) {
-        return o instanceof Pair &&
-                equal(((Pair) o).first(), first()) &&
-                equal(((Pair) o).second(), second());
-    }
-
-    public int hashCode() {
-        return first().hashCode() ^ second().hashCode();
-    }
-}

gui/pom.xml

@@ -124,6 +124,12 @@
             <version>8.0.6_20</version>
         </dependency>
 
+        <dependency>
+            <groupId>net.glxn</groupId>
+            <artifactId>qrgen</artifactId>
+            <version>1.3</version>
+        </dependency>
+
         <dependency>
             <groupId>de.jensd</groupId>
             <artifactId>fontawesomefx</artifactId>

gui/src/main/java/io/bitsquare/app/BitsquareApp.java

@@ -111,6 +111,9 @@ public class BitsquareApp extends Application {
         // setup UncaughtExceptionHandler
         Thread.UncaughtExceptionHandler handler = (thread, throwable) -> {
             // Might come from another thread 
+            log.error("Uncaught Exception from thread " + Thread.currentThread().getName());
+            log.error("Uncaught Exception throwableMessage= " + throwable.getMessage());
+            throwable.printStackTrace();
             UserThread.execute(() -> showErrorPopup(throwable, false));
         };
         Thread.setDefaultUncaughtExceptionHandler(handler);
@@ -121,12 +124,6 @@ public class BitsquareApp extends Application {
         Security.addProvider(new BouncyCastleProvider());
 
         try {
-            // Use CrashFX for report crash logs
-            /*CrashFX.setup("Bitsquare/" + Version.VERSION,
-                    Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "crashes"),
-                    URI.create("http://188.226.179.109/crashfx/upload"));*/
-            // Server not setup yet, so we use client side only support
-
             // Guice
             bitsquareAppModule = new BitsquareAppModule(env, primaryStage);
             injector = Guice.createInjector(bitsquareAppModule);

jsocks/pom.xml

@@ -11,12 +11,4 @@
 
     <artifactId>jsocks</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.11</version>
-        </dependency>
-    </dependencies>
-
 </project>

jtorproxy/pom.xml

@@ -24,17 +24,4 @@
         </dependency>
 
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

network/pom.xml

@@ -17,11 +17,11 @@
             <artifactId>common</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+
         <dependency>
             <groupId>io.bitsquare</groupId>
             <artifactId>jtorproxy</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-
     </dependencies>
 </project>

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
     <version>0.3.2-SNAPSHOT</version>
-    <description>The decentralized bitcoin exchange</description>
+    <description>Bitsquare - The decentralized bitcoin exchange</description>
     <url>https://bitsquare.io</url>
 
     <organization>
@@ -95,51 +95,43 @@
     </repositories>
 
     <dependencies>
-
+        <!--guice-->
-        <dependency>
-            <groupId>org.bitcoinj</groupId>
-            <artifactId>bitcoinj-core</artifactId>
-            <version>0.13.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>4.1.1.RELEASE</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
             <version>3.0</version>
         </dependency>
 
-
+        <!--bitcoin-->
         <dependency>
-            <groupId>commons-io</groupId>
+            <groupId>org.bitcoinj</groupId>
-            <artifactId>commons-io</artifactId>
+            <artifactId>bitcoinj-core</artifactId>
-            <version>2.4</version>
+            <version>0.13.2</version>
         </dependency>
 
+        <!--crypto-->
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.53</version>
         </dependency>
 
+        <!--utils-->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>18.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.fxmisc.easybind</groupId>
             <artifactId>easybind</artifactId>
             <version>1.0.3</version>
         </dependency>
-
         <dependency>
             <groupId>org.reactfx</groupId>
             <artifactId>reactfx</artifactId>
@@ -151,47 +143,41 @@
             <version>13.0</version>
         </dependency>
 
-
+        <!--logging-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.12</version>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
             <version>1.1.3</version>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>1.1.3</version>
         </dependency>
 
-
+        <!--unit test-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>net.jodah</groupId>
+            <groupId>org.springframework</groupId>
-            <artifactId>concurrentunit</artifactId>
+            <artifactId>spring-test</artifactId>
-            <version>0.4.1</version>
+            <version>4.1.1.RELEASE</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
-
 </project>