From ae05c015b95fd634dca1ab72dd59692cd52def63 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Wed, 9 Aug 2017 11:55:29 +0200
Subject: [PATCH] Consume custom bitcoinj/libdojh/btcd deps via JitPack (#899)

This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
---
 .travis.yml            | 12 ------------
 core/pom.xml           | 12 +++++-------
 doc/build.md           | 23 -----------------------
 doc/install_on_unix.sh | 11 -----------
 pom.xml                | 14 ++++++++------
 5 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbbc775850..b17c8d7555 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,6 @@
 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 ..
-
 script: mvn clean install -DskipTests
 
 notifications:
diff --git a/core/pom.xml b/core/pom.xml
index 02d6596387..9ed2908011 100755
--- a/core/pom.xml
+++ b/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>master-SNAPSHOT</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>master-SNAPSHOT</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>
diff --git a/doc/build.md b/doc/build.md
index 126e288494..ccf1f3ab9f 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -86,29 +86,6 @@ At IntelliJ 14 you need to edit the idea.properties in the app container:
 /Applications/IntelliJ\ IDEA\ 14\ CE.app/Contents/bin/idea.properties 
 
 
-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
 -----------------
 
diff --git a/doc/install_on_unix.sh b/doc/install_on_unix.sh
index 9f768b3a0e..a1e35264b7 100755
--- a/doc/install_on_unix.sh
+++ b/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 ~
diff --git a/pom.xml b/pom.xml
index 231f59a12f..ceda320f9c 100644
--- a/pom.xml
+++ b/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>master-SNAPSHOT</version> <!-- 0.14.2 -->
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>