A decentralized bitcoin exchange network
Find a file
ghubstan 962e11923b
Upgrade and reduce version conflicts in build
Some apache & logback dependency versions were bumped up, some
transitive dependencies declared as direct dependencies, and some
new exclusions were added to reduce the number of duplicated
dependencies in the build.
Also updated gradle-witness.gradle.

Here are some of the duplicated apache and logback dependencies
in the current build:

	commons-codec-1.10.jar
	commons-codec-1.9.jar
	commons-io-2.4.jar
	commons-io-2.6.jar
	commons-logging-1.1.1.jar
	commons-logging-1.2.jar

	httpclient-4.0.1.jar
	httpclient-4.5.3.jar
	httpclient-4.5.5.jar
	httpcore-4.0.1.jar
	httpcore-4.4.6.jar
	httpcore-4.4.9.jar

	logback-classic-1.1.10.jar
	logback-classic-1.1.11.jar
	logback-core-1.1.10.jar
	logback-core-1.1.11.jar

Upgraded:

	codecVersion 1.9 -> 1.13
	ioVersion  2.4 -> 2.6
	langVersion 3.4 -> 3.8
	httpclientVersion 4.5.3 -> 4.5.12
	slf4jVersion 1.7.22 -> 1.7.25

New dependency declarations:

	loggingVersion 1.2
	httpcoreVersion 4.4.13

This commit reduces the number of build dependencies by 10.

Partial fix for #4086
2020-03-22 16:06:40 -03:00
.github Protect priority issues from stale bot 2020-02-18 12:35:53 +01:00
.idea Introduce Config as replacement for BisqEnvironment 2020-01-20 16:37:54 +01:00
assets/src Add test for Liquid Bitcoin and improve error handling 2020-02-11 17:31:43 +01:00
cli/src/main/java/bisq/cli/app Reflect higher security deposit in placeOffer RPC comment 2020-01-20 12:58:13 +01:00
common/src Bump version number for v1.2.9 2020-03-13 17:16:09 +01:00
core Merge pull request #4045 from jmacxx/fix_btcnode_ipv6 2020-03-20 16:12:35 +01:00
daemon/src/main/java Remove now unused BisqEnvironment class 2020-01-20 16:41:19 +01:00
desktop Merge pull request #4077 from ripcurlx/handle-unsupported-payment-methods 2020-03-19 11:55:32 +01:00
docs Merge pull request #3713 from beingindot/beingindot-daosetup-change 2019-12-06 16:24:26 +01:00
gradle Upgrade and reduce version conflicts in build 2020-03-22 16:06:40 -03:00
monitor Fix nginx.conf for collectd so it only listens on 127.0.0.1 2020-02-28 12:44:52 +09:00
p2p/src Merge pull request #4045 from jmacxx/fix_btcnode_ipv6 2020-03-20 16:12:35 +01:00
pricenode Fix using /bin/sh instead of /bin/bash in journalscraper.sh 2020-03-12 22:57:45 +09:00
relay Revert to SNAPSHOT version 2020-03-17 14:44:25 +01:00
scripts Add shell script for creating DAO genesis transaction 2019-06-24 13:15:37 -07:00
seednode Bump version number for v1.2.9 2020-03-13 17:16:09 +01:00
statsnode/src/main Remove now unused BisqExecutable option handling 2020-01-20 16:46:56 +01:00
.editorconfig Do not strip trailing whitespace in Git diffs 2020-01-10 19:48:26 +01:00
.gitattributes Add .gitattributes file 2018-11-15 22:34:05 -08:00
.gitignore Ignore Structure101 Workspace files 2020-01-10 19:48:26 +01:00
.travis.yml Reformat travis config 2019-08-27 10:44:14 +02:00
build.gradle Upgrade and reduce version conflicts in build 2020-03-22 16:06:40 -03:00
CODEOWNERS Add wiz as codeowner for seednode configuration changes 2020-01-27 16:50:15 +01:00
CONTRIBUTING.md Reference critical bugs process 2020-02-21 12:17:09 +01:00
gradle.properties Increase Gradle HTTP timeouts from 30 => 120 seconds 2018-03-22 10:39:52 +01:00
gradlew Bump gradle wrapper to version 5.6.4 (#3627) 2019-11-18 09:31:58 +01:00
gradlew.bat Bump gradle wrapper to version 5.6.4 (#3627) 2019-11-18 09:31:58 +01:00
LICENSE add basic wallet, update nav buttons, move unused img 2014-04-24 16:55:55 +02:00
Makefile Add 'make undeploy' target to kill all running nodes 2019-12-03 12:04:39 +01:00
pull_request_template.md Added a Pull Request template 2019-11-27 13:46:54 +01:00
README.md jdk10 is no longer needed to build and run the test suite 2019-08-14 18:11:57 +02:00
settings.gradle Rename submodule grpc => daemon 2020-01-20 12:13:30 +01:00

Bisq

Build Status

What is Bisq?

Bisq is a safe, private and decentralized way to exchange bitcoin for national currencies and other digital assets. Bisq uses peer-to-peer networking and multi-signature escrow to facilitate trading without a third party. Bisq is non-custodial and incorporates a human arbitration system to resolve disputes.

To learn more, see the doc and video at https://bisq.network/intro.

Get started using Bisq

Follow the step-by-step instructions at https://bisq.network/get-started.

Contribute to Bisq

See CONTRIBUTING.md and the developer docs.