hummingbird
/
jdchain
Not watched
2
0
Fork 0
Code
Releases 31 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge branch 'master' into release/1.5.0 

* master:
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	framework
#	libs/bft-smart
#	libs/utils
#	samples/pom.xml
#	test
tags/1.5.0
huanghaiquan 4 years ago
parent
6c80744f00 2a1ebdd151
commit
667c83502b
7 changed files with 10 additions and 11 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      deploy/deploy-gateway/pom.xml
  2. +1
    -1
      deploy/deploy-peer/pom.xml
  3. +2
    -2
      deploy/docker/pom.xml
  4. +2
    -2
      deploy/pom.xml
  5. +1
    -1
      samples/contract-samples/pom.xml
  6. +2
    -3
      samples/pom.xml
  7. +1
    -1
      samples/sdk-samples/pom.xml

+ 1
- 1
deploy/deploy-gateway/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId> <artifactId>deploy-root</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
</parent> </parent>
<artifactId>deploy-gateway</artifactId> <artifactId>deploy-gateway</artifactId>




+ 1
- 1
deploy/deploy-peer/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId> <artifactId>deploy-root</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
</parent> </parent>
<artifactId>deploy-peer</artifactId> <artifactId>deploy-peer</artifactId>




+ 2
- 2
deploy/docker/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId> <artifactId>deploy-root</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
@@ -13,7 +13,7 @@
<artifactId>docker</artifactId> <artifactId>docker</artifactId>
<properties> <properties>
<framework.version>1.4.2.RELEASE</framework.version>
<framework.version>1.4.3.RELEASE</framework.version>
</properties> </properties>


<modules> <modules>


+ 2
- 2
deploy/pom.xml View File

@@ -9,11 +9,11 @@
<relativePath>../project/parent</relativePath> <relativePath>../project/parent</relativePath>
</parent> </parent>
<artifactId>deploy-root</artifactId> <artifactId>deploy-root</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>


<properties> <properties>
<core.version>1.5.0-SNAPSHOT</core.version>
<core.version>1.4.3.RELEASE</core.version>
</properties> </properties>


<modules> <modules>


+ 1
- 1
samples/contract-samples/pom.xml View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId> <artifactId>jdchain-samples</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
</parent> </parent>


<!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 --> <!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->


+ 2
- 3
samples/pom.xml View File

@@ -4,12 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId> <artifactId>jdchain-samples</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>


<properties> <properties>
<framework.version>1.4.2.RELEASE</framework.version>
<core.version>1.5.0-SNAPSHOT</core.version>
<framework.version>1.4.3.RELEASE</framework.version>
</properties> </properties>


<modules> <modules>


+ 1
- 1
samples/sdk-samples/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-samples</artifactId> <artifactId>jdchain-samples</artifactId>
<version>1.4.2.RELEASE</version>
<version>1.4.3.RELEASE</version>
</parent> </parent>
<artifactId>sdk-samples</artifactId> <artifactId>sdk-samples</artifactId>


Write Preview
Loading…
Cancel
Save