Skip to content

Commit 562e9e9

Browse files
junqizhang-devjunqizhang-dev
authored
Merge pull request #315 from WeBankBlockchain/release/1.8.4
Release/1.8.4
2 parents a3ea0b8 + d4f63aa commit 562e9e9

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ jobs:
4242
- name: Prepare gradle
4343
uses: eskatos/gradle-command-action@v1
4444
with:
45-
gradle-version: 5.4.1
45+
gradle-version: 5.6
4646
- name: source-code deployment
4747
run: |
4848
export NODE_IP=127.0.0.1:20200
4949
export NODE2_IP=127.0.0.1:20201
50-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
50+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
5151
chmod u+x .ci/script/build-ci.sh
5252
.ci/script/build-ci.sh 127.0.0.1:3306 cidb root root 127.0.0.1:6379 123456 redis
5353
- name: Run CI
5454
run: |
55-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
55+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
5656
gradle check -i
5757
gradle jacocoTestReport
5858
bash <(curl -s https://codecov.io/bash)
@@ -88,12 +88,12 @@ jobs:
8888
- name: Prepare gradle
8989
uses: eskatos/gradle-command-action@v1
9090
with:
91-
gradle-version: 5.4.1
91+
gradle-version: 5.6
9292
- name: source-code deployment
9393
run: |
9494
export NODE_IP=127.0.0.1:20200
9595
export NODE2_IP=127.0.0.1:20201
96-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
96+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
9797
chmod u+x .ci/script/build-ci.sh
9898
.ci/script/build-ci.sh 127.0.0.1:3306 cidb root root 127.0.0.1:6379 123456 redis
9999
- name: Checkout and prepare
@@ -116,7 +116,7 @@ jobs:
116116
run: |
117117
cd weid-sample
118118
chmod u+x *.sh
119-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
119+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
120120
export NODE_IP=127.0.0.1:20200
121121
export NODE2_IP=127.0.0.1:20201
122122
./build.sh
@@ -152,12 +152,12 @@ jobs:
152152
- name: Prepare gradle
153153
uses: eskatos/gradle-command-action@v1
154154
with:
155-
gradle-version: 5.4.1
155+
gradle-version: 5.6
156156
- name: source-code deployment
157157
run: |
158158
export NODE_IP=127.0.0.1:20200
159159
export NODE2_IP=127.0.0.1:20201
160-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
160+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
161161
chmod u+x .ci/script/build-ci.sh
162162
.ci/script/build-ci.sh 127.0.0.1:3306 cidb root root
163163
- name: Checkout and prepare
@@ -180,7 +180,7 @@ jobs:
180180
- name: Run CI
181181
run: |
182182
cd weid-http-service/
183-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.6.1/bin:$PATH
183+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6.1/bin:$PATH
184184
ls -ll libs
185185
gradle clean build -i -x test
186186
- name: Download failed log (if any)
@@ -215,12 +215,12 @@ jobs:
215215
- name: Prepare gradle
216216
uses: eskatos/gradle-command-action@v1
217217
with:
218-
gradle-version: 5.4.1
218+
gradle-version: 5.6
219219
- name: source-code deployment
220220
run: |
221221
export NODE_IP=127.0.0.1:20200
222222
export NODE2_IP=127.0.0.1:20201
223-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
223+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
224224
chmod u+x .ci/script/build-ci.sh
225225
.ci/script/build-ci.sh 127.0.0.1:3306 cidb root root
226226
- name: Checkout and prepare
@@ -237,7 +237,7 @@ jobs:
237237
- name: Run CI
238238
run: |
239239
cd weid-build-tools/
240-
export PATH=/home/runner/gradle-provision-tmpdir/installs/gradle-5.4.1/bin:$PATH
240+
export PATH=/home/runner/gradle-installations/installs/gradle-5.6/bin:$PATH
241241
sed -i -e '$a\org_id=test' run.config
242242
sed -i -e '$a\amop_id=test' run.config
243243
sed -i -e '$a\blockchain_address=127.0.0.1:20200' run.config
@@ -257,4 +257,4 @@ jobs:
257257
uses: actions/upload-artifact@v1
258258
with:
259259
name: build-tools-log
260-
path: /home/runner/work/WeIdentity/WeIdentity/weid-build-tools/build/reports/
260+
path: /home/runner/work/WeIdentity/WeIdentity/weid-build-tools/build/reports/

‎build-tools/bin/setup.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,14 @@ function modify_config()
6767

6868
export ORG_ID=${ORG_ID}
6969
export AMOP_ID=${AMOP_ID}
70+
export PERSISTENCE_TYPE=${persistence_type}
7071
export MYSQL_ADDRESS=${MYSQL_ADDRESS}
7172
export MYSQL_DATABASE=${MYSQL_DATABASE}
7273
export MYSQL_USERNAME=${MYSQL_USERNAME}
7374
export MYSQL_PASSWORD=${MYSQL_PASSWORD}
7475
export BLOCKCHIAN_NODE_INFO=${BLOCKCHIAN_NODE_INFO}
7576

76-
NODEVAR='${ORG_ID}:${AMOP_ID}:${MYSQL_ADDRESS}:${MYSQL_DATABASE}:${MYSQL_USERNAME}:${MYSQL_PASSWORD}:${BLOCKCHIAN_NODE_INFO}'
77+
NODEVAR='${ORG_ID}:${AMOP_ID}:${PERSISTENCE_TYPE}:${MYSQL_ADDRESS}:${MYSQL_DATABASE}:${MYSQL_USERNAME}:${MYSQL_PASSWORD}:${BLOCKCHIAN_NODE_INFO}'
7778
envsubst ${NODEVAR} < ${weid_config_tpl} >${weid_config}
7879
cp ${weid_config} ${app_xml_config_dir}
7980
echo "modify sdk config finished..."
@@ -136,11 +137,12 @@ function gradle_build_sdk()
136137

137138
export ORG_ID=${org_id}
138139
export AMOP_ID=${amop_id}
140+
export PERSISTENCE_TYPE=${persistence_type}
139141
export MYSQL_ADDRESS=${mysql_address}
140142
export MYSQL_DATABASE=${mysql_database}
141143
export MYSQL_USERNAME=${mysql_username}
142144
export MYSQL_PASSWORD=${mysql_password}
143-
NODEVAR='${ORG_ID}:${AMOP_ID}:${MYSQL_ADDRESS}:${MYSQL_DATABASE}:${MYSQL_USERNAME}:${MYSQL_PASSWORD}:${BLOCKCHIAN_NODE_INFO}'
145+
NODEVAR='${ORG_ID}:${AMOP_ID}:${PERSISTENCE_TYPE}:${MYSQL_ADDRESS}:${MYSQL_DATABASE}:${MYSQL_USERNAME}:${MYSQL_PASSWORD}:${BLOCKCHIAN_NODE_INFO}'
144146
envsubst ${NODEVAR} < ${weid_config_tpl} >${weid_config}
145147

146148
cd ${java_source_code_dir}/

‎build.gradle‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1+
// Due to a bug of spotbugs, the following lines have to be defined on top as well
2+
buildscript {
3+
dependencies {
4+
classpath "org.springframework.boot:spring-boot-gradle-plugin:2.4.3"
5+
}
6+
}
7+
plugins {
8+
id 'com.github.spotbugs' version '4.7.0'
9+
}
10+
import com.github.spotbugs.snom.SpotBugsTask
11+
112
def gradleVer = "4"
13+
println "gradleVersion:" + gradle.gradleVersion
214
if (gradle.gradleVersion.startsWith("6")
315
|| gradle.gradleVersion.startsWith("5")
416
|| gradle.gradleVersion.startsWith("4.10")
@@ -11,26 +23,14 @@ if (gradle.gradleVersion.startsWith("6")
1123
println "Gradle with version < 4.7 detected"
1224
}
1325

14-
// Due to a bug of spotbugs, the following lines have to be defined on top as well
15-
buildscript {
16-
repositories {
17-
maven {
18-
url "https://plugins.gradle.org/m2/"
19-
}
20-
}
21-
dependencies {
22-
classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.5"
23-
}
24-
}
25-
2626
apply plugin: 'maven'
2727
apply plugin: 'java'
2828
apply plugin: 'eclipse'
2929
apply plugin: 'idea'
30+
apply plugin: 'io.spring.dependency-management'
3031
if (!gradle.startParameter.isOffline()) {
3132
apply plugin: 'checkstyle'
3233
apply plugin: 'jacoco'
33-
apply plugin: "com.github.spotbugs"
3434
apply plugin: 'signing'
3535
}
3636

@@ -60,7 +60,6 @@ repositories {
6060
println "use default repo"
6161
mavenCentral()
6262
}
63-
maven { url "https://dl.bintray.com/ethereum/maven/" }
6463
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
6564
maven { url "https://oss.sonatype.org/content/groups/public/" }
6665
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
@@ -301,13 +300,13 @@ if (!gradle.startParameter.isOffline()) {
301300
spotbugs {
302301
ignoreFailures = true
303302
showProgress = true
304-
toolVersion = "3.1.8"
303+
toolVersion = "4.2.2"
305304
effort = "max"
306305
reportLevel = "low"
307306
excludeFilter = file("${project.rootDir}/config/spotbugs/spotbugs_filter.xml")
308307
}
309308

310-
tasks.withType(com.github.spotbugs.SpotBugsTask) {
309+
tasks.withType(SpotBugsTask) {
311310
reports {
312311
xml.enabled false
313312
html.enabled true
@@ -318,7 +317,7 @@ if (!gradle.startParameter.isOffline()) {
318317
uploadArchives {
319318
repositories {
320319
mavenDeployer {
321-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
320+
// beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
322321

323322
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
324323
authentication(userName: sonatypeUsername, password: sonatypePassword)
@@ -373,4 +372,4 @@ gradle.taskGraph.whenReady { taskGraph ->
373372
task.enabled = false
374373
}
375374
}
376-
}
375+
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)