Browse Source

Merge branch 'hotfix/modiftyTransactionState'

tags/1.1.1-PACK20191209^0
huanghaiquan 4 years ago
parent
commit
90c8af1db5
63 changed files with 192 additions and 192 deletions
  1. +1
    -1
      source/base/pom.xml
  2. +1
    -1
      source/binary-proto/pom.xml
  3. +1
    -1
      source/consensus/consensus-bftsmart/pom.xml
  4. +1
    -1
      source/consensus/consensus-framework/pom.xml
  5. +1
    -1
      source/consensus/consensus-mq/pom.xml
  6. +1
    -1
      source/consensus/pom.xml
  7. +1
    -1
      source/contract/contract-framework/pom.xml
  8. +1
    -1
      source/contract/contract-jvm/pom.xml
  9. +1
    -1
      source/contract/contract-maven-plugin/pom.xml
  10. +1
    -1
      source/contract/contract-samples/pom.xml
  11. +1
    -1
      source/contract/pom.xml
  12. +1
    -1
      source/crypto/crypto-adv/pom.xml
  13. +1
    -1
      source/crypto/crypto-classic/pom.xml
  14. +1
    -1
      source/crypto/crypto-framework/pom.xml
  15. +1
    -1
      source/crypto/crypto-pki/pom.xml
  16. +1
    -1
      source/crypto/crypto-sm/pom.xml
  17. +1
    -1
      source/crypto/pom.xml
  18. +1
    -1
      source/deployment/deployment-gateway/pom.xml
  19. +1
    -1
      source/deployment/deployment-peer/pom.xml
  20. +1
    -1
      source/deployment/pom.xml
  21. +1
    -1
      source/gateway/pom.xml
  22. +1
    -1
      source/ledger/ledger-core/pom.xml
  23. +1
    -1
      source/ledger/ledger-model/pom.xml
  24. +129
    -129
      source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionState.java
  25. +1
    -1
      source/ledger/ledger-rpc/pom.xml
  26. +1
    -1
      source/ledger/pom.xml
  27. +1
    -1
      source/manager/manager-booter/pom.xml
  28. +1
    -1
      source/manager/manager-model/pom.xml
  29. +1
    -1
      source/manager/manager-service/pom.xml
  30. +1
    -1
      source/manager/manager-web/pom.xml
  31. +1
    -1
      source/manager/pom.xml
  32. +1
    -1
      source/peer/pom.xml
  33. +1
    -1
      source/pom.xml
  34. +1
    -1
      source/runtime/pom.xml
  35. +1
    -1
      source/runtime/runtime-context/pom.xml
  36. +1
    -1
      source/runtime/runtime-modular-booter/pom.xml
  37. +1
    -1
      source/runtime/runtime-modular/pom.xml
  38. +1
    -1
      source/sdk/pom.xml
  39. +1
    -1
      source/sdk/sdk-base/pom.xml
  40. +1
    -1
      source/sdk/sdk-client/pom.xml
  41. +1
    -1
      source/sdk/sdk-samples/pom.xml
  42. +1
    -1
      source/storage/pom.xml
  43. +1
    -1
      source/storage/storage-composite/pom.xml
  44. +1
    -1
      source/storage/storage-redis/pom.xml
  45. +1
    -1
      source/storage/storage-rocksdb/pom.xml
  46. +1
    -1
      source/storage/storage-service/pom.xml
  47. +1
    -1
      source/test/pom.xml
  48. +1
    -1
      source/test/test-consensus-client/pom.xml
  49. +2
    -2
      source/test/test-consensus-node/pom.xml
  50. +1
    -1
      source/test/test-integration/pom.xml
  51. +1
    -1
      source/test/test-ledger/pom.xml
  52. +1
    -1
      source/tools/pom.xml
  53. +1
    -1
      source/tools/tools-initializer-booter/pom.xml
  54. +1
    -1
      source/tools/tools-initializer/pom.xml
  55. +1
    -1
      source/tools/tools-keygen-booter/pom.xml
  56. +1
    -1
      source/tools/tools-keygen/pom.xml
  57. +1
    -1
      source/utils/pom.xml
  58. +1
    -1
      source/utils/utils-common/pom.xml
  59. +1
    -1
      source/utils/utils-http/pom.xml
  60. +1
    -1
      source/utils/utils-serialize/pom.xml
  61. +1
    -1
      source/utils/utils-test/pom.xml
  62. +1
    -1
      source/utils/utils-web-server/pom.xml
  63. +1
    -1
      source/utils/utils-web/pom.xml

+ 1
- 1
source/base/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>base</artifactId> <artifactId>base</artifactId>




+ 1
- 1
source/binary-proto/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>binary-proto</artifactId> <artifactId>binary-proto</artifactId>




+ 1
- 1
source/consensus/consensus-bftsmart/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>consensus</artifactId> <artifactId>consensus</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>consensus-bftsmart</artifactId> <artifactId>consensus-bftsmart</artifactId>




+ 1
- 1
source/consensus/consensus-framework/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>consensus</artifactId> <artifactId>consensus</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>consensus-framework</artifactId> <artifactId>consensus-framework</artifactId>




+ 1
- 1
source/consensus/consensus-mq/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>consensus</artifactId> <artifactId>consensus</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>consensus-mq</artifactId> <artifactId>consensus-mq</artifactId>




+ 1
- 1
source/consensus/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>consensus</artifactId> <artifactId>consensus</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/contract/contract-framework/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>contract</artifactId> <artifactId>contract</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>contract-framework</artifactId> <artifactId>contract-framework</artifactId>




+ 1
- 1
source/contract/contract-jvm/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>contract</artifactId> <artifactId>contract</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>contract-jvm</artifactId> <artifactId>contract-jvm</artifactId>




+ 1
- 1
source/contract/contract-maven-plugin/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>contract</artifactId> <artifactId>contract</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>contract-maven-plugin</artifactId> <artifactId>contract-maven-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>


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

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>contract</artifactId> <artifactId>contract</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




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

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>contract</artifactId> <artifactId>contract</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/crypto/crypto-adv/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>crypto-adv</artifactId> <artifactId>crypto-adv</artifactId>




+ 1
- 1
source/crypto/crypto-classic/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>crypto-classic</artifactId> <artifactId>crypto-classic</artifactId>




+ 1
- 1
source/crypto/crypto-framework/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>crypto-framework</artifactId> <artifactId>crypto-framework</artifactId>




+ 1
- 1
source/crypto/crypto-pki/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 1
source/crypto/crypto-sm/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>crypto-sm</artifactId> <artifactId>crypto-sm</artifactId>




+ 1
- 1
source/crypto/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>crypto</artifactId> <artifactId>crypto</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/deployment/deployment-gateway/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>deployment</artifactId> <artifactId>deployment</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>deployment-gateway</artifactId> <artifactId>deployment-gateway</artifactId>




+ 1
- 1
source/deployment/deployment-peer/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>deployment</artifactId> <artifactId>deployment</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>deployment-peer</artifactId> <artifactId>deployment-peer</artifactId>




+ 1
- 1
source/deployment/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>deployment</artifactId> <artifactId>deployment</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


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

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>gateway</artifactId> <artifactId>gateway</artifactId>




+ 1
- 1
source/ledger/ledger-core/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>ledger</artifactId> <artifactId>ledger</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>ledger-core</artifactId> <artifactId>ledger-core</artifactId>




+ 1
- 1
source/ledger/ledger-model/pom.xml View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>ledger</artifactId> <artifactId>ledger</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>ledger-model</artifactId> <artifactId>ledger-model</artifactId>


+ 129
- 129
source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionState.java View File

@@ -1,129 +1,129 @@
package com.jd.blockchain.ledger;
import com.jd.blockchain.binaryproto.PrimitiveType;
import com.jd.blockchain.binaryproto.EnumContract;
import com.jd.blockchain.binaryproto.EnumField;
import com.jd.blockchain.consts.DataCodes;
/**
* 交易(事务)执行状态;
*
* @author huanghaiquan
*
*/
@EnumContract(code = DataCodes.ENUM_TYPE_TRANSACTION_STATE)
public enum TransactionState {
/**
* 成功;
*/
SUCCESS((byte) 0),
/**
* 账本错误;
*/
LEDGER_ERROR((byte) 0x01),
/**
* 数据账户不存在;
*/
DATA_ACCOUNT_DOES_NOT_EXIST((byte) 0x02),
/**
* 用户不存在;
*/
USER_DOES_NOT_EXIST((byte) 0x03),
/**
* 合约不存在;
*/
CONTRACT_DOES_NOT_EXIST((byte) 0x04),
/**
* 数据写入时版本冲突;
*/
DATA_VERSION_CONFLICT((byte) 0x05),
/**
* 参与方不存在;
*/
PARTICIPANT_DOES_NOT_EXIST((byte) 0x05),
/**
* 被安全策略拒绝;
*/
REJECTED_BY_SECURITY_POLICY((byte) 0x10),
/**
* 由于在错误的账本上执行交易而被丢弃;
*/
IGNORED_BY_WRONG_LEDGER((byte) 0x40),
/**
* 由于交易内容的验签失败而丢弃;
*/
IGNORED_BY_WRONG_CONTENT_SIGNATURE((byte) 0x41),
/**
* 由于交易内容的验签失败而丢弃;
*/
IGNORED_BY_CONFLICTING_STATE((byte) 0x42),
/**
* 由于交易的整体回滚而丢弃;
* <p>
*
* 注: “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚;<br>
* “部分回滚”是指把交易引入的数据更改回滚了,但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交;<br>
*/
IGNORED_BY_TX_FULL_ROLLBACK((byte) 0x43),
/**
* 由于区块的整体回滚而丢弃;
* <p>
*
* 注: “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚;<br>
*
* “部分回滚”是指把交易引入的数据更改回滚了,但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交;<br>
*/
IGNORED_BY_BLOCK_FULL_ROLLBACK((byte) 0x44),
/**
*
* 共识阶段加入新区块哈希预计算功能, 如果来自其他Peer的新区块哈希值不一致,本批次整体回滚
*
*/
IGNORED_BY_CONSENSUS_PHASE_PRECOMPUTE_ROLLBACK((byte) 0x45),
/**
* 系统错误;
*/
SYSTEM_ERROR((byte) 0x80),
/**
* 超时;
*/
TIMEOUT((byte) 0x81),
/**
* 共识错误;
*/
CONSENSUS_ERROR((byte) 0x82);
@EnumField(type = PrimitiveType.INT8)
public final byte CODE;
private TransactionState(byte code) {
this.CODE = code;
}
public static TransactionState valueOf(byte code) {
for (TransactionState tr : values()) {
if (tr.CODE == code) {
return tr;
}
}
throw new IllegalArgumentException("Unsupported transaction result code!");
}
}
package com.jd.blockchain.ledger;
import com.jd.blockchain.binaryproto.PrimitiveType;
import com.jd.blockchain.binaryproto.EnumContract;
import com.jd.blockchain.binaryproto.EnumField;
import com.jd.blockchain.consts.DataCodes;
/**
* 交易(事务)执行状态;
*
* @author huanghaiquan
*
*/
@EnumContract(code = DataCodes.ENUM_TYPE_TRANSACTION_STATE)
public enum TransactionState {
/**
* 成功;
*/
SUCCESS((byte) 0),
/**
* 账本错误;
*/
LEDGER_ERROR((byte) 0x01),
/**
* 数据账户不存在;
*/
DATA_ACCOUNT_DOES_NOT_EXIST((byte) 0x02),
/**
* 用户不存在;
*/
USER_DOES_NOT_EXIST((byte) 0x03),
/**
* 合约不存在;
*/
CONTRACT_DOES_NOT_EXIST((byte) 0x04),
/**
* 数据写入时版本冲突;
*/
DATA_VERSION_CONFLICT((byte) 0x05),
/**
* 参与方不存在;
*/
PARTICIPANT_DOES_NOT_EXIST((byte) 0x06),
/**
* 被安全策略拒绝;
*/
REJECTED_BY_SECURITY_POLICY((byte) 0x10),
/**
* 由于在错误的账本上执行交易而被丢弃;
*/
IGNORED_BY_WRONG_LEDGER((byte) 0x40),
/**
* 由于交易内容的验签失败而丢弃;
*/
IGNORED_BY_WRONG_CONTENT_SIGNATURE((byte) 0x41),
/**
* 由于交易内容的验签失败而丢弃;
*/
IGNORED_BY_CONFLICTING_STATE((byte) 0x42),
/**
* 由于交易的整体回滚而丢弃;
* <p>
*
* 注: “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚;<br>
* “部分回滚”是指把交易引入的数据更改回滚了,但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交;<br>
*/
IGNORED_BY_TX_FULL_ROLLBACK((byte) 0x43),
/**
* 由于区块的整体回滚而丢弃;
* <p>
*
* 注: “整体回滚”是指把交易引入的数据更改以及交易记录本身全部都回滚;<br>
*
* “部分回滚”是指把交易引入的数据更改回滚了,但是交易记录本身以及相应的“交易结果({@link TransactionState})”都会提交;<br>
*/
IGNORED_BY_BLOCK_FULL_ROLLBACK((byte) 0x44),
/**
*
* 共识阶段加入新区块哈希预计算功能, 如果来自其他Peer的新区块哈希值不一致,本批次整体回滚
*
*/
IGNORED_BY_CONSENSUS_PHASE_PRECOMPUTE_ROLLBACK((byte) 0x45),
/**
* 系统错误;
*/
SYSTEM_ERROR((byte) 0x80),
/**
* 超时;
*/
TIMEOUT((byte) 0x81),
/**
* 共识错误;
*/
CONSENSUS_ERROR((byte) 0x82);
@EnumField(type = PrimitiveType.INT8)
public final byte CODE;
private TransactionState(byte code) {
this.CODE = code;
}
public static TransactionState valueOf(byte code) {
for (TransactionState tr : values()) {
if (tr.CODE == code) {
return tr;
}
}
throw new IllegalArgumentException("Unsupported transaction result code!");
}
}

+ 1
- 1
source/ledger/ledger-rpc/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>ledger</artifactId> <artifactId>ledger</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>ledger-rpc</artifactId> <artifactId>ledger-rpc</artifactId>




+ 1
- 1
source/ledger/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>ledger</artifactId> <artifactId>ledger</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/manager/manager-booter/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>manager</artifactId> <artifactId>manager</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 1
source/manager/manager-model/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>manager</artifactId> <artifactId>manager</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 1
source/manager/manager-service/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>manager</artifactId> <artifactId>manager</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 1
source/manager/manager-web/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>manager</artifactId> <artifactId>manager</artifactId>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>




+ 1
- 1
source/manager/pom.xml View File

@@ -11,7 +11,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>manager</artifactId> <artifactId>manager</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


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

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>peer</artifactId> <artifactId>peer</artifactId>


+ 1
- 1
source/pom.xml View File

@@ -11,7 +11,7 @@


<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>jdchain</description> <description>jdchain</description>




+ 1
- 1
source/runtime/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>runtime</artifactId> <artifactId>runtime</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/runtime/runtime-context/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>runtime</artifactId> <artifactId>runtime</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>runtime-context</artifactId> <artifactId>runtime-context</artifactId>




+ 1
- 1
source/runtime/runtime-modular-booter/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>runtime</artifactId> <artifactId>runtime</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>runtime-modular-booter</artifactId> <artifactId>runtime-modular-booter</artifactId>
</project> </project>

+ 1
- 1
source/runtime/runtime-modular/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>runtime</artifactId> <artifactId>runtime</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>runtime-modular</artifactId> <artifactId>runtime-modular</artifactId>




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

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>sdk</artifactId> <artifactId>sdk</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/sdk/sdk-base/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>sdk</artifactId> <artifactId>sdk</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>sdk-base</artifactId> <artifactId>sdk-base</artifactId>




+ 1
- 1
source/sdk/sdk-client/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>sdk</artifactId> <artifactId>sdk</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>sdk-client</artifactId> <artifactId>sdk-client</artifactId>


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

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


+ 1
- 1
source/storage/pom.xml View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>storage</artifactId> <artifactId>storage</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/storage/storage-composite/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>storage</artifactId> <artifactId>storage</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>storage-composite</artifactId> <artifactId>storage-composite</artifactId>




+ 1
- 1
source/storage/storage-redis/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>storage</artifactId> <artifactId>storage</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>storage-redis</artifactId> <artifactId>storage-redis</artifactId>




+ 1
- 1
source/storage/storage-rocksdb/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>storage</artifactId> <artifactId>storage</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>storage-rocksdb</artifactId> <artifactId>storage-rocksdb</artifactId>




+ 1
- 1
source/storage/storage-service/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>storage</artifactId> <artifactId>storage</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>storage-service</artifactId> <artifactId>storage-service</artifactId>




+ 1
- 1
source/test/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>test</artifactId> <artifactId>test</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/test/test-consensus-client/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>test</artifactId> <artifactId>test</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>test-consensus-client</artifactId> <artifactId>test-consensus-client</artifactId>




+ 2
- 2
source/test/test-consensus-node/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>test</artifactId> <artifactId>test</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>test-consensus-node</artifactId> <artifactId>test-consensus-node</artifactId>
<dependencies> <dependencies>
@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>consensus-bftsmart</artifactId> <artifactId>consensus-bftsmart</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>


+ 1
- 1
source/test/test-integration/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>test</artifactId> <artifactId>test</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>test-integration</artifactId> <artifactId>test-integration</artifactId>




+ 1
- 1
source/test/test-ledger/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>test</artifactId> <artifactId>test</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>test-ledger</artifactId> <artifactId>test-ledger</artifactId>




+ 1
- 1
source/tools/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/tools/tools-initializer-booter/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>tools-initializer-booter</artifactId> <artifactId>tools-initializer-booter</artifactId>




+ 1
- 1
source/tools/tools-initializer/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>tools-initializer</artifactId> <artifactId>tools-initializer</artifactId>




+ 1
- 1
source/tools/tools-keygen-booter/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>tools-keygen-booter</artifactId> <artifactId>tools-keygen-booter</artifactId>




+ 1
- 1
source/tools/tools-keygen/pom.xml View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>tools-keygen</artifactId> <artifactId>tools-keygen</artifactId>




+ 1
- 1
source/utils/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>jdchain-root</artifactId> <artifactId>jdchain-root</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>


+ 1
- 1
source/utils/utils-common/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils-common</artifactId> <artifactId>utils-common</artifactId>


+ 1
- 1
source/utils/utils-http/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<properties> <properties>


+ 1
- 1
source/utils/utils-serialize/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils-serialize</artifactId> <artifactId>utils-serialize</artifactId>


+ 1
- 1
source/utils/utils-test/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils-test</artifactId> <artifactId>utils-test</artifactId>


+ 1
- 1
source/utils/utils-web-server/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils-web-server</artifactId> <artifactId>utils-web-server</artifactId>


+ 1
- 1
source/utils/utils-web/pom.xml View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils</artifactId> <artifactId>utils</artifactId>
<version>1.1.1.RELEASE</version>
<version>1.1.1-PACK20191209</version>
</parent> </parent>
<artifactId>utils-web</artifactId> <artifactId>utils-web</artifactId>
<dependencies> <dependencies>


Loading…
Cancel
Save