Commit graph

187 commits

Author SHA1 Message Date
Manfred Karrer
2d89453736
Reformat and organize imports 2018-03-14 00:23:33 -05:00
Chris Beams
c68d0f4af2
Repackage {io.bisq.gui => bisq.desktop} 2018-03-12 09:31:14 +01:00
Chris Beams
15589eddf0
Rename groupid {io.bisq => network.bisq} 2018-03-12 05:51:40 +01:00
Chris Beams
eef9062a69
Add missing reactfx dependency
This had been getting pulled in transitively through the old
io.bisq.exchange:core artifact's parent pom. Now that we're depending on
the io.bisq:bisq-core, there is no parent pom in the mix anymore, and
the reactfx dependency must to be explicitly declared here.
2018-03-10 22:06:38 +01:00
Chris Beams
cd5078749f
Update bisq-core GAV coordinates 2018-03-10 21:53:54 +01:00
Chris Beams
6e25a9b28d
Rename artifact desktop => bisq-desktop 2018-03-10 18:51:09 +01:00
Chris Beams
96ffc7d498
Hoist gui module to top level and adapt pom 2018-03-10 18:51:08 +01:00
Manfred Karrer
209fdffedf
Remove consensus module 2018-03-10 10:59:05 -05:00
Chris Beams
aec4c4814a
Move monitor module to new repository
This module is being extracted into its own repository, which will live
at https://github.com/bisq-network/bisq-monitor.
2018-03-09 17:23:10 +01:00
Chris Beams
8e5dcf1fad
Move statistics module to new repository
This module is being extracted into its own repository, which will live
at https://github.com/bisq-network/bisq-statsnode.
2018-03-09 17:22:12 +01:00
Chris Beams
19b9c6fe59
Set Maven version to -SNAPSHOT
Problem: d218094 set the version to 0.7.0-SNAPSHOT, but that change
failed to produce the intended effect detailed in the commit comment.
Setting the version to a value like 0.7.0-SNAPSHOT works fine when
publishing artifacts to a local ~/.m2 repository, but JitPack has no
awareness of version metadata within pom files, and can only retreive
artifacts based on Git metadata, namely tags, branch names and commit
hashes. This means it is impossible to resolve artifacts from JitPack
with a GAV like `io.bisq.exchange:core:0.7.0-SNAPSHOT` unless there is a
branch named `0.7.0`. This is why the pull request at
bisq-network/bisq-seednode#1 failed.

Solution: JitPack supports the semantics of Maven-style `-SNAPSHOT`
versioning, and as a special case, allows for versions to be named
literally `-SNAPSHOT` with no preceding version string [1,2]. This
commit sets all Maven versions to `-SNAPSHOT`, achieving the original
effect intended by d218094. Now downstream components (like
bisq-seednode) can resolve dependencies seamlessly from JitPack or a
local ~/.m2 repo with a GAV like `io.bisq.exchange:core:-SNAPSHOT`. This
is a slightly unconventional arrangement, but should actually result in
fewer updates to pom files over time as there may in fact be no reason
to ever change this version string so long as we continue using JitPack
and avoid publication to Maven Central / JCenter or similar.

[1]: https://jitpack.io/docs/#building-with-jitpack
[2]: https://github.com/jitpack/jitpack.io/issues/351

See #1440
2018-03-09 10:29:23 +01:00
Chris Beams
d218094269
Bump Maven artifact versions to 0.7.0-SNAPSHOT
Problem: When resolving Bisq libraries, e.g. `core` or `network` from
JitPack for use in other components like bisq-seednode or
bisq-pricenode, we have historically, resolved them by tag or by
branchname, e.g. with GAV coordinates like `io.bisq:core:v0.6.7` or
`io.bisq:core:master`. This works well enough, but now that we are
beginning to modularize more aggressively, we want to make sure that
it's possible at any time to publish the latest snapshots of these
libraries to one's own local ~/.m2 repository such that they can be
easily resolved from downstream components without the need to push
commits to the bisq-network/exchange remote, and to wait for JitPack to
do a just-in-time build.

Solution: By updating the version value of all modules here in the
exchange repository from 0.6.7 => 0.7.0-SNAPSHOT, one can run
`mvn install` to publish the latest "snapshot" of exchange libraries to
the local ~/.m2 repository and be sure to resolve them from whatever
downstream component that they are working on. The -SNAPSHOT qualifier
ensures that no caching occurs, and that the very latest such binary
will always be used.

This new arrangement creates a situation where one can transparently
resolve these dependencies remotely from JitPack and then subsequently
resolve them locally from one's ~/.m2 repository without having to
change a line of code.

It also opens up the ability to manage all Bisq components together in a
single IDE window as if they were all in one repository, avoiding the
need even to issue a `mvn install` command to publish locally--but
that's not the main focus of this change.

Note that the change to 0.7.0 here is based on the fact that we already
planned to have the next version shipped from `master` be 0.7.0, as
there are quite a few new UI changes that probably merit the bump in
minor version. The version change also aligns well with the fact that
we're modularizing a number of components right now, and all
newly-extracted components have been jumping to v0.7.0 to indicate their
new independent status. This has been the case with bisq-seednode and
pricenode so far.

Finally, it is important to note here that the ONLY versions updated by
this change are those specific to Maven metadata and therefore artifact
management / dependency resolution. The version that the Bisq desktop
client reports in its UI and to the network in its user agent has NOT
been changed, on account of the fact that users may run Bisq from
source, and we need to think through more fully the implications of
reporting a verison like 0.7.0-SNAPSHOT in those situations. Here is a
list of files containing the old version (0.6.7) that have NOT been
updated:

 - common/src/main/java/io/bisq/common/app/Version.java
 - package/linux/32bitBuild.sh
 - package/linux/Dockerfile
 - package/osx/create_app.sh
 - package/osx/finalize.sh
 - package/windows/32bitBuild.bat
 - package/windows/64bitBuild.bat
 - package/windows/Bisq.iss
 - package/linux/64bitBuild.sh

One thing we know for sure that wouldn't work here is that Bisq's
Version class currently does not support -SNAPSHOT qualifiers. It just
breaks the version string validation entirely. So we'd need to patch
that in any case if we do decide it's a good idea to let pre-release
builds report their version accurately.
2018-03-08 19:49:30 +01:00
Chris Beams
19d8c252ba
Change groupid from io.bisq => io.bisq.exchange
Problem: The current `io.bisq` groupid does not align with the way
JitPack supports custom groupids. In order to be able to both resolve
artifacts from JitPack *and* be able to resolve the same artifacts from
one's local ~/.m2 repository, Bisq artifacts need to have the same GAV
coordinates everywhere (groupid, artifactid, version).

Solution: This commit changes all groupids from io.bisq =>
io.bisq.exchange to match the GAV coordinates produced / expected by
JitPack.

So where Bisq's core module would previously have been resolvable with
GAV coordinates `io.bisq:core:v0.6.7` it will now be resolvable as
`io.bisq.exchange:core:v0.6.7`.

Note that this change is not just to satisfy JitPack idiosyncracies, but
is actually good naming practice anyway where a multi-module build is
involved, and is arguably the way it should have been all along.

[1]: https://jitpack.io/docs/#publishing-on-jitpack
2018-03-08 18:59:31 +01:00
Chris Beams
86f4df4122
Move seednode module to new repository
This module is being extracted into its own repository, which will live
at https://github.com/bisq-network/bisq-seednode.
2018-03-08 14:28:34 +01:00
Manfred Karrer
1d0591084d
Merge branch '0.6.7'
# Conflicts:
#	common/pom.xml
#	common/src/main/java/io/bisq/common/app/Version.java
#	common/src/main/resources/i18n/displayStrings.properties
#	common/src/main/resources/i18n/displayStrings_hu.properties
#	common/src/main/resources/i18n/displayStrings_ro.properties
#	consensus/pom.xml
#	core/pom.xml
#	core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/pom.xml
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
#	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
#	monitor/pom.xml
#	network/pom.xml
#	network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
#	package/linux/32bitBuild.sh
#	package/linux/64bitBuild.sh
#	package/linux/Dockerfile
#	package/osx/create_app.sh
#	package/osx/finalize.sh
#	package/windows/32bitBuild.bat
#	package/windows/64bitBuild.bat
#	package/windows/Bisq.iss
#	pom.xml
#	seednode/pom.xml
#	statistics/pom.xml
2018-02-26 22:03:47 -05:00
Manfred Karrer
fd47cefc6c
Set v0.6.7 2018-02-26 20:23:07 -05:00
Manfred Karrer
2c593559db
Merge 0.6.6 branch to master 2018-02-23 21:40:34 -05:00
Manfred Karrer
0b6edbb883
Set version 0.6.6 2018-02-23 15:41:24 -05:00
Manfred Karrer
6bce8f0cc6
Merge branch 'feature/refactor-transaction-view' of https://github.com/tau3/exchange into tau3-feature/refactor-transaction-view 2018-02-01 13:38:29 -05:00
Manfred Karrer
26db1270a5
Merge branch 'feature/1285/account-offer-validation' of https://github.com/tau3/exchange into tau3-feature/1285/account-offer-validation 2018-02-01 13:08:47 -05:00
Sergey Rozhnov
9b5542b79a Fixed dependecies versions mismatch - "install" goal now works 2018-02-01 14:11:37 +04:00
Sergey Rozhnov
b032145c83 implemented unit test for TransactionAwareTrade 2018-01-31 22:28:12 +04:00
Manfred Karrer
bf244856b1
v0.6.5 2018-01-31 13:04:24 -05:00
Manfred Karrer
25190bbe1f
Merge pull request #1296 from ripcurlx/add-util-tests
Add util tests
2018-01-30 14:58:41 -05:00
Sergey Rozhnov
cadaac15e9 split AccountValidator into ReceiptValidator and ReceiptPredicates; implemented unit test for ReceiptPredicates 2018-01-29 18:36:23 +04:00
Christoph Atteneder
d57b5354b0
Add basic tests for currency converters 2018-01-29 10:09:47 +01:00
Manfred Karrer
1853d4ce49
Use BitcoinJ 0.14.4.5 2018-01-26 13:52:10 -05:00
Chris Beams
c53695ae60
Remove provider module after extracting to new repo
See bisq-network/pricenode#2
2018-01-24 02:53:45 +01:00
Manfred Karrer
33eecd81aa
Release 0.6.4 2018-01-20 20:47:53 -05:00
Manfred Karrer
aeec075c91
Prepare v0.6.3 2018-01-09 23:36:49 +01:00
Manfred Karrer
9fb59c89d5
Use bitcoinj 0.14.4.5 with adjusted broadcast behavior 2018-01-09 19:37:36 +01:00
Manfred Karrer
bef49998f7
Use libdoj 95a33100 with bitcoinj 0.14.4.4 2018-01-09 15:06:12 +01:00
Manfred Karrer
6302c7190b
Update to libdohj 5a090784 (BitcoinJ 0.14.5.1) 2018-01-03 16:01:55 +01:00
Manfred Karrer
5ce2a67d0c
Prepare release 0.6.2 2017-12-20 01:12:18 +01:00
Manfred Karrer
fb8763436a
Fix pom 2017-12-19 19:22:40 +01:00
Manfred Karrer
d77eb89e78
Add seed node monitor module 2017-12-17 20:39:00 +01:00
Manfred Karrer
838bf72a60
Use libdohj bba4088c. Improve logging. Cleanup 2017-11-26 11:40:53 -05:00
Manfred Karrer
07d85b3f8b
Set version 0.6.1. Add versions for seed and statistics nodes 2017-11-24 14:23:49 -05:00
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