Florian Reimair
c80ab946fb
Merge branch 'master' into master
2019-08-14 19:15:29 +02:00
Florian Reimair
4eb88404b5
Merge pull request #3087 from battleofwizards/gradle-installdist-remove-useless-deletions
...
Remove legacy hack from build.gradle installDist task
2019-08-14 18:54:49 +02:00
battleofwizards
9ef7f89ffd
Remove legacy hack from build.gradle installDist task
...
The rationale for the "delete fileTree" hack no longer exists
because the conflicting files are not created anymore.
2019-08-14 14:20:54 +02:00
Christoph Sturm
9278ad021b
don't force jdk 10 on developers
2019-08-13 19:59:12 +02:00
Christoph Sturm
0babe82d09
remove jmockit
2019-08-13 19:47:40 +02:00
Christoph Sturm
5da7ca21fa
remove powermock from gradle file
2019-08-13 19:34:54 +02:00
Christoph Sturm
17221cbed8
remove more powermock and jmockit tests.
...
ignore 2 or 3 tests that are not possible to convert now
2019-08-13 19:30:57 +02:00
Christoph Sturm
e9a45196a8
remove powermock from core.
2019-08-13 18:13:10 +02:00
Christoph Sturm
9a587609dd
WIP remove powermock
2019-08-13 18:08:33 +02:00
ghubstan
4ed65c229f
Merge remote-tracking branch 'upstream/master'
...
Bump guice version to 4.2.2
2019-08-13 11:44:00 -03:00
sqrrm
e52c255446
Merge pull request #3058 from christophsturm/bump-guice
...
use singleton annotation instead of binding as singleton
2019-08-13 15:19:41 +02:00
ghubstan
623a1db1e7
Fix merge conflict
...
Bump netlayerVersion to 0.6.5.1
2019-08-09 14:49:12 -03:00
ghubstan
2709e61875
Merge remote-tracking branch 'upstream/master'
2019-08-09 14:45:57 -03:00
sqrrm
89072d941f
Merge pull request #3048 from freimair/tor_0.4.0.5
...
Update Tor to 0.4.0.5
2019-08-09 15:59:24 +02:00
Christoph Atteneder
89073316c9
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-v1.1.5
...
# Conflicts:
# build.gradle
# desktop/package/linux/Dockerfile
# desktop/package/linux/package.sh
# desktop/package/linux/release.sh
# desktop/package/macosx/create_app.sh
# desktop/package/macosx/finalize.sh
# desktop/package/macosx/insert_snapshot_version.sh
# desktop/package/windows/package.bat
# desktop/package/windows/release.bat
# relay/src/main/resources/version.txt
2019-08-08 11:19:51 +02:00
Christoph Atteneder
a56b367476
Revert to SNAPSHOT version
2019-08-08 10:34:06 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number
2019-08-08 09:54:54 +02:00
ghubstan
5f3d7f52c2
Merge remote-tracking branch 'upstream/master'
2019-08-06 14:27:38 -03:00
Christoph Sturm
20e011178e
bump guice version and start testing desktop guice setup
2019-08-06 17:44:47 +02:00
ghubstan
3f7795b926
Define missing dependency version variables
...
Created version variables in build.gradle where missing,
but not touching hard coded overrides in subprojects.
Alphanumerically ordered version variables.
Used IDE code formatter, changing top line of file.
2019-08-03 16:00:55 -03:00
Florian Reimair
ad0724b97d
Update tor to 0.4.0.5
2019-08-02 13:45:53 +02:00
Christoph Sturm
18115c98f2
Update build.gradle
...
Co-Authored-By: sqrrm <sqrrm@users.noreply.github.com>
2019-08-01 13:44:07 +02:00
Christoph Sturm
ba1d493caf
test the seednode's guice setup
2019-08-01 13:12:37 +02:00
Christoph Atteneder
db25293d62
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-for-v1.1.3
...
# Conflicts:
# build.gradle
# desktop/package/linux/Dockerfile
# desktop/package/linux/package.sh
# desktop/package/linux/release.sh
# desktop/package/macosx/create_app.sh
# desktop/package/macosx/finalize.sh
# desktop/package/macosx/insert_snapshot_version.sh
# desktop/package/windows/package.bat
# desktop/package/windows/release.bat
# relay/src/main/resources/version.txt
2019-07-29 19:00:37 +02:00
Christoph Sturm
60d5b4ec5a
fix type
2019-07-29 15:44:37 +02:00
Christoph Sturm
14f1580c8a
add comment
2019-07-29 15:44:24 +02:00
Christoph Atteneder
d7cdd4be5c
Revert to SNAPSHOT version
2019-07-29 15:41:41 +02:00
Christoph Sturm
a3c814797d
force jdk 10 on build to avoid confusion when some tests fail.
2019-07-29 09:53:19 +02:00
Christoph Atteneder
d498e43415
Bump version number
2019-07-26 10:41:47 +02:00
Christoph Atteneder
a2c19fa785
Revert to SNAPSHOT version
2019-07-15 16:35:49 +02:00
Christoph Atteneder
59be5bc94e
Bump version number
2019-07-15 16:33:55 +02:00
Christoph Atteneder
5b841709d4
Revert to SNAPSHOT version
2019-06-04 10:53:42 +02:00
Christoph Atteneder
ca24ce0217
Bump version number
2019-06-04 10:49:00 +02:00
Oscar Guindzberg
aded4afdf3
Use bitcoinj with connection handling audit fixes + Transaction.unCache() set confidence to null
2019-05-09 18:23:08 -03:00
Christoph Atteneder
8a25bb86c7
Fix broken SNAPSHOT renaming
2019-05-06 11:29:45 +02:00
Christoph Atteneder
98a7748a01
Revert to SNAPSHOT version
2019-05-06 10:55:09 +02:00
Christoph Atteneder
ac68da1dd3
Bump version number
2019-05-06 10:47:01 +02:00
Christoph Atteneder
36c0e49504
Revert to SNAPSHOT version
2019-05-03 12:47:59 +02:00
Christoph Atteneder
8ceb2e3be2
Bump version number
2019-05-03 12:13:41 +02:00
Christoph Atteneder
36f8b0275a
Revert to SNAPSHOT version
2019-04-16 16:26:41 +02:00
Christoph Atteneder
bdf163ca2d
Bump version number
2019-04-16 16:03:12 +02:00
Devin Bileck
eebb485096
Add missing pricenode project
...
When generating shell scripts in the root project directory, the
pricenode project was missing.
2019-04-16 00:47:34 -07:00
Christoph Atteneder
60826a11e1
Revert to SNAPSHOT
2019-04-15 17:42:16 +02:00
Christoph Atteneder
2c106c74c6
Bump version number
2019-04-12 12:09:49 +02:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions
2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number
2019-04-08 12:10:59 +02:00
Christoph Atteneder
7f2e406e8d
Revert to SNAPSHOT versions
2019-04-02 17:25:03 +02:00
Christoph Atteneder
0ffc93a091
Bump version number
2019-04-02 17:13:04 +02:00
Christoph Atteneder
21e63066af
Revert to SNAPSHOT versions
2019-04-02 11:21:11 +02:00
Christoph Atteneder
fb3c8c214e
Bump version number
2019-04-02 11:19:03 +02:00
