File tree 3 files changed +40
-8
lines changed
3 files changed +40
-8
lines changed Original file line number Diff line number Diff line change @@ -66,6 +66,25 @@ stages:
66
66
publishJUnitResults : true
67
67
testResultsFiles : " $(System.DefaultWorkingDirectory)/**/TEST-*.xml"
68
68
tasks : " build"
69
+ - task : PublishTestResults@2
70
+ inputs :
71
+ testResultsFormat : ' JUnit'
72
+ testResultsFiles : ' fabric-chaincode-shim/build/reports/dependency-check-junit.xml'
73
+ mergeTestResults : true
74
+ failTaskOnFailedTests : false
75
+ testRunTitle : OWASP Dependency Check
76
+ displayName : ' Publish OWASP Dependency Check JUnit results'
77
+ - task : CopyFiles@2
78
+ inputs :
79
+ contents : |
80
+ fabric-chaincode-shim/build/reports/dependency-check-*.*
81
+ targetFolder : $(Build.ArtifactStagingDirectory)/dependency-check
82
+ displayName : ' Collect OWASP Dependency Check results'
83
+ - task : PublishBuildArtifacts@1
84
+ inputs :
85
+ pathToPublish : $(Build.ArtifactStagingDirectory)/dependency-check
86
+ artifactName : ' Dependency Check Report'
87
+ displayName : ' Publish full OWASP Dependency Check result'
69
88
- task : PublishCodeCoverageResults@1
70
89
inputs :
71
90
summaryFileLocation : " $(System.DefaultWorkingDirectory)/**/fabric-chaincode-shim/build/reports/jacoco/test/jacocoTestReport.xml"
Original file line number Diff line number Diff line change @@ -45,11 +45,11 @@ buildscript {
45
45
}
46
46
47
47
dependencies {
48
- compile ' com.google.protobuf:protobuf-java:3.9 .1'
49
- compile ' com.google.protobuf:protobuf-java-util:3.9 .1'
50
- compile ' io.grpc:grpc-netty:1.23 .0'
51
- compile ' io.grpc:grpc-protobuf:1.23 .0'
52
- compile ' io.grpc:grpc-stub:1.23 .0'
48
+ compile ' com.google.protobuf:protobuf-java:3.11 .1'
49
+ compile ' com.google.protobuf:protobuf-java-util:3.11 .1'
50
+ compile ' io.grpc:grpc-netty:1.25 .0'
51
+ compile ' io.grpc:grpc-protobuf:1.25 .0'
52
+ compile ' io.grpc:grpc-stub:1.25 .0'
53
53
// Required if using Java 11+ as no longer bundled in the core libraries
54
54
compile ' javax.annotation:javax.annotation-api:1.3.2'
55
55
}
Original file line number Diff line number Diff line change 3
3
*
4
4
* SPDX-License-Identifier: Apache-2.0
5
5
*/
6
+ buildscript {
7
+ repositories {
8
+ mavenCentral()
9
+ }
10
+ dependencies {
11
+ classpath ' org.owasp:dependency-check-gradle:5.2.1'
12
+ }
13
+ }
6
14
7
15
plugins {
8
16
id ' maven-publish'
@@ -11,11 +19,14 @@ plugins {
11
19
id ' signing'
12
20
}
13
21
22
+ apply plugin : ' org.owasp.dependencycheck'
23
+
24
+ check. dependsOn dependencyCheckAnalyze
25
+
14
26
tasks. withType(org.gradle.api.tasks.testing.Test ) {
15
27
systemProperty ' CORE_CHAINCODE_LOGGING_LEVEL' , ' DEBUG'
16
28
}
17
29
18
-
19
30
dependencies {
20
31
compile project(' :fabric-chaincode-protos' )
21
32
compile ' org.bouncycastle:bcpkix-jdk15on:1.62'
@@ -27,13 +38,15 @@ dependencies {
27
38
testCompile group : ' javax.xml.bind' , name : ' jaxb-api' , version : ' 2.3.1'
28
39
}
29
40
41
+ dependencyCheck {
42
+ format= ' ALL'
43
+ }
44
+
30
45
sourceSets {
31
46
main {
32
47
java {
33
48
srcDirs ' src/main/java'
34
49
}
35
-
36
-
37
50
}
38
51
39
52
test {
You can’t perform that action at this time.
0 commit comments