diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1d742f8d..2254b10d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -70,6 +70,9 @@ stages:
Java11:
versionSpec: '1.11'
sslProvider: 'JDK'
+ Java17:
+ versionSpec: '17'
+ sslProvider: 'JDK'
steps:
- task: Maven@3
displayName: Maven build and run tests
@@ -109,3 +112,23 @@ stages:
PROJECT_DIR: "$(Build.Repository.LocalPath)"
STAGING_DIR: "$(Build.StagingDirectory)/gh-pages"
SOURCE_BRANCH: "$(Build.SourceBranchName)"
+
+ # Only run security vulnerability scan on scheduled builds
+ - stage: Scan
+ dependsOn: []
+ condition: eq(variables['Build.Reason'], 'Schedule')
+ jobs:
+ - job: ScanDependencies
+ pool:
+ vmImage: ubuntu-20.04
+ dependsOn: []
+ timeoutInMinutes: 60
+ steps:
+ - task: Maven@3
+ displayName: 'Maven dependency-check'
+ inputs:
+ mavenPomFile: 'pom.xml'
+ goals: '-P owasp dependency-check:check'
+ - publish: $(System.DefaultWorkingDirectory)/target/dependency-check-report.html
+ artifact: DependencyCheck
+ displayName: 'Upload dependency-check report'
diff --git a/dependency-suppressions.xml b/dependency-suppressions.xml
new file mode 100644
index 00000000..35359d1a
--- /dev/null
+++ b/dependency-suppressions.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ ^pkg:maven/io\.opentelemetry\.instrumentation/opentelemetry\-grpc\-1\.6@.*$
+ CVE-2020-7768
+
+
+
+ ^pkg:maven/org\.jetbrains\.kotlin/kotlin\-stdlib\-common@1\.4\.0$
+ CVE-2020-15824
+
+
diff --git a/pom.xml b/pom.xml
index 94950ec4..5d46fb79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
org.mockito
mockito-core
- 4.3.1
+ 4.4.0
test
@@ -114,7 +114,7 @@
com.ibm.cloud
cloudant
- 0.0.34
+ 0.0.36
@@ -260,35 +260,6 @@
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 3.1.2
-
- checkstyle.xml
- UTF-8
- true
- true
- false
- basedir=${project.basedir}
-
-
-
- com.puppycrawl.tools
- checkstyle
- 9.3
-
-
-
-
- compile
- compile
-
- check
-
-
-
-
@@ -307,6 +278,45 @@
+
+ checkstyle
+
+ [11,)
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 3.1.2
+
+ checkstyle.xml
+ UTF-8
+ true
+ true
+ false
+ basedir=${project.basedir}
+
+
+
+ com.puppycrawl.tools
+ checkstyle
+ 10.0
+
+
+
+
+ compile
+ compile
+
+ check
+
+
+
+
+
+
+
owasp
@@ -314,12 +324,15 @@
org.owasp
dependency-check-maven
- 6.5.2
+ 7.0.1
true
true
true
7
+
+ dependency-suppressions.xml
+