Merge branch 'Development' into DAO_phase1

.travis.yml

@@ -1,29 +1,11 @@
 language: java
-jdk:
-    - oraclejdk8
-
-install:
-  - git clone -b bisq_0.14.4.1 https://github.com/bitsquare/bitcoinj.git
-  - cd bitcoinj
-  - mvn clean install -DskipTests
-  - git clone https://github.com/bitsquare/libdohj.git
-  - cd libdohj
-  - mvn clean install -DskipTests
-  - git clone https://github.com/bitsquare/btcd-cli4j.git
-  - cd btcd-cli4j
-  - mvn clean install -DskipTests
-  - cd ..
+jdk: oraclejdk8
 
 script: mvn clean install -DskipTests
 
-#notifications:
-#  irc:
-#    channels: chat.freenode.net#bisq
-#    template:
-#      - '%{message} (%{repository}#%{build_number}, %{duration})'
-#      - '%{repository}/%{branch} %{commit} %{author}: %{commit_message}'
-#      - '%{build_url}'
-#    on_success: change
-#    on_failure: always
-#    use_notice: true
-#    skip_join: true
+notifications:
+  slack:
+    rooms:
+      - secure: H82Q57T5nRNDfVnxzlWZ2WoeGt71oq2eJGHbqJ4wP2tIc8b02UO9bztPKFxbm9slMu0JjxZdJfnHSgNZKfPVXrTqwPYRVjKqm7m9TynIlkQabV+yCI/oRvy4Xi/Xj7/aPvZat4s/bxjrtw9KwVdpmqWvRNNSgiTqQ4teBJ1uQGs=
+    on_success: change
+    on_failure: always

common/src/main/resources/i18n/displayStrings.properties

@@ -1439,7 +1439,7 @@ time.seconds=seconds
 
 password.enterPassword=Enter password:
 password.confirmPassword=Confirm password:
-password.tooLong=Password must be less then 50 characters.
+password.tooLong=Password must be less than 50 characters.
 password.deriveKey=Derive key from password
 password.walletDecrypted=Wallet successfully decrypted and password protection removed.
 password.wrongPw=You entered the wrong password.\n\nPlease try entering your password again, carefully checking for typos or spelling errors.

core/pom.xml

@@ -29,12 +29,10 @@
             <version>5.0.3</version>
         </dependency>
 
-        <!-- We use a local project atm but should be added either as jar or to a https repo.
-             Default repo for that project is http only, so it is unsafe to use.-->
         <dependency>
-            <groupId>com.neemre.btcd-cli4j</groupId>
+            <groupId>com.github.bitsquare.btcd-cli4j</groupId>
             <artifactId>btcd-cli4j-core</artifactId>
-            <version>0.5.8.1</version>
+            <version>29f99be</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -64,9 +62,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.neemre.btcd-cli4j</groupId>
+            <groupId>com.github.bitsquare.btcd-cli4j</groupId>
             <artifactId>btcd-cli4j-daemon</artifactId>
-            <version>0.5.8.1</version>
+            <version>29f99be</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -95,7 +93,7 @@
             </exclusions>
         </dependency>
 
-        <!-- For some strange reason we need to include jackson here extra (is included in com.neemre) -->
+        <!-- For some strange reason we need to include jackson here extra (is included in btcd-cli4j) -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

doc/build.md

@@ -85,34 +85,9 @@ Source: https://stackoverflow.com/questions/23057988/file-size-exceeds-configure
 At IntelliJ 14 you need to edit the idea.properties in the app container:
 /Applications/IntelliJ\ IDEA\ 14\ CE.app/Contents/bin/idea.properties 
 
-
 ### 2.2 If using Intellij install the Lombok plugin
 https://plugins.jetbrains.com/plugin/6317-lombok-plugin
 
-
-Build required dependencies
----------------------------
-### 3. Install BitcoinJ (branch bisq_0.14.4.1), libdohj and Btcd-cli4j
-libdohj is used for supporting usage of some altcoins with BitcoinJ.
-Btcd-cli4j is used for RPC communication to a local Bitcoin Core node for verifying the BSQ transactions.
-It is not needed for a normal user to run such a "full node" but for the build it is required.
-
-    $ cd ..
-    $ git clone -b bisq_0.14.4.1 https://github.com/bitsquare/bitcoinj.git
-    $ cd bitcoinj
-    $ mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-    
-    $ cd ..
-    $ git clone https://github.com/bitsquare/libdohj.git
-    $ cd libdohj
-    $ mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-        
-    $ cd ..
-    $ git clone https://github.com/bitsquare/btcd-cli4j.git
-    $ cd btcd-cli4j
-    $ mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-    $ cd ..
-    
 Build bisq
 -----------------
 

doc/install_on_unix.sh

@@ -48,17 +48,6 @@ rm -r UnlimitedJCEPolicyJDK8 jce_policy-8.zip
     $ sudo ldconfig
     $ protoc --version
     
-echo "Install bitcoinj"
-cd ~
-git clone -b bisq_0.14.4.1 https://github.com/bitsquare/bitcoinj.git
-cd bitcoinj
-mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-
-cd ~
-git clone -b bisq_0.14.4.1 https://github.com/bitsquare/btcd-cli4j.git
-cd btcd-cli4j
-mvn clean install -DskipTests -Dmaven.javadoc.skip=true
-
 
 echo "Install and resolve dependencies for bisq"
 cd ~

gui/pom.xml

@@ -252,7 +252,7 @@
                                             org.apache.maven.plugins:maven-deploy-plugin:2.7:maven-plugin:null:runtime:6dadfb75679ca010b41286794f737088ebfe12fd
                                         </urn>
                                         <urn>
-                                            org.apache.maven.plugins:maven-enforcer-plugin:RELEASE:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4
+                                            org.apache.maven.plugins:maven-enforcer-plugin:1.4.1:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4
                                         </urn>
                                         <urn>
                                             org.apache.maven.plugins:maven-install-plugin:2.4:maven-plugin:null:runtime:9d1316166fe4c313f56276935e08df11f45267c2
@@ -367,4 +367,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

pom.xml

@@ -84,6 +84,10 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <repository>
             <id>sonatype-oss-snapshot</id>
             <snapshots/>
@@ -92,14 +96,12 @@
     </repositories>
 
     <dependencies>
-        <!--bitcoinj
-           Needs local installation!
-           See doc/build.md for further info
-       -->
+        <!-- NOTE: our custom bitcoinj dependency is resolved transitively
+             via the libdohj dependency below -->
         <dependency>
-            <groupId>org.libdohj</groupId>
+            <groupId>com.github.bitsquare.libdohj</groupId>
             <artifactId>libdohj-core</artifactId>
-            <version>0.14.2</version>
+            <version>aa0729e5</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>