Skip to content

Commit

Permalink
Merge branch 'develop' into mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
@niels1286
niels1286 committed Aug 21, 2019
2 parents 89daecf + 71e85f5 commit af44b4b
Show file tree
Hide file tree
Showing 68 changed files with 315 additions and 312 deletions.
8 changes: 4 additions & 4 deletions account-ledger-module/account-ledger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>

<dependencies>
<dependency>
<groupId>io.nuls.core-module</groupId>
<artifactId>kernel</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
16 changes: 8 additions & 8 deletions account-ledger-module/base/account-ledger-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-base</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-storage</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.protocol-module</groupId>
<artifactId>protocol</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.consensus-module</groupId>
<artifactId>consensus</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.contract-module</groupId>
<artifactId>contract</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.utxo-accounts-module</groupId>
<artifactId>utxo-accounts</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions account-ledger-module/base/account-ledger-rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-rpc</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
Expand All @@ -39,17 +39,17 @@
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-base</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
10 changes: 5 additions & 5 deletions account-ledger-module/base/account-ledger-storage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-storage</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.db-module</groupId>
<artifactId>db</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions account-ledger-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>nuls</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.nuls</groupId>
<artifactId>account-ledger-module</artifactId>
<packaging>pom</packaging>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<modules>
<module>account-ledger</module>
<module>base/account-ledger-storage</module>
Expand Down
6 changes: 3 additions & 3 deletions account-module/account/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.core-module</groupId>
<artifactId>kernel</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
20 changes: 10 additions & 10 deletions account-module/base/account-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,56 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account-base</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account-storage</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.protocol-module</groupId>
<artifactId>protocol</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.tools-module</groupId>
<artifactId>cache</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.message-bus-module</groupId>
<artifactId>message-bus</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.db-module</groupId>
<artifactId>db-leveldb</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions account-module/base/account-rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account-rpc</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>


<dependencies>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account-base</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
Expand Down
8 changes: 4 additions & 4 deletions account-module/base/account-storage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account-storage</artifactId>

<version>1.3.0-beta</version>
<version>1.3.0</version>

<dependencies>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.nuls.db-module</groupId>
<artifactId>db</artifactId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions account-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>nuls</artifactId>
<groupId>io.nuls</groupId>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.nuls</groupId>
<artifactId>account-module</artifactId>
<packaging>pom</packaging>
<version>1.3.0-beta</version>
<version>1.3.0</version>
<modules>
<module>account</module>
<module>base/account-storage</module>
Expand Down
Loading

0 comments on commit af44b4b

Please sign in to comment.