Browse Source

Merge commit '266f8e81adcc7a89b3a4871f1ae41ed576cf6ba5' into develop

# Conflicts:
#	README.md
#	source/tools/tools-initializer/src/test/java/test/com/jd/blockchain/tools/initializer/LedgerInitPropertiesTest.java
tags/1.1.0
huanghaiquan 5 years ago
parent
commit
f32514274f
2 changed files with 7 additions and 2 deletions
  1. +1
    -1
      source/pom.xml
  2. +6
    -1
      source/utils/utils-http/pom.xml

+ 1
- 1
source/pom.xml View File

@@ -523,4 +523,4 @@
</profiles>


</project>
</project>

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

@@ -43,6 +43,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
@@ -68,4 +73,4 @@
</plugin>
</plugins>
</build> -->
</project>
</project>

Loading…
Cancel
Save