mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-20 10:22:18 +01:00
358f292cbe
# 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
44 lines
1.4 KiB
XML
Executable File
44 lines
1.4 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.bitsquare</groupId>
|
|
<version>0.4.9.9</version>
|
|
</parent>
|
|
|
|
<artifactId>core</artifactId>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>io.bitsquare</groupId>
|
|
<artifactId>common</artifactId>
|
|
<version>${project.parent.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.bitsquare</groupId>
|
|
<artifactId>network</artifactId>
|
|
<version>${project.parent.version}</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>net.sf.jopt-simple</groupId>
|
|
<artifactId>jopt-simple</artifactId>
|
|
<version>4.8</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.neemre.btcd-cli4j</groupId>
|
|
<artifactId>btcd-cli4j-core</artifactId>
|
|
<version>0.5.1</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.neemre.btcd-cli4j</groupId>
|
|
<artifactId>btcd-cli4j-daemon</artifactId>
|
|
<version>0.5.1</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</project>
|