release 1.6.0

jd-opensource · Oct 29, 2021 · bbbf841 · bbbf841
1 parent f7dc61f
commit bbbf841
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/core b/core
diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.6.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-gateway</artifactId>
 

diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.6.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -5,15 +5,15 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.RELEASE</version>
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.6.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<core.version>1.6.0-SNAPSHOT</core.version>
+		<core.version>1.6.0.RELEASE</core.version>
 	</properties>
 
 	<modules>

diff --git a/docs/contract.md b/docs/contract.md
@@ -90,7 +90,7 @@ JD Chain 以 Java 语言作为合约代码语言，合约引擎是基于 JVM 构
   <packaging>contract</packaging>
 
   <properties>
-     <jdchain.version>1.4.2.RELEASE</jdchain.version>
+     <jdchain.version>1.6.0.RELEASE</jdchain.version>
   </properties>
 
   <dependencies>

diff --git a/explorer b/explorer
diff --git a/framework b/framework
diff --git a/libs/bft-smart b/libs/bft-smart
diff --git a/libs/binary-proto b/libs/binary-proto
diff --git a/libs/utils b/libs/utils
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.jd.blockchain</groupId>
 	<artifactId>jdchain-root</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.6.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<description>jdchain root project</description>
 

diff --git a/project b/project
diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0.RELEASE</version>
     </parent>
 
     <!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jd.blockchain</groupId>
     <artifactId>jdchain-samples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <framework.version>1.6.0-SNAPSHOT</framework.version>
-        <core.version>1.6.0-SNAPSHOT</core.version>
+        <framework.version>1.6.0.RELEASE</framework.version>
+        <core.version>1.6.0.RELEASE</core.version>
     </properties>
 
     <modules>

diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0.RELEASE</version>
     </parent>
     <artifactId>sdk-samples</artifactId>
 

diff --git a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
@@ -287,7 +287,7 @@ private static void initSampleData(HashDigest ledgerHash) throws IOException {
         txTemp.eventAccounts().register(user.getIdentity());
         txTemp.eventAccount(user.getAddress()).publish("sample-event", "sample-content", -1);
         // 初始化一个合约
-        txTemp.contracts().deploy(user.getIdentity(), FileUtils.readBytes(new ClassPathResource("contract-samples-1.5.0.RELEASE.car").getFile()));
+        txTemp.contracts().deploy(user.getIdentity(), FileUtils.readBytes(new ClassPathResource("contract-samples-1.6.0.RELEASE.car").getFile()));
 
         PreparedTransaction ptx = txTemp.prepare();
         ptx.sign(admin);

diff --git a/samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car b/samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car
diff --git a/samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car b/samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car
diff --git a/samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java b/samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java
@@ -42,7 +42,7 @@ public void testDeploy() {
         BlockchainKeypair contractAccount = BlockchainKeyGenerator.getInstance().generate();
         System.out.println("合约地址：" + contractAccount.getAddress());
         // 部署合约
-        txTemp.contracts().deploy(contractAccount.getIdentity(), FileUtils.readBytes("src/main/resources/contract-samples-1.5.0.RELEASE.car"));
+        txTemp.contracts().deploy(contractAccount.getIdentity(), FileUtils.readBytes("src/main/resources/contract-samples-1.6.0.RELEASE.car"));
         // 准备交易
         PreparedTransaction ptx = txTemp.prepare();
         // 提交交易
@@ -63,7 +63,7 @@ public void testUpdate() {
         BlockchainIdentity contractIdentity = new BlockchainIdentityData(KeyGenUtils.decodePubKey("7VeRCfSaoBW3uRuvTqVb26PYTNwvQ1iZ5HBY92YKpEVN7Qht"));
         System.out.println("合约地址：" + contractIdentity.getAddress());
         // 部署合约
-        txTemp.contracts().deploy(contractIdentity, FileUtils.readBytes("src/main/resources/contract-samples-1.5.0.RELEASE.car"));
+        txTemp.contracts().deploy(contractIdentity, FileUtils.readBytes("src/main/resources/contract-samples-1.6.0.RELEASE.car"));
         // 准备交易
         PreparedTransaction ptx = txTemp.prepare();
         // 提交交易

diff --git a/test b/test