From d951e9ae00d910a1b47a11fcf4f84f27a9309a69 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Tue, 10 Dec 2019 10:35:13 +0800 Subject: [PATCH 01/10] Upgraded to version 1.1.2.RELEASE; --- source/base/pom.xml | 2 +- source/binary-proto/pom.xml | 2 +- source/consensus/consensus-bftsmart/pom.xml | 2 +- source/consensus/consensus-framework/pom.xml | 2 +- source/consensus/consensus-mq/pom.xml | 2 +- source/consensus/pom.xml | 2 +- source/contract/contract-framework/pom.xml | 2 +- source/contract/contract-jvm/pom.xml | 2 +- source/contract/contract-maven-plugin/pom.xml | 2 +- source/contract/contract-samples/pom.xml | 2 +- source/contract/pom.xml | 2 +- source/crypto/crypto-adv/pom.xml | 2 +- source/crypto/crypto-classic/pom.xml | 2 +- source/crypto/crypto-framework/pom.xml | 2 +- source/crypto/crypto-pki/pom.xml | 2 +- source/crypto/crypto-sm/pom.xml | 2 +- source/crypto/pom.xml | 2 +- source/deployment/deployment-gateway/pom.xml | 2 +- source/deployment/deployment-peer/pom.xml | 2 +- source/deployment/pom.xml | 2 +- source/gateway/pom.xml | 2 +- source/ledger/ledger-core/pom.xml | 2 +- source/ledger/ledger-model/pom.xml | 2 +- source/ledger/ledger-rpc/pom.xml | 2 +- source/ledger/pom.xml | 2 +- source/manager/manager-booter/pom.xml | 2 +- source/manager/manager-model/pom.xml | 2 +- source/manager/manager-service/pom.xml | 2 +- source/manager/manager-web/pom.xml | 2 +- source/manager/pom.xml | 2 +- source/peer/pom.xml | 2 +- source/pom.xml | 2 +- source/runtime/pom.xml | 2 +- source/runtime/runtime-context/pom.xml | 2 +- source/runtime/runtime-modular-booter/pom.xml | 2 +- source/runtime/runtime-modular/pom.xml | 2 +- source/sdk/pom.xml | 2 +- source/sdk/sdk-base/pom.xml | 2 +- source/sdk/sdk-client/pom.xml | 2 +- source/sdk/sdk-samples/pom.xml | 2 +- source/storage/pom.xml | 2 +- source/storage/storage-composite/pom.xml | 2 +- source/storage/storage-redis/pom.xml | 2 +- source/storage/storage-rocksdb/pom.xml | 2 +- source/storage/storage-service/pom.xml | 2 +- source/test/pom.xml | 2 +- source/test/test-consensus-client/pom.xml | 2 +- source/test/test-consensus-node/pom.xml | 4 ++-- source/test/test-integration/pom.xml | 2 +- source/test/test-ledger/pom.xml | 2 +- source/tools/pom.xml | 2 +- source/tools/tools-initializer-booter/pom.xml | 2 +- source/tools/tools-initializer/pom.xml | 2 +- source/tools/tools-keygen-booter/pom.xml | 2 +- source/tools/tools-keygen/pom.xml | 2 +- source/utils/pom.xml | 2 +- source/utils/utils-common/pom.xml | 2 +- source/utils/utils-http/pom.xml | 2 +- source/utils/utils-serialize/pom.xml | 2 +- source/utils/utils-test/pom.xml | 2 +- source/utils/utils-web-server/pom.xml | 2 +- source/utils/utils-web/pom.xml | 2 +- 62 files changed, 63 insertions(+), 63 deletions(-) diff --git a/source/base/pom.xml b/source/base/pom.xml index 4e5bc72a..ca3f56cf 100644 --- a/source/base/pom.xml +++ b/source/base/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE base diff --git a/source/binary-proto/pom.xml b/source/binary-proto/pom.xml index 2eb6482c..50c1debc 100644 --- a/source/binary-proto/pom.xml +++ b/source/binary-proto/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE binary-proto diff --git a/source/consensus/consensus-bftsmart/pom.xml b/source/consensus/consensus-bftsmart/pom.xml index 39743832..3a21c5e4 100644 --- a/source/consensus/consensus-bftsmart/pom.xml +++ b/source/consensus/consensus-bftsmart/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain consensus - 1.2.0-SNAPSHOT + 1.1.2.RELEASE consensus-bftsmart diff --git a/source/consensus/consensus-framework/pom.xml b/source/consensus/consensus-framework/pom.xml index 9d4fbef4..9409e169 100644 --- a/source/consensus/consensus-framework/pom.xml +++ b/source/consensus/consensus-framework/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain consensus - 1.2.0-SNAPSHOT + 1.1.2.RELEASE consensus-framework diff --git a/source/consensus/consensus-mq/pom.xml b/source/consensus/consensus-mq/pom.xml index 7b0f3431..c1b13078 100644 --- a/source/consensus/consensus-mq/pom.xml +++ b/source/consensus/consensus-mq/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain consensus - 1.2.0-SNAPSHOT + 1.1.2.RELEASE consensus-mq diff --git a/source/consensus/pom.xml b/source/consensus/pom.xml index 98a52f47..c5ad1d10 100644 --- a/source/consensus/pom.xml +++ b/source/consensus/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE consensus pom diff --git a/source/contract/contract-framework/pom.xml b/source/contract/contract-framework/pom.xml index 7fa67cf1..cf934009 100644 --- a/source/contract/contract-framework/pom.xml +++ b/source/contract/contract-framework/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain contract - 1.2.0-SNAPSHOT + 1.1.2.RELEASE contract-framework diff --git a/source/contract/contract-jvm/pom.xml b/source/contract/contract-jvm/pom.xml index 338282ea..19501b8b 100644 --- a/source/contract/contract-jvm/pom.xml +++ b/source/contract/contract-jvm/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain contract - 1.2.0-SNAPSHOT + 1.1.2.RELEASE contract-jvm diff --git a/source/contract/contract-maven-plugin/pom.xml b/source/contract/contract-maven-plugin/pom.xml index 064d2155..91c815b7 100644 --- a/source/contract/contract-maven-plugin/pom.xml +++ b/source/contract/contract-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain contract - 1.2.0-SNAPSHOT + 1.1.2.RELEASE contract-maven-plugin maven-plugin diff --git a/source/contract/contract-samples/pom.xml b/source/contract/contract-samples/pom.xml index 982dd45f..15ac70d8 100644 --- a/source/contract/contract-samples/pom.xml +++ b/source/contract/contract-samples/pom.xml @@ -5,7 +5,7 @@ contract com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/contract/pom.xml b/source/contract/pom.xml index 7e7415b1..d88eb189 100644 --- a/source/contract/pom.xml +++ b/source/contract/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE contract pom diff --git a/source/crypto/crypto-adv/pom.xml b/source/crypto/crypto-adv/pom.xml index c54e45d6..4841494b 100644 --- a/source/crypto/crypto-adv/pom.xml +++ b/source/crypto/crypto-adv/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.2.0-SNAPSHOT + 1.1.2.RELEASE crypto-adv diff --git a/source/crypto/crypto-classic/pom.xml b/source/crypto/crypto-classic/pom.xml index 451c815e..1b15926b 100644 --- a/source/crypto/crypto-classic/pom.xml +++ b/source/crypto/crypto-classic/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.2.0-SNAPSHOT + 1.1.2.RELEASE crypto-classic diff --git a/source/crypto/crypto-framework/pom.xml b/source/crypto/crypto-framework/pom.xml index 04a196dc..b720b24a 100644 --- a/source/crypto/crypto-framework/pom.xml +++ b/source/crypto/crypto-framework/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.2.0-SNAPSHOT + 1.1.2.RELEASE crypto-framework diff --git a/source/crypto/crypto-pki/pom.xml b/source/crypto/crypto-pki/pom.xml index 61bde981..f4633b41 100644 --- a/source/crypto/crypto-pki/pom.xml +++ b/source/crypto/crypto-pki/pom.xml @@ -5,7 +5,7 @@ crypto com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/crypto/crypto-sm/pom.xml b/source/crypto/crypto-sm/pom.xml index 390e9661..9aa68f29 100644 --- a/source/crypto/crypto-sm/pom.xml +++ b/source/crypto/crypto-sm/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain crypto - 1.2.0-SNAPSHOT + 1.1.2.RELEASE crypto-sm diff --git a/source/crypto/pom.xml b/source/crypto/pom.xml index 87f6eeac..f9774b54 100644 --- a/source/crypto/pom.xml +++ b/source/crypto/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE crypto pom diff --git a/source/deployment/deployment-gateway/pom.xml b/source/deployment/deployment-gateway/pom.xml index bc75783a..ea4f9310 100644 --- a/source/deployment/deployment-gateway/pom.xml +++ b/source/deployment/deployment-gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deployment - 1.2.0-SNAPSHOT + 1.1.2.RELEASE deployment-gateway diff --git a/source/deployment/deployment-peer/pom.xml b/source/deployment/deployment-peer/pom.xml index 68ea5088..266e5855 100644 --- a/source/deployment/deployment-peer/pom.xml +++ b/source/deployment/deployment-peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deployment - 1.2.0-SNAPSHOT + 1.1.2.RELEASE deployment-peer diff --git a/source/deployment/pom.xml b/source/deployment/pom.xml index 9967e8bc..fef74936 100644 --- a/source/deployment/pom.xml +++ b/source/deployment/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE deployment pom diff --git a/source/gateway/pom.xml b/source/gateway/pom.xml index fe6f798a..e7632327 100644 --- a/source/gateway/pom.xml +++ b/source/gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE gateway diff --git a/source/ledger/ledger-core/pom.xml b/source/ledger/ledger-core/pom.xml index 861249a4..cbbfd67b 100644 --- a/source/ledger/ledger-core/pom.xml +++ b/source/ledger/ledger-core/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain ledger - 1.2.0-SNAPSHOT + 1.1.2.RELEASE ledger-core diff --git a/source/ledger/ledger-model/pom.xml b/source/ledger/ledger-model/pom.xml index 1fcc2240..90b5a759 100644 --- a/source/ledger/ledger-model/pom.xml +++ b/source/ledger/ledger-model/pom.xml @@ -6,7 +6,7 @@ com.jd.blockchain ledger - 1.2.0-SNAPSHOT + 1.1.2.RELEASE ledger-model diff --git a/source/ledger/ledger-rpc/pom.xml b/source/ledger/ledger-rpc/pom.xml index 25153901..57a8cf9f 100644 --- a/source/ledger/ledger-rpc/pom.xml +++ b/source/ledger/ledger-rpc/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain ledger - 1.2.0-SNAPSHOT + 1.1.2.RELEASE ledger-rpc diff --git a/source/ledger/pom.xml b/source/ledger/pom.xml index 42f6e4e4..d5049b8c 100644 --- a/source/ledger/pom.xml +++ b/source/ledger/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE ledger pom diff --git a/source/manager/manager-booter/pom.xml b/source/manager/manager-booter/pom.xml index 65668cc6..e4764486 100644 --- a/source/manager/manager-booter/pom.xml +++ b/source/manager/manager-booter/pom.xml @@ -5,7 +5,7 @@ manager com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/manager/manager-model/pom.xml b/source/manager/manager-model/pom.xml index c0a88a21..fd35f6d9 100644 --- a/source/manager/manager-model/pom.xml +++ b/source/manager/manager-model/pom.xml @@ -5,7 +5,7 @@ manager com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/manager/manager-service/pom.xml b/source/manager/manager-service/pom.xml index 8ee81999..4ea9f334 100644 --- a/source/manager/manager-service/pom.xml +++ b/source/manager/manager-service/pom.xml @@ -5,7 +5,7 @@ manager com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/manager/manager-web/pom.xml b/source/manager/manager-web/pom.xml index b9172eed..0ec34f4a 100644 --- a/source/manager/manager-web/pom.xml +++ b/source/manager/manager-web/pom.xml @@ -5,7 +5,7 @@ manager com.jd.blockchain - 1.2.0-SNAPSHOT + 1.1.2.RELEASE 4.0.0 diff --git a/source/manager/pom.xml b/source/manager/pom.xml index 7416e033..a59378a9 100644 --- a/source/manager/pom.xml +++ b/source/manager/pom.xml @@ -11,7 +11,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE manager pom diff --git a/source/peer/pom.xml b/source/peer/pom.xml index 20cc29f1..23a08185 100644 --- a/source/peer/pom.xml +++ b/source/peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE peer diff --git a/source/pom.xml b/source/pom.xml index 5b9d0c10..12932397 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -11,7 +11,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE pom jdchain diff --git a/source/runtime/pom.xml b/source/runtime/pom.xml index 03c60442..e78338ce 100644 --- a/source/runtime/pom.xml +++ b/source/runtime/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE runtime pom diff --git a/source/runtime/runtime-context/pom.xml b/source/runtime/runtime-context/pom.xml index ee955aa2..33a72651 100644 --- a/source/runtime/runtime-context/pom.xml +++ b/source/runtime/runtime-context/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain runtime - 1.2.0-SNAPSHOT + 1.1.2.RELEASE runtime-context diff --git a/source/runtime/runtime-modular-booter/pom.xml b/source/runtime/runtime-modular-booter/pom.xml index bb812b18..d641b32a 100644 --- a/source/runtime/runtime-modular-booter/pom.xml +++ b/source/runtime/runtime-modular-booter/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain runtime - 1.2.0-SNAPSHOT + 1.1.2.RELEASE runtime-modular-booter \ No newline at end of file diff --git a/source/runtime/runtime-modular/pom.xml b/source/runtime/runtime-modular/pom.xml index afccee46..fc54d0ef 100644 --- a/source/runtime/runtime-modular/pom.xml +++ b/source/runtime/runtime-modular/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain runtime - 1.2.0-SNAPSHOT + 1.1.2.RELEASE runtime-modular diff --git a/source/sdk/pom.xml b/source/sdk/pom.xml index 177972f5..c4037224 100644 --- a/source/sdk/pom.xml +++ b/source/sdk/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE sdk pom diff --git a/source/sdk/sdk-base/pom.xml b/source/sdk/sdk-base/pom.xml index 35f3d418..6ce41769 100644 --- a/source/sdk/sdk-base/pom.xml +++ b/source/sdk/sdk-base/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain sdk - 1.2.0-SNAPSHOT + 1.1.2.RELEASE sdk-base diff --git a/source/sdk/sdk-client/pom.xml b/source/sdk/sdk-client/pom.xml index 6cca87b7..e2e995f4 100644 --- a/source/sdk/sdk-client/pom.xml +++ b/source/sdk/sdk-client/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain sdk - 1.2.0-SNAPSHOT + 1.1.2.RELEASE sdk-client diff --git a/source/sdk/sdk-samples/pom.xml b/source/sdk/sdk-samples/pom.xml index 11b66a9f..ece0c958 100644 --- a/source/sdk/sdk-samples/pom.xml +++ b/source/sdk/sdk-samples/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain sdk - 1.2.0-SNAPSHOT + 1.1.2.RELEASE sdk-samples diff --git a/source/storage/pom.xml b/source/storage/pom.xml index ce1595a4..7e432edd 100644 --- a/source/storage/pom.xml +++ b/source/storage/pom.xml @@ -3,7 +3,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE storage pom diff --git a/source/storage/storage-composite/pom.xml b/source/storage/storage-composite/pom.xml index 9957f4d3..176a447e 100644 --- a/source/storage/storage-composite/pom.xml +++ b/source/storage/storage-composite/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain storage - 1.2.0-SNAPSHOT + 1.1.2.RELEASE storage-composite diff --git a/source/storage/storage-redis/pom.xml b/source/storage/storage-redis/pom.xml index cd48ebbb..25cd1816 100644 --- a/source/storage/storage-redis/pom.xml +++ b/source/storage/storage-redis/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain storage - 1.2.0-SNAPSHOT + 1.1.2.RELEASE storage-redis diff --git a/source/storage/storage-rocksdb/pom.xml b/source/storage/storage-rocksdb/pom.xml index 23650a53..92246ef2 100644 --- a/source/storage/storage-rocksdb/pom.xml +++ b/source/storage/storage-rocksdb/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain storage - 1.2.0-SNAPSHOT + 1.1.2.RELEASE storage-rocksdb diff --git a/source/storage/storage-service/pom.xml b/source/storage/storage-service/pom.xml index c6672b83..5e50de10 100644 --- a/source/storage/storage-service/pom.xml +++ b/source/storage/storage-service/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain storage - 1.2.0-SNAPSHOT + 1.1.2.RELEASE storage-service diff --git a/source/test/pom.xml b/source/test/pom.xml index 75594838..5219328f 100644 --- a/source/test/pom.xml +++ b/source/test/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE test pom diff --git a/source/test/test-consensus-client/pom.xml b/source/test/test-consensus-client/pom.xml index 9a202d4d..78bc7c75 100644 --- a/source/test/test-consensus-client/pom.xml +++ b/source/test/test-consensus-client/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain test - 1.2.0-SNAPSHOT + 1.1.2.RELEASE test-consensus-client diff --git a/source/test/test-consensus-node/pom.xml b/source/test/test-consensus-node/pom.xml index 49362e12..af98ce14 100644 --- a/source/test/test-consensus-node/pom.xml +++ b/source/test/test-consensus-node/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain test - 1.2.0-SNAPSHOT + 1.1.2.RELEASE test-consensus-node @@ -38,7 +38,7 @@ com.jd.blockchain consensus-bftsmart - 1.2.0-SNAPSHOT + 1.1.2.RELEASE org.springframework.boot diff --git a/source/test/test-integration/pom.xml b/source/test/test-integration/pom.xml index 37e3a382..4f63af4d 100644 --- a/source/test/test-integration/pom.xml +++ b/source/test/test-integration/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain test - 1.2.0-SNAPSHOT + 1.1.2.RELEASE test-integration diff --git a/source/test/test-ledger/pom.xml b/source/test/test-ledger/pom.xml index fa9421da..5c001f85 100644 --- a/source/test/test-ledger/pom.xml +++ b/source/test/test-ledger/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain test - 1.2.0-SNAPSHOT + 1.1.2.RELEASE test-ledger diff --git a/source/tools/pom.xml b/source/tools/pom.xml index aada0db1..1671c46f 100644 --- a/source/tools/pom.xml +++ b/source/tools/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE tools pom diff --git a/source/tools/tools-initializer-booter/pom.xml b/source/tools/tools-initializer-booter/pom.xml index 06dd8b35..4c012f35 100644 --- a/source/tools/tools-initializer-booter/pom.xml +++ b/source/tools/tools-initializer-booter/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain tools - 1.2.0-SNAPSHOT + 1.1.2.RELEASE tools-initializer-booter diff --git a/source/tools/tools-initializer/pom.xml b/source/tools/tools-initializer/pom.xml index be338342..b97c7890 100644 --- a/source/tools/tools-initializer/pom.xml +++ b/source/tools/tools-initializer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain tools - 1.2.0-SNAPSHOT + 1.1.2.RELEASE tools-initializer diff --git a/source/tools/tools-keygen-booter/pom.xml b/source/tools/tools-keygen-booter/pom.xml index d6d8c7ea..edfe4824 100644 --- a/source/tools/tools-keygen-booter/pom.xml +++ b/source/tools/tools-keygen-booter/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain tools - 1.2.0-SNAPSHOT + 1.1.2.RELEASE tools-keygen-booter diff --git a/source/tools/tools-keygen/pom.xml b/source/tools/tools-keygen/pom.xml index 2be928a4..5ed95354 100644 --- a/source/tools/tools-keygen/pom.xml +++ b/source/tools/tools-keygen/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain tools - 1.2.0-SNAPSHOT + 1.1.2.RELEASE tools-keygen diff --git a/source/utils/pom.xml b/source/utils/pom.xml index a74e5bb8..a9233b6d 100644 --- a/source/utils/pom.xml +++ b/source/utils/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain jdchain-root - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils pom diff --git a/source/utils/utils-common/pom.xml b/source/utils/utils-common/pom.xml index f9458f84..04fec308 100644 --- a/source/utils/utils-common/pom.xml +++ b/source/utils/utils-common/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils-common diff --git a/source/utils/utils-http/pom.xml b/source/utils/utils-http/pom.xml index 4ebf530f..5f6236f4 100644 --- a/source/utils/utils-http/pom.xml +++ b/source/utils/utils-http/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE diff --git a/source/utils/utils-serialize/pom.xml b/source/utils/utils-serialize/pom.xml index 35769588..acdd4ed2 100644 --- a/source/utils/utils-serialize/pom.xml +++ b/source/utils/utils-serialize/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils-serialize diff --git a/source/utils/utils-test/pom.xml b/source/utils/utils-test/pom.xml index ebeeab34..0fce0b58 100644 --- a/source/utils/utils-test/pom.xml +++ b/source/utils/utils-test/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils-test diff --git a/source/utils/utils-web-server/pom.xml b/source/utils/utils-web-server/pom.xml index d654c613..109fd82e 100644 --- a/source/utils/utils-web-server/pom.xml +++ b/source/utils/utils-web-server/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils-web-server diff --git a/source/utils/utils-web/pom.xml b/source/utils/utils-web/pom.xml index 055dcef4..b635dfb0 100644 --- a/source/utils/utils-web/pom.xml +++ b/source/utils/utils-web/pom.xml @@ -4,7 +4,7 @@ com.jd.blockchain utils - 1.2.0-SNAPSHOT + 1.1.2.RELEASE utils-web From a20940804702e2bd2146f4fb3ce96b33405259da Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Tue, 10 Dec 2019 17:35:43 +0800 Subject: [PATCH 02/10] Updated dependencies of data-explorer and manager-explorer; --- source/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/pom.xml b/source/pom.xml index 12932397..d2195de0 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -36,8 +36,8 @@ 0.3.0.RELEASE - 1.2.0-SNAPSHOT - 1.2.0-SNAPSHOT + 1.1.2.RELEASE + 1.1.2.RELEASE 2.4 3.3.0 1.2.2 From d32ac90e78d51b62a4bba6a80800378911234261 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Wed, 11 Dec 2019 10:31:11 +0800 Subject: [PATCH 03/10] add lineEnding:unix --- .../deployment-gateway/src/main/resources/assembly.xml | 3 +++ .../deployment/deployment-peer/src/main/resources/assembly.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/deployment/deployment-gateway/src/main/resources/assembly.xml b/source/deployment/deployment-gateway/src/main/resources/assembly.xml index 39811c14..861990d0 100644 --- a/source/deployment/deployment-gateway/src/main/resources/assembly.xml +++ b/source/deployment/deployment-gateway/src/main/resources/assembly.xml @@ -12,14 +12,17 @@ src/main/resources/scripts bin + unix src/main/resources/config config + unix src/main/resources/docs docs + unix diff --git a/source/deployment/deployment-peer/src/main/resources/assembly.xml b/source/deployment/deployment-peer/src/main/resources/assembly.xml index 881c0aef..37aa494c 100644 --- a/source/deployment/deployment-peer/src/main/resources/assembly.xml +++ b/source/deployment/deployment-peer/src/main/resources/assembly.xml @@ -12,14 +12,17 @@ src/main/resources/scripts bin + unix src/main/resources/config config + unix src/main/resources/docs docs + unix From 8cee2ee38e6945cc7f163f37900be7d343f9eeb7 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 10:47:10 +0800 Subject: [PATCH 04/10] not use the oss-parent node in the central library publishing. fill some info related in the proifle and distributionManagement node; --- source/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/source/pom.xml b/source/pom.xml index d2195de0..2e7dbd5b 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -515,7 +515,63 @@ -Xdoclint:none + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + From cc531006d70b925262f4524e0a6e7564f65065d2 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 18:32:20 +0800 Subject: [PATCH 05/10] add the param: jdchain.log; --- .../blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java index ec77fbee..1ccf994c 100644 --- a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java +++ b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java @@ -53,6 +53,7 @@ public class LedgerInitializeWeb4Nodes { System.setProperty("peer.log", path); System.setProperty("init.log", path); System.setProperty("gateway.log", path); + System.setProperty("jdchain.log", path); } catch (Exception e) { e.printStackTrace(); } From 69b013c75b3346e670ad1fb5c1cd18f46aaa86e5 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 19:08:05 +0800 Subject: [PATCH 06/10] add the interface: 6.8 /ledgers/{ledger}/accounts/{address}/entries-version --- .../src/main/resources/docs/api_doc_cn_1.4.MD | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD b/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD index 7ff79c96..017b97d2 100644 --- a/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD +++ b/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD @@ -1768,7 +1768,7 @@ KVInfoVO对应格式如下： KVInfoVO说明： + 1）支持多个Key作为入参； - + + 2）每个Key支持多个version； @@ -1808,6 +1808,57 @@ http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/ |type|value类型| |value|值| +### 6.9 查询某数据账户键数量 +``` +GET /ledgers/{ledger}/accounts/address/{address}/keys/count/search?keyword={keyword} +``` +#### 参数 +请求类型 | 名称 | 是否必需 | 说明 | 数据类型 +--- | --- | --- | --- | --- +path | ledger | 是 | 所要搜索的账本，需要完整的账本哈希 | string +path | address | 是 | 所要搜索的数据账户地址，需要完整的数据账户地址 | string +query | keyword | 否 | 键的部分字符，空表示全部 | string + +#### 请求实例 +``` +http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/address/5Sm4gWXrNpDWW9Boi4xZCzZMHboRvEDm29Fa/keys/count/search?keyword=j +``` +#### 返回实例 +``` +{ "data": 66, "success": true } +``` +说明 + +名称 | 说明 +--- | --- +data | 条件查询键总数 + +### 6.10 查询某数据账户键 +``` +GET /ledgers/{ledger}/accounts/address/{address}/keys/search?keyword={keyword}&fromIndex={start_index}&count={count} +``` +#### 参数 +请求类型 | 名称 | 是否必需 | 说明 | 数据类型 +--- | --- | --- | --- | --- +path | ledger | 是 | 所要搜索的账本，需要完整的账本哈希 | string +path | address | 是 | 所要搜索的数据账户地址，需要完整的数据账户地址 | string +query | keyword | 否 | 键的部分字符，空表示全部 | string +query | start_index | 否 | 查询数据账户对应Key的起始序号，默认为0 | 数字 +query | count | 否 | 查询返回数据账户对应Key的数量，默认最大返回值为100，小于0或大于100均返回最大可返回结果集 | 数字 + +#### 请求实例 +``` +http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/address/5Sm4gWXrNpDWW9Boi4xZCzZMHboRvEDm29Fa/keys/search?keyword=j&fromIndex=0&count=-1 +``` +#### 返回实例 +``` +{ "data": [ { "key": "jd" }, { "key": "jdchain" }], "success": true } +``` +说明 + +名称 | 说明 +--- | --- +key | 键 ## 7 搜索 From 30babb99babf6e6d79358aa0965b555e6897a02b Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Fri, 13 Dec 2019 11:06:24 +0800 Subject: [PATCH 07/10] delete the Unnecessary content: unix --- .../deployment-gateway/src/main/resources/assembly.xml | 2 -- .../deployment/deployment-peer/src/main/resources/assembly.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/assembly.xml b/source/deployment/deployment-gateway/src/main/resources/assembly.xml index 861990d0..bcfb659f 100644 --- a/source/deployment/deployment-gateway/src/main/resources/assembly.xml +++ b/source/deployment/deployment-gateway/src/main/resources/assembly.xml @@ -17,12 +17,10 @@ src/main/resources/config config - unix src/main/resources/docs docs - unix diff --git a/source/deployment/deployment-peer/src/main/resources/assembly.xml b/source/deployment/deployment-peer/src/main/resources/assembly.xml index 37aa494c..b5de9443 100644 --- a/source/deployment/deployment-peer/src/main/resources/assembly.xml +++ b/source/deployment/deployment-peer/src/main/resources/assembly.xml @@ -17,12 +17,10 @@ src/main/resources/config config - unix src/main/resources/docs docs - unix From 80eab59bd81ae2e00aa8694390a7e60f13e34758 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Sat, 14 Dec 2019 18:03:01 +0800 Subject: [PATCH 08/10] penetration search set the default url:127.0.0.1; --- .../manager-booter/src/main/resources/application.properties | 4 ++-- .../manager-booter/src/main/resources/config.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/manager/manager-booter/src/main/resources/application.properties b/source/manager/manager-booter/src/main/resources/application.properties index c64be53e..6c57c8ee 100644 --- a/source/manager/manager-booter/src/main/resources/application.properties +++ b/source/manager/manager-booter/src/main/resources/application.properties @@ -4,5 +4,5 @@ spring.mvc.favicon.enabled=false logging.config=classpath:log4j2-jump.xml -retrieval.schemaUrl=http://192.168.151.40:8082 -retrieval.taskUrl=http://192.168.151.40:10005 \ No newline at end of file +retrieval.schemaUrl=http://127.0.0.1:8082 +retrieval.taskUrl=http://127.0.0.1:10005 \ No newline at end of file diff --git a/source/manager/manager-booter/src/main/resources/config.properties b/source/manager/manager-booter/src/main/resources/config.properties index ac5a026f..d4f39051 100644 --- a/source/manager/manager-booter/src/main/resources/config.properties +++ b/source/manager/manager-booter/src/main/resources/config.properties @@ -7,5 +7,5 @@ server.port=8080 # 本地数据库存储位置 db.url=rocksdb://#project#/jumpdb -schema.retrieval.url=http://192.168.151.40:8082 -task.retrieval.url=http://192.168.151.40:10005 \ No newline at end of file +retrieval.schemaUrl=http://127.0.0.1:8082 +retrieval.taskUrl=http://127.0.0.1:10005 \ No newline at end of file From da2756d1d13f4573e8c3a457977d6f0d360a8821 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Sat, 14 Dec 2019 18:07:52 +0800 Subject: [PATCH 09/10] penetration search set the default url:127.0.0.1; --- .../deployment-gateway/src/main/resources/config/gateway.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/config/gateway.conf b/source/deployment/deployment-gateway/src/main/resources/config/gateway.conf index 7d4915d5..b0bcb4af 100644 --- a/source/deployment/deployment-gateway/src/main/resources/config/gateway.conf +++ b/source/deployment/deployment-gateway/src/main/resources/config/gateway.conf @@ -20,7 +20,7 @@ peer.providers=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider #若该值不配置或配置不正确，则浏览器模糊查询部分无法正常显示 #数据检索服务模块（Argus）需单独部署，若不部署其他功能仍可正常使用 data.retrieval.url=http://127.0.0.1:10001 -schema.retrieval.url=http://192.168.151.40:8082 +schema.retrieval.url=http://127.0.0.1:8082 #默认公钥的内容（Base58编码数据）； keys.default.pubkey= From 01ec5b0961749494e5575354314a8d35d6814f4e Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Sat, 14 Dec 2019 18:11:43 +0800 Subject: [PATCH 10/10] penetration search set the default url:127.0.0.1; --- .../manager-booter/src/main/resources/application.properties | 4 ++-- .../manager-booter/src/main/resources/config.properties | 4 ++-- .../main/java/com/jd/blockchain/ump/model/UmpConstant.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/manager/manager-booter/src/main/resources/application.properties b/source/manager/manager-booter/src/main/resources/application.properties index 6c57c8ee..a8959472 100644 --- a/source/manager/manager-booter/src/main/resources/application.properties +++ b/source/manager/manager-booter/src/main/resources/application.properties @@ -4,5 +4,5 @@ spring.mvc.favicon.enabled=false logging.config=classpath:log4j2-jump.xml -retrieval.schemaUrl=http://127.0.0.1:8082 -retrieval.taskUrl=http://127.0.0.1:10005 \ No newline at end of file +schema.retrieval.url=http://127.0.0.1:8082 +task.retrieval.url=http://127.0.0.1:10005 \ No newline at end of file diff --git a/source/manager/manager-booter/src/main/resources/config.properties b/source/manager/manager-booter/src/main/resources/config.properties index d4f39051..bc4e3dc2 100644 --- a/source/manager/manager-booter/src/main/resources/config.properties +++ b/source/manager/manager-booter/src/main/resources/config.properties @@ -7,5 +7,5 @@ server.port=8080 # 本地数据库存储位置 db.url=rocksdb://#project#/jumpdb -retrieval.schemaUrl=http://127.0.0.1:8082 -retrieval.taskUrl=http://127.0.0.1:10005 \ No newline at end of file +schema.retrieval.url=http://127.0.0.1:8082 +task.retrieval.url=http://127.0.0.1:10005 \ No newline at end of file diff --git a/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java index de388c8b..7903620c 100644 --- a/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java +++ b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java @@ -134,6 +134,6 @@ public class UmpConstant { public static final String ALL_LEDGER="all_ledger"; public static final String DELIMETER_MINUS = "-"; public static final String SCHEMA_PREFIX = "schema_"; - public static final String SCHEMA_RETRIEVAL_URL = "retrieval.schemaUrl"; - public static final String TASK_RETRIEVAL_URL = "retrieval.taskUrl"; + public static final String SCHEMA_RETRIEVAL_URL = "schema.retrieval.url"; + public static final String TASK_RETRIEVAL_URL = "task.retrieval.url"; }