Mike Rosseel
9456b00127
Merge branch 'Development' into issue544-api
2017-08-28 09:31:45 +02:00
Chris Beams
3b73516ad6
Pin maven-enforcer-plugin version to 1.4.1 ( #897 )
...
A new version (v3.0.0-M1) of the enforcer plugin was released on July
27th. If for whatever reason that new version ends up in the local ~/.m2
cache, it results in broken builds because the new version's checksum
gets validated instead of the older v1.4.1 checksum being validated.
This is because the version provided to check was set simply to
'RELEASE', i.e. an alias indicating "whatever the latest release happens
to be". This commit fixes #897 and avoids these potential build failures
by pinning the version explicitly to v1.4.1. This forces the correct
checksum to get validated, in turn causing the build to pass as
expected.
2017-08-09 10:15:14 +02:00
Mike Rosseel
537a99eb0f
adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration
2017-07-18 17:32:44 +02:00
Mike Rosseel
337610ef7c
Merge branch 'Development' into issue544-api
2017-07-17 13:19:24 +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
Mike Rosseel
cda82172e3
Merge branch 'Development' into issue544-api
...
Conflicts:
.idea/codeStyleSettings.xml
2017-07-17 09:03:15 +02:00
Manfred Karrer
b7d8a0acb6
set version 0.5.2
2017-07-16 16:29:10 +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
2844cdece3
Merge pull request #860 from cedricwalter/fix-maven-transitive-dependency
...
Fix maven transitive dependency
2017-07-08 22:12:35 +02:00
cedric.walter
ec6dc25195
fixed maven transitive dependencies, do not use ${project.parent.version} but ${project.version} with this change you can now run test without installing first all artifacts to local repository! test now run before install as expected and with current code version of ide/reactor
2017-07-08 21:40:16 +02:00
cedric.walter
d6a0bdd4dd
corrected a typo but did not change hash, (previous version was org.bouncycastle:bcprov-jdk15on:1.52 🫙 null:compile), now org.bouncycastle:bcprov-jdk15on:1.56 🫙 null:compile with a different hash
2017-07-08 21:27:33 +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
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
Mike Rosseel
a0ecf38cf0
Revert "Revert "bisq -> Bisq""
...
This reverts commit 1dd3245347
2017-06-29 15:29:13 +02:00
Mike Rosseel
e851db1f01
merge
2017-06-29 15:08:33 +02:00
Mike Rosseel
1dd3245347
Revert "bisq -> Bisq"
...
This reverts commit fc863b8278
2017-06-29 14:07:19 +02:00
Mike Rosseel
fc863b8278
bisq -> Bisq
2017-06-29 11:42:59 +02:00
Manfred Karrer
e258b17e7a
Update license with Bisq instead of bisq
2017-06-27 01:39:11 +02:00
Manfred Karrer
e2fa679a68
Merge DAO branch to Development branch
2017-06-27 01:29:54 +02:00
Manfred Karrer
f7993b61c2
Change version nr 0.5.0.0. to 0.5.0
2017-06-23 18:10:26 +02:00
Mike Rosseel
5b72e42a4e
second part of merge
2017-06-07 15:19:28 +02:00
Mike Rosseel
aed210c33d
Merge branch 'DAO' into issue544-api
...
Conflicts:
bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
core/src/main/java/io/bitsquare/trade/offer/Offer.java
gui/src/main/java/io/bisq/gui/app/BisqApp.java
pom.xml
2017-06-07 15:18:59 +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
b805a795dd
Adjust code to work with BitcoinJ 0.14.4.1
2017-04-21 15:20:32 -05:00
Manfred Karrer
c7841e8d14
Remove old code for backward compatibility. Cleanup. Improve version check
2017-03-26 15:52:06 -05:00
Manfred Karrer
f84a038889
Version 0.4.9.9.1
2017-03-22 16:24:52 -05:00
Manfred Karrer
07d428de6f
Use base package iwth same name as module in all modules.
2017-03-16 21:12:06 -05:00
Manfred Karrer
3b557463da
Rebranding: replace bitsquare with bisq
2017-03-12 16:00:40 -05:00
Manfred Karrer
be1096582c
Rebranding: rename package io.bitsquare to io.bisq
2017-03-12 15:09:39 -05:00
Manfred Karrer
75fc7d2286
Rebranding: Change occurance of Bitsquare to bisq
2017-03-12 14:28:14 -05:00
Mike Rosseel
da0ade10b8
re-add GUI integration with api
2017-03-09 08:23:33 +01:00
Mike Rosseel
01ce7bdf35
make compile by excluding stuff (caused by the enforcer)
2017-03-07 10:07:34 +01:00
Mike Rosseel
44b8522996
Merge branch 'Development' into issue544-api
...
Conflicts:
core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
pom.xml
2017-03-07 08:02:29 +01:00
Manfred Karrer
d666490424
Set v 0.5.0.0, fix issues after merge.
2017-02-12 13:38:26 -05:00
Manfred Karrer
358f292cbe
Merge branch 'Development' into DAO
...
# Conflicts:
# common/src/main/java/io/bitsquare/app/Version.java
# core/src/main/java/io/bitsquare/btc/FeePolicy.java
# core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java
# core/src/main/java/io/bitsquare/btc/WalletService.java
# core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
# core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
# core/src/main/java/io/bitsquare/trade/BuyerTrade.java
# core/src/main/java/io/bitsquare/trade/SellerTrade.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
# core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java
# gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
# gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
# network/src/main/resources/PersistedP2PStorageData
# package/mac/create_app.sh
# pom.xml
# provider/src/main/java/io/bitsquare/provider/ProviderMain.java
# provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java
2017-02-12 12:59:29 -05:00
Manfred Karrer
890c724a87
Prepare for v 0.4.9.9
2017-02-10 19:49:33 -05:00
Manfred Karrer
9f908b2aea
add verify task to build script, update pom
2017-02-10 00:31:48 -05:00
Manfred Karrer
7e71c8c4b6
Add DependencyConvergence
2017-02-10 00:04:21 -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
ad2e7c5e53
make it compile again
2017-01-31 22:05:59 +01:00
Manfred Karrer
8f871e2629
Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests
2017-01-17 02:56:30 +01:00
Mike Rosseel
164a73197b
Merge remote-tracking branch 'origin/Development' into issue544-api
2016-12-02 22:09:58 +01:00
Mike Rosseel
0d34b8a707
version update, limitedstrength change
2016-12-02 22:09:53 +01:00
Manfred Karrer
3bf4c60567
Prepare for v0.4.9.8
2016-11-19 14:36:23 +01:00
Mike Rosseel
e0dc5788eb
Merge remote-tracking branch 'origin/Development' into issue544-api
2016-10-20 22:35:26 +02:00
Manfred Karrer
22250574d8
Prepare for v 0.4.9.7
2016-10-19 22:04:46 +02:00
Manfred Karrer
53c160f54a
Fix version number (0.4.9.2 -> 0.4.9.6)
2016-10-04 20:51:41 +02:00
Mike Rosseel
e7ca8243f6
Merge remote-tracking branch 'origin/Development' into issue544-api
...
Conflicts:
core/src/main/java/io/bitsquare/trade/statistics/TradeStatisticsManager.java
2016-09-13 18:51:48 +02:00
