# Conflicts:
#	source/base/pom.xml
#	source/binary-proto/pom.xml
#	source/consensus/consensus-bftsmart/pom.xml
#	source/consensus/consensus-framework/pom.xml
#	source/consensus/consensus-mq/pom.xml
#	source/consensus/pom.xml
#	source/contract/contract-framework/pom.xml
#	source/contract/contract-jvm/pom.xml
#	source/contract/contract-maven-plugin/pom.xml
#	source/contract/contract-samples/pom.xml
#	source/contract/pom.xml
#	source/crypto/crypto-adv/pom.xml
#	source/crypto/crypto-classic/pom.xml
#	source/crypto/crypto-framework/pom.xml
#	source/crypto/crypto-pki/pom.xml
#	source/crypto/crypto-sm/pom.xml
#	source/crypto/pom.xml
#	source/deployment/deployment-gateway/pom.xml
#	source/deployment/deployment-peer/pom.xml
#	source/deployment/pom.xml
#	source/gateway/pom.xml
#	source/ledger/ledger-core/pom.xml
#	source/ledger/ledger-model/pom.xml
#	source/ledger/ledger-rpc/pom.xml
#	source/ledger/pom.xml
#	source/peer/pom.xml
#	source/pom.xml
#	source/runtime/pom.xml
#	source/runtime/runtime-context/pom.xml
#	source/runtime/runtime-modular-booter/pom.xml
#	source/runtime/runtime-modular/pom.xml
#	source/sdk/pom.xml
#	source/sdk/sdk-base/pom.xml
#	source/sdk/sdk-client/pom.xml
#	source/sdk/sdk-samples/pom.xml
#	source/storage/pom.xml
#	source/storage/storage-composite/pom.xml
#	source/storage/storage-redis/pom.xml
#	source/storage/storage-rocksdb/pom.xml
#	source/storage/storage-service/pom.xml
#	source/test/pom.xml
#	source/test/test-consensus-client/pom.xml
#	source/test/test-consensus-node/pom.xml
#	source/test/test-integration/pom.xml
#	source/test/test-ledger-core/pom.xml
#	source/tools/pom.xml
#	source/tools/tools-capability/pom.xml
#	source/tools/tools-initializer-booter/pom.xml
#	source/tools/tools-initializer/pom.xml
#	source/tools/tools-keygen-booter/pom.xml
#	source/tools/tools-keygen/pom.xml
#	source/tools/tools-mocker/pom.xml
#	source/utils/pom.xml
#	source/utils/utils-common/pom.xml
#	source/utils/utils-http/pom.xml
#	source/utils/utils-serialize/pom.xml
#	source/utils/utils-test/pom.xml
#	source/utils/utils-web-server/pom.xml
#	source/utils/utils-web/pom.xml

# Conflicts:
#	source/sdk/sdk-base/pom.xml
#	source/storage/storage-redis/pom.xml
#	source/storage/storage-service/pom.xml

# Conflicts:
#	source/pom.xml
#	source/storage/storage-service/src/test/java/test/com/jd/blockchain/storage/service/utils/BufferedKVStorageTest.java

fixed the bug: get 10+ results by /accounts/.../entries?fromIndex=10&count=10, no results in the seconds page;
delete the modules of stp/state-transfer/crypto-impl;
delete the dependency out the dependencyManagement

# Conflicts:
#	source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java

# Conflicts:
#	source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java