mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-25 07:27:18 +01:00
Conflicts: common/src/main/java/io/bisq/common/locale/CountryUtil.java common/src/main/java/io/bisq/common/locale/FiatCurrency.java core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java core/src/main/java/io/bisq/core/payment/AliPayAccount.java core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java core/src/main/java/io/bisq/core/payment/OKPayAccount.java core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java core/src/main/java/io/bisq/core/payment/SepaAccount.java core/src/main/java/io/bisq/core/payment/SwishAccount.java core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java core/src/main/java/io/bisq/core/user/BlockChainExplorer.java core/src/main/java/io/bisq/core/user/Preferences.java core/src/main/java/io/bisq/core/user/User.java gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java gui/src/main/java/io/bisq/gui/main/MainViewModel.java gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java gui/src/main/java/io/bisq/gui/main/offer/OfferView.java 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/createoffer/CreateOfferViewModel.java gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java gui/src/main/java/io/bisq/gui/util/BSFormatter.java gui/src/main/java/io/bisq/gui/util/GUIUtil.java pom.xml statistics/src/main/java/io/bisq/statistics/Statistics.java
122 lines
4.7 KiB
XML
Executable file
122 lines
4.7 KiB
XML
Executable file
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
<artifactId>parent</artifactId>
|
|
<groupId>io.bisq</groupId>
|
|
<version>0.5.0.0</version>
|
|
</parent>
|
|
|
|
<artifactId>core</artifactId>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>io.bisq</groupId>
|
|
<artifactId>common</artifactId>
|
|
<version>${project.parent.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.bisq</groupId>
|
|
<artifactId>network</artifactId>
|
|
<version>${project.parent.version}</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>net.sf.jopt-simple</groupId>
|
|
<artifactId>jopt-simple</artifactId>
|
|
<version>5.0.3</version>
|
|
</dependency>
|
|
|
|
<!-- We use a local project atm but should be added either as jar or to a https repo.
|
|
Default repo for that project is http only, so it is unsafe to use.-->
|
|
<dependency>
|
|
<groupId>com.neemre.btcd-cli4j</groupId>
|
|
<artifactId>btcd-cli4j-core</artifactId>
|
|
<version>0.5.8</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</exclusion>
|
|
|
|
<exclusion>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpclient</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-core</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-annotations</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.neemre.btcd-cli4j</groupId>
|
|
<artifactId>btcd-cli4j-daemon</artifactId>
|
|
<version>0.5.8</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpclient</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-core</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-annotations</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
|
|
<!-- For some strange reason we need to include jackson here extra (is included in com.neemre) -->
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-core</artifactId>
|
|
<version>2.8.7</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-annotations</artifactId>
|
|
<version>2.8.7</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
<version>2.8.7</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-annotations</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
</project>
|