From 22d891e29b1fe067d9dfe1e1be7212ab84339462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 10:24:47 +0000
Subject: [PATCH 1/3] Bump openapi-generator-maven-plugin in
 /stackrox-container-image-scanner

Bumps openapi-generator-maven-plugin from 5.4.0 to 6.0.0.

---
updated-dependencies:
- dependency-name: org.openapitools:openapi-generator-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 stackrox-container-image-scanner/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stackrox-container-image-scanner/pom.xml b/stackrox-container-image-scanner/pom.xml
index 78026f57..27267213 100644
--- a/stackrox-container-image-scanner/pom.xml
+++ b/stackrox-container-image-scanner/pom.xml
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.4</version>
+            <version>1.6.6</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-common</artifactId>
-            <version>1.6.10</version>
+            <version>1.7.0</version>
         </dependency>
     </dependencies>
     <dependencyManagement>
@@ -193,7 +193,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>5.4.0</version>
+                <version>6.0.0</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>
@@ -222,7 +222,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <excludePackageNames>com.stackrox.api:com.stackrox.model:com.stackrox.invoker</excludePackageNames>
                 </configuration>

From 42727212fa158b06ad8e4940a696ea58f5e44789 Mon Sep 17 00:00:00 2001
From: Tomasz Janiszewski <tomek@redhat.com>
Date: Tue, 14 Jun 2022 14:25:02 +0200
Subject: [PATCH 2/3] Add missing libs

---
 .circleci/config.yml                     |  4 ++--
 stackrox-container-image-scanner/pom.xml | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6522cd64..12555d43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,12 +100,12 @@ jobs:
           name: Unit tests
           command: |
             cd stackrox-container-image-scanner
-            mvn verify
+            mvn verify -e
       - run:
           name: Build and package the Jenkins plugin
           command: |
             cd stackrox-container-image-scanner
-            mvn package
+            mvn package -e
             mvn hpi:hpi
       - store_test_results:
           path: /home/circleci/jenkins-plugin/stackrox-container-image-scanner/target/surefire-reports
diff --git a/stackrox-container-image-scanner/pom.xml b/stackrox-container-image-scanner/pom.xml
index 27267213..92023873 100644
--- a/stackrox-container-image-scanner/pom.xml
+++ b/stackrox-container-image-scanner/pom.xml
@@ -132,6 +132,16 @@
             <artifactId>jackson-databind-nullable</artifactId>
             <version>0.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
         <!-- required by OkHTTP -->
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

From 0e6e8a617242f3d2c29b44ffe729cae936940cc9 Mon Sep 17 00:00:00 2001
From: Tomasz Janiszewski <tomek@redhat.com>
Date: Tue, 14 Jun 2022 18:00:34 +0200
Subject: [PATCH 3/3] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12555d43..c4e9fb51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,12 +100,12 @@ jobs:
           name: Unit tests
           command: |
             cd stackrox-container-image-scanner
-            mvn verify -e
+            mvn verify -e -X
       - run:
           name: Build and package the Jenkins plugin
           command: |
             cd stackrox-container-image-scanner
-            mvn package -e
+            mvn package -e -X
             mvn hpi:hpi
       - store_test_results:
           path: /home/circleci/jenkins-plugin/stackrox-container-image-scanner/target/surefire-reports