Commit graph

149 commits

Author SHA1 Message Date
Manfred Karrer
677d7dc477
Set v0.6.0 2017-11-08 11:11:51 -05:00
Manfred Karrer
6bef1672e9
Update libdohj/BitcoinJ 2017-11-04 14:34:32 -05:00
Manfred Karrer
2896f42a9a
Use latest libdohj/BitcoinJ version 2017-11-04 10:55:33 -05:00
Mike Rosseel
ebe23a8c62
Merge remote-tracking branch 'upstream/Development' into netlayer
Conflicts:
	network/pom.xml
	network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java
2017-10-30 12:59:57 +01:00
Mike Rosseel
98c8da56c9
Port to the new java netlayer library
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-26 10:56:50 +02:00
Manfred Karrer
791c16a2e6
Add module consensus 2017-09-25 09:41:10 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
Merge master to Development
2017-09-16 12:28:49 -05:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
2017-09-05 14:55:42 +02:00
Chris Beams
ede1f90167
Upgrade to latest HEAD of our libdohj fork 2017-08-23 15:43:36 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
Chris Beams
391910576b
Update to depend on latest commit in libdohj-core
Depending on this commit ensures that we do not transitively depend on
bitcoinj snapshots.
2017-08-21 16:22:11 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development
# Conflicts:
#	doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
6ece78352f
Replace snapshot versions of JitPack deps with fixed SHAs (#899) 2017-08-09 12:41:18 +02:00
Chris Beams
ae05c015b9
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.
2017-08-09 12:13:47 +02:00
Mike Rosseel
592bea9dad make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test 2017-07-26 16:37:59 +02:00
Mike Rosseel
dc4e169602 update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations. 2017-07-25 16:32:19 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
a2563fd0d4 Cleanup, improve comments, small refactorings 2017-07-16 16:06:05 +02:00
Manfred Karrer
e857d411bb Use LibDohj 0.14.2 2017-07-14 18:28:15 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Manfred Karrer
dfc67b3df0 Merge branch 'Development' into downloadUpdates 2017-07-11 23:32:36 +02:00
cedric.walter
692bc1a837 added dependency management for all bouncycastle dependencies, these jar are signed and can not be placed in shaded jar, copy them in a lib directory that will be use by shaded.jar classloader 2017-07-08 21:03:13 +02:00
cedric.walter
8457802943 added code to activate unlimited cipher strength when using jdk 9 2017-07-08 16:39:12 +02:00
Mike Rosseel
2f4ef841bf rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
2017-07-07 17:35:17 +02:00
SimonTuberlin
3e895f45e4 Sig verification for multiple keys
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
2017-07-07 17:35:17 +02:00
Manfred Karrer
e68f4219c6 v0.5.2 2017-07-03 12:18:14 +02:00
Manfred Karrer
570549bfd1 v0.5.1 2017-07-01 00:32:06 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
e49b6b8783 Version 0.4.9.9.2 2017-05-18 15:41:48 +02:00
Manfred Karrer
e5585a1b3a Version 0.4.9.9.2 2017-05-18 00:44:43 +02:00
Manfred Karrer
f84a038889 Version 0.4.9.9.1 2017-03-22 16:24:52 -05:00
Manfred Karrer
1f0df0c132 Fix unintended string 2017-03-22 11:50:25 -05:00
Manfred Karrer
92ea099ab8 Update to BitcoinJ 0.13.1.11 2017-03-22 11:48:55 -05:00
Manfred Karrer
01707ebb2d Update bitcoinJ to 0.13.1.10 2017-03-17 00:12:42 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Manfred Karrer
b0496675b1 Fix wrong bitcoinJ version, remove excludes. 2017-02-10 18:50:16 -05:00
Manfred Karrer
a58f57f30d Update to latest version of org.reactfx 2017-02-10 14:29:18 -05:00
Manfred Karrer
54f860ddb7 Add exclusion again (still diff. version in some sub lib dependencies) 2017-02-10 13:42:14 -05:00
Manfred Karrer
c8c25faa65 Remove excludes in pom 2017-02-10 13:27:37 -05:00
Manfred Karrer
376adb6d1e Move digest-enforcer-rules to gui module and add more entries 2017-02-09 23:58:55 -05:00
Mike Rosseel
6c6937f61f add maven dependency check plugin 2017-02-09 16:22:45 +01:00
Manfred Karrer
e1d917f6c7 Merged PR (https://github.com/bitsquare/bitsquare/pull/730) with some fixes and improvements. Use bitcoinj v 0.13.1.8 2017-02-03 07:42:33 -05:00
Manfred Karrer
12ac797571 Fix IOP validation 2016-12-06 22:29:11 +01:00
hendry19901990
2d319211b4 Improved request 2016-12-06 09:26:08 -04:00
hendry19901990
5a45396e1c Improved the request from manfred!!! 2016-12-06 09:21:51 -04:00
hendry19901990
b1280e118e update 2016-12-05 17:07:36 -04:00
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
9ab423619c Update BitcoinJ to 0.13.1.7 2016-11-19 14:31:41 +01:00