From ee57b62938ebaa539cddfc538a9d4bc0717eb8c1 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Fri, 16 Apr 2021 15:57:54 +0800 Subject: [PATCH 1/5] upgraded utils; --- libs/utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/utils b/libs/utils index 31463f40..1f1ab748 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 31463f4010755362333b4fd00902ba4686c63258 +Subproject commit 1f1ab74811e6dc2722a0d68fb70946df78bd9c9f From 2a1ebdd1513e9ce2570439c484c2c12fefd590c9 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Thu, 22 Apr 2021 18:03:27 +0800 Subject: [PATCH 2/5] upgraded the version of parent project and the submodule projects; --- core | 2 +- deploy/deploy-gateway/pom.xml | 2 +- deploy/deploy-peer/pom.xml | 2 +- deploy/docker/pom.xml | 4 ++-- deploy/pom.xml | 4 ++-- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- project | 2 +- samples/contract-samples/pom.xml | 2 +- samples/pom.xml | 4 ++-- samples/sdk-samples/pom.xml | 2 +- test | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core b/core index a7b82381..a5004534 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a7b82381c98ccca9b358dca9eb92e4e654e9f8cf +Subproject commit a500453487d3668579ca6a51f1452e9d15588928 diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml index 1529edfd..366f39f4 100644 --- a/deploy/deploy-gateway/pom.xml +++ b/deploy/deploy-gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.2.RELEASE + 1.4.3.RELEASE deploy-gateway diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml index ae4bcf1c..28efc0a2 100644 --- a/deploy/deploy-peer/pom.xml +++ b/deploy/deploy-peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.2.RELEASE + 1.4.3.RELEASE deploy-peer diff --git a/deploy/docker/pom.xml b/deploy/docker/pom.xml index 9b088a37..e41a5832 100644 --- a/deploy/docker/pom.xml +++ b/deploy/docker/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.2.RELEASE + 1.4.3.RELEASE 4.0.0 pom @@ -13,7 +13,7 @@ docker - 1.4.2.RELEASE + 1.4.3.RELEASE diff --git a/deploy/pom.xml b/deploy/pom.xml index 350e5f58..1f3c5f05 100644 --- a/deploy/pom.xml +++ b/deploy/pom.xml @@ -9,11 +9,11 @@ ../project/parent deploy-root - 1.4.2.RELEASE + 1.4.3.RELEASE pom - 1.4.2.RELEASE + 1.4.3.RELEASE diff --git a/framework b/framework index e205b9f3..080f0d9d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit e205b9f34b7676b48540e9a824af648285d7e9d8 +Subproject commit 080f0d9db47fa834f73a0f6563dafd7df078d36e diff --git a/libs/bft-smart b/libs/bft-smart index 2ac83a9f..78ceef51 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 2ac83a9f75c540aab1d5650d58885682d1e9c482 +Subproject commit 78ceef51ef39dc90f7ba3755dc59e3b600e0fd9d diff --git a/libs/binary-proto b/libs/binary-proto index d9f3b75a..f73aab0d 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit d9f3b75a7c42d669c9b0b22775c5e4ca56c26de2 +Subproject commit f73aab0d6d091f6757d98c0a6650a1d09dd618a8 diff --git a/libs/httpservice b/libs/httpservice index ec00b84c..2ff588e3 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit ec00b84c0609212cee06ede5bc64c661eb559cfe +Subproject commit 2ff588e3adb44e733caf730b27917fa5e46f0129 diff --git a/libs/utils b/libs/utils index 1f1ab748..b1a32567 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 1f1ab74811e6dc2722a0d68fb70946df78bd9c9f +Subproject commit b1a3256714b7c4c59cde91da419bab6a95ed7b46 diff --git a/project b/project index ec38eec4..e6a91274 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit ec38eec4a6269e7abd35d9ea1b67417a97815bf9 +Subproject commit e6a91274cc35748ad903e432aaf34e41b3803702 diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml index 3bac6fc4..76c648ac 100644 --- a/samples/contract-samples/pom.xml +++ b/samples/contract-samples/pom.xml @@ -6,7 +6,7 @@ com.jd.blockchain jdchain-samples - 1.4.2.RELEASE + 1.4.3.RELEASE diff --git a/samples/pom.xml b/samples/pom.xml index 138f9365..90cf1cb6 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.jd.blockchain jdchain-samples - 1.4.2.RELEASE + 1.4.3.RELEASE pom - 1.4.2.RELEASE + 1.4.3.RELEASE diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml index bdf769f1..1d016e69 100644 --- a/samples/sdk-samples/pom.xml +++ b/samples/sdk-samples/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-samples - 1.4.2.RELEASE + 1.4.3.RELEASE sdk-samples diff --git a/test b/test index 7bbb8c23..d45e5331 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 7bbb8c230fd36df520d1f43e6ca249cd4faf8197 +Subproject commit d45e53310d9146ca5ee33b7693bf8c269ba452b3 From 65beabf7f44f1606014c7f59473abdc556ef7637 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Wed, 19 May 2021 18:17:22 +0800 Subject: [PATCH 3/5] initialized the release 1.5.0 branch ; --- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- project | 2 +- test | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework b/framework index 68ff2864..d5bdfe9e 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 68ff2864dd5a9bfb8f3e1ac653483edeedae8799 +Subproject commit d5bdfe9e7bf7a4a5b102308f207c1deb7b9a7472 diff --git a/libs/bft-smart b/libs/bft-smart index 20638532..d1a78b0b 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 20638532de57b8804d24940ce2e8da63a2265e80 +Subproject commit d1a78b0b750f5c2723dcaacc40b14cca374cda75 diff --git a/libs/binary-proto b/libs/binary-proto index d9f3b75a..f73aab0d 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit d9f3b75a7c42d669c9b0b22775c5e4ca56c26de2 +Subproject commit f73aab0d6d091f6757d98c0a6650a1d09dd618a8 diff --git a/libs/httpservice b/libs/httpservice index ec00b84c..2ff588e3 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit ec00b84c0609212cee06ede5bc64c661eb559cfe +Subproject commit 2ff588e3adb44e733caf730b27917fa5e46f0129 diff --git a/libs/utils b/libs/utils index 9499aeb4..b1a32567 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 9499aeb488524398b6f9adcdea5e333bd1167c2a +Subproject commit b1a3256714b7c4c59cde91da419bab6a95ed7b46 diff --git a/project b/project index ec38eec4..e6a91274 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit ec38eec4a6269e7abd35d9ea1b67417a97815bf9 +Subproject commit e6a91274cc35748ad903e432aaf34e41b3803702 diff --git a/test b/test index 104ed695..de460a3f 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 104ed695110ffc22fb2b2f8a1b6c83c79e4a1fb8 +Subproject commit de460a3f0c5d128c2c64d86c40ae6666708de480 From 2af2c5cfe821f9223536cc1cd3fe49236ef949c9 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Mon, 24 May 2021 17:03:45 +0800 Subject: [PATCH 4/5] upgraded version to 1.5.0.RELEASE; --- core | 2 +- deploy/deploy-gateway/pom.xml | 2 +- deploy/deploy-peer/pom.xml | 2 +- deploy/docker/docker-demo/pom.xml | 2 +- deploy/docker/docker-sdk/pom.xml | 2 +- deploy/docker/pom.xml | 2 +- deploy/pom.xml | 6 +++--- framework | 2 +- libs/bft-smart | 2 +- libs/kvdb | 2 +- test | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core b/core index ceffde9a..5f6535bb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ceffde9a029b1de69e3a8258c0ab1e957833c606 +Subproject commit 5f6535bb95dac2d92e4b7d3cb7f1a1d89b026495 diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml index 366f39f4..31de50bf 100644 --- a/deploy/deploy-gateway/pom.xml +++ b/deploy/deploy-gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.3.RELEASE + 1.5.0.RELEASE deploy-gateway diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml index 28efc0a2..0def828c 100644 --- a/deploy/deploy-peer/pom.xml +++ b/deploy/deploy-peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.3.RELEASE + 1.5.0.RELEASE deploy-peer diff --git a/deploy/docker/docker-demo/pom.xml b/deploy/docker/docker-demo/pom.xml index 9d53650a..6eb80655 100644 --- a/deploy/docker/docker-demo/pom.xml +++ b/deploy/docker/docker-demo/pom.xml @@ -5,7 +5,7 @@ docker com.jd.blockchain - 1.4.2.RELEASE + 1.5.0.RELEASE 4.0.0 docker-demo diff --git a/deploy/docker/docker-sdk/pom.xml b/deploy/docker/docker-sdk/pom.xml index 87a2a699..974edb25 100644 --- a/deploy/docker/docker-sdk/pom.xml +++ b/deploy/docker/docker-sdk/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain docker - 1.4.2.RELEASE + 1.5.0.RELEASE 4.0.0 diff --git a/deploy/docker/pom.xml b/deploy/docker/pom.xml index e41a5832..c2041624 100644 --- a/deploy/docker/pom.xml +++ b/deploy/docker/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.3.RELEASE + 1.5.0.RELEASE 4.0.0 pom diff --git a/deploy/pom.xml b/deploy/pom.xml index 1f3c5f05..f5491a8e 100644 --- a/deploy/pom.xml +++ b/deploy/pom.xml @@ -5,15 +5,15 @@ com.jd.blockchain jdchain-parent - 1.1.4.RELEASE + 1.1.5.RELEASE ../project/parent deploy-root - 1.4.3.RELEASE + 1.5.0.RELEASE pom - 1.4.3.RELEASE + 1.5.0.RELEASE diff --git a/framework b/framework index d5bdfe9e..bb156244 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit d5bdfe9e7bf7a4a5b102308f207c1deb7b9a7472 +Subproject commit bb156244d8b550bb5022a20417dc368b2ce7533d diff --git a/libs/bft-smart b/libs/bft-smart index d1a78b0b..f9e71773 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit d1a78b0b750f5c2723dcaacc40b14cca374cda75 +Subproject commit f9e717739efe78d9a024ce88aec61876723ad37d diff --git a/libs/kvdb b/libs/kvdb index a1d86d13..9a7235f1 160000 --- a/libs/kvdb +++ b/libs/kvdb @@ -1 +1 @@ -Subproject commit a1d86d133b544e5c765aa460d66188e0bb18e7ee +Subproject commit 9a7235f1eb63f7f22bc1f5995778633c9a086c89 diff --git a/test b/test index de460a3f..f327dda2 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit de460a3f0c5d128c2c64d86c40ae6666708de480 +Subproject commit f327dda22070b123e70459848e9922f764912bbe From 014d09c6df5add4a16972c6f38faa13be9e543a7 Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Mon, 24 May 2021 18:43:54 +0800 Subject: [PATCH 5/5] upgraded dependencies; --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/utils | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core b/core index 5f6535bb..f76e5433 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5f6535bb95dac2d92e4b7d3cb7f1a1d89b026495 +Subproject commit f76e54330b448a6eeced3273e773ed1414041d95 diff --git a/framework b/framework index bb156244..b1e758f5 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit bb156244d8b550bb5022a20417dc368b2ce7533d +Subproject commit b1e758f5518198722f7007a282cb26436e192797 diff --git a/libs/bft-smart b/libs/bft-smart index f9e71773..7144cb64 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit f9e717739efe78d9a024ce88aec61876723ad37d +Subproject commit 7144cb6419866f0ae25fc38446e89123d070e611 diff --git a/libs/binary-proto b/libs/binary-proto index f73aab0d..ffe96df9 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit f73aab0d6d091f6757d98c0a6650a1d09dd618a8 +Subproject commit ffe96df97bb7d175b7f8cf18d07fc3fdc74c8485 diff --git a/libs/utils b/libs/utils index b1a32567..6662f189 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit b1a3256714b7c4c59cde91da419bab6a95ed7b46 +Subproject commit 6662f18965b23910f04432488a9e10893e94f21d