Merge pull request #3820 from swagger-api/whitesource

whitesource alerts related deps updates - third run
swagger-api · Dec 5, 2020 · 59989e8 · 59989e8
2 parents 66a9bf0 + f5ac87e
commit 59989e8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle
@@ -31,6 +31,15 @@ dependencies {
     testCompile 'javax.ws.rs:javax.ws.rs-api:2.1'
     testCompile "io.swagger.core.v3:swagger-jaxrs2:${project.version}"
     testCompile 'junit:junit:4+'
+    testCompile 'org.eclipse.jetty:jetty-server:9.4.22.v20191022'
+    testCompile 'org.eclipse.jetty:jetty-servlet:9.4.22.v20191022'
+    testCompile 'org.eclipse.jetty:jetty-servlets:9.4.22.v20191022'
+    testCompile 'org.eclipse.jetty:jetty-webapp:9.4.22.v20191022'
+    testCompile 'org.eclipse.jetty:jetty-proxy:9.4.22.v20191022'
+    testCompile 'org.eclipse.jetty:jetty-proxy:9.4.22.v20191022'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
+    testCompile 'commons-codec:commons-codec:1.15'
+    testCompile 'org.apache.commons:commons-compress:1.20'
 }
 
 // * * * * * * * * * * * *

diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml
@@ -88,6 +88,10 @@
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-utils</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -187,8 +191,24 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-proxy</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${commons-compress-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
@@ -240,6 +260,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.version>3.6.3</maven.version>
         <junit.version>4.13.1</junit.version>
-        <wiremock-jetty-version>9.3.27.v20190418</wiremock-jetty-version>
+        <wiremock-jetty-version>9.4.22.v20191022</wiremock-jetty-version>
+        <commons-compress-version>1.20</commons-compress-version>
+        <commons-codec-version>1.15</commons-codec-version>
     </properties>
 </project>