Skip to content

Commit

Permalink
<fix>(build): update build for secure issues. (WeBankBlockchain#212)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyonRay committed Mar 3, 2024
1 parent 47ef05e commit c2c6a71
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .ci/ci_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ echo " Not SM NODE ============>>>> "
echo " Not SM NODE ============>>>> "

# download build_chain.sh to build fisco-bcos block chain
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
echo "127.0.0.1:4 agency1 1,2,3" > ipconf
bash build_chain.sh -f ipconf
./nodes/127.0.0.1/fisco-bcos -v
Expand All @@ -35,7 +35,7 @@ mkdir -p src/integTest/resources/solidity
cp src/main/resources/* src/integTest/resources/solidity
cp src/test/resources/contract/* src/integTest/resources/solidity

bash gradlew integTest
bash gradlew integTest --info
bash gradlew jacocoTestReport

# clean
Expand All @@ -50,7 +50,7 @@ echo " SM NODE ============>>>> "
echo " SM NODE ============>>>> "

# download build_chain.sh to build fisco-bcos block chain
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
echo "127.0.0.1:4 agency1 1,2,3" > ipconf
bash build_chain.sh -f ipconf -g
./nodes/127.0.0.1/fisco-bcos -v
Expand All @@ -70,7 +70,7 @@ cp -r src/test/resources/accounts/gm_bcos src/integTest/resources/accounts/fisco
mkdir -p src/integTest/resources/solidity
cp src/main/resources/* src/integTest/resources/solidity
cp src/test/resources/contract/* src/integTest/resources/solidity
bash gradlew integTest
bash gradlew integTest --info

# clean
bash nodes/127.0.0.1/stop_all.sh
Expand All @@ -84,7 +84,7 @@ echo " SM NODE, SM SSL============>>>> "
echo " SM NODE, SM SSL============>>>> "

# download build_chain.sh to build fisco-bcos block chain
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
echo "127.0.0.1:4 agency1 1,2,3" > ipconf
bash build_chain.sh -f ipconf -g -G
./nodes/127.0.0.1/fisco-bcos -v
Expand All @@ -105,7 +105,7 @@ cp -r src/test/resources/accounts/gm_bcos src/integTest/resources/accounts/fisco
mkdir -p src/integTest/resources/solidity
cp src/main/resources/* src/integTest/resources/solidity
cp src/test/resources/contract/* src/integTest/resources/solidity
bash gradlew integTest
bash gradlew integTest --info

# clean
bash nodes/127.0.0.1/stop_all.sh
Expand Down
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,17 @@ dependencies {
}
implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
implementation 'commons-io:commons-io:2.7'

implementation 'org.fisco-bcos:solcJ:0.5.2.0'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
implementation ('org.fisco-bcos:solcJ:0.5.2.0'){
exclude group: 'com.fasterxml.jackson.core'
}

// Use JUnit test framework
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.slf4j:slf4j-log4j12:1.7.36'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.7'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.18'
testImplementation 'net.minidev:json-smart:2.4.9'
testImplementation 'com.jayway.jsonpath:json-path:2.9.0'

integTestImplementation 'junit:junit:4.13.1'
integTestImplementation 'org.slf4j:slf4j-log4j12:1.7.36'
Expand Down

0 comments on commit c2c6a71

Please sign in to comment.