Merge pull request #3822 from swagger-api/whitesource

whitesource alerts related deps updates - fourth run

modules/swagger-gradle-plugin/build.gradle

@@ -31,12 +31,12 @@ 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.eclipse.jetty:jetty-server:${jettyVersion}'
+    testCompile 'org.eclipse.jetty:jetty-servlet:${jettyVersion}'
+    testCompile 'org.eclipse.jetty:jetty-servlets:${jettyVersion}'
+    testCompile 'org.eclipse.jetty:jetty-webapp:${jettyVersion}'
+    testCompile 'org.eclipse.jetty:jetty-proxy:${jettyVersion}'
+    testCompile 'org.eclipse.jetty:jetty-proxy:${jettyVersion}'
     testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
     testCompile 'commons-codec:commons-codec:1.15'
     testCompile 'org.apache.commons:commons-compress:1.20'

modules/swagger-gradle-plugin/gradle.properties

@@ -1 +1,2 @@
 version=2.1.7-SNAPSHOT
+jettyVersion=9.4.35.v20201120

modules/swagger-maven-plugin/pom.xml

@@ -203,12 +203,6 @@
             <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>
@@ -260,8 +254,7 @@
         <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.4.22.v20191022</wiremock-jetty-version>
+        <wiremock-jetty-version>9.4.35.v20201120</wiremock-jetty-version>
         <commons-compress-version>1.20</commons-compress-version>
-        <commons-codec-version>1.15</commons-codec-version>
     </properties>
 </project>

pom.xml

@@ -540,6 +540,12 @@
                 <version>${ant-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec-version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <properties>
@@ -566,6 +572,7 @@
         <mockito-version>2.28.2</mockito-version>
         <rest-assured-version>4.3.2</rest-assured-version>
         <httpcomponents-version>4.5.13</httpcomponents-version>
+        <commons-codec-version>1.15</commons-codec-version>
 
         <surefire-version>2.21.0</surefire-version>
         <enforcer-plugin-version>3.0.0-M2</enforcer-plugin-version>