mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-20 10:22:18 +01:00
fed47a0342
Conflicts: common/src/main/java/io/bitsquare/app/Log.java core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java core/src/main/java/io/bitsquare/btc/BitcoinModule.java core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java core/src/main/java/io/bitsquare/btc/wallet/WalletService.java core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java core/src/main/java/io/bitsquare/dao/DaoModule.java core/src/main/java/io/bitsquare/dao/vote/VotingManager.java gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java network/pom.xml network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java network/src/main/java/io/bitsquare/messages/alert/Alert.java network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java network/src/main/java/io/bitsquare/messages/user/Preferences.java network/src/main/java/io/bitsquare/p2p/network/Connection.java pom.xml statistics/src/main/java/io/bitsquare/statistics/Statistics.java
76 lines
2.7 KiB
XML
Executable File
76 lines
2.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.bitsquare</groupId>
|
|
<version>0.5.0.0</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>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>
|
|
</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>
|
|
</exclusions>
|
|
</dependency>
|
|
</dependencies>
|
|
</project>
|