Merge pull request #3813 from swagger-api/whitesource

whitesource alerts related deps updates
swagger-api · Dec 5, 2020 · e63f899 · e63f899
2 parents a7b8839 + ae56a4b
commit e63f899
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     compile 'org.apache.commons:commons-lang3:3.7'
 
     testCompile gradleTestKit()
-    testCompile 'com.github.tomakehurst:wiremock:2.14.0'
+    testCompile 'com.github.tomakehurst:wiremock:2.27.2'
     testCompile 'javax.servlet:javax.servlet-api:3.1.0'
     testCompile 'javax.ws.rs:javax.ws.rs-api:2.1'
     testCompile "io.swagger.core.v3:swagger-jaxrs2:${project.version}"

diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml
@@ -48,6 +48,10 @@
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-component-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-classworlds</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -74,6 +78,18 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+            <version>4.1.0</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-utils</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
             <artifactId>maven-plugin-testing-harness</artifactId>
@@ -92,6 +108,10 @@
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-component-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-archiver</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -102,12 +122,12 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-component-annotations</artifactId>
-            <version>1.7.1</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -130,6 +150,12 @@
             <artifactId>maven-compat</artifactId>
             <version>${maven.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.plexus</groupId>
+                    <artifactId>plexus-utils</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
@@ -162,7 +188,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.version>3.6.0</maven.version>
+        <maven.version>3.6.3</maven.version>
         <junit.version>4.13.1</junit.version>
     </properties>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -421,6 +421,11 @@
                 <version>${httpcomponents-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpcomponents-version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
@@ -433,6 +438,16 @@
                 <version>${servlet-api-version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.xml.bind-api-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${jakarta.activation-api-version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
@@ -520,6 +535,8 @@
         <joda-time-version>2.9.9</joda-time-version>
         <snakeyaml-version>1.26</snakeyaml-version>
         <jakarta.ws-version>2.1.6</jakarta.ws-version>
+        <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
+        <jakarta.activation-api-version>1.2.2</jakarta.activation-api-version>
         <felix-version>4.2.1</felix-version>
         <servlet-api-version>4.0.3</servlet-api-version>
         <jersey2-version>2.26</jersey2-version>
@@ -531,10 +548,10 @@
         <commons-io-version>2.6</commons-io-version>
         <slf4j-version>1.7.25</slf4j-version>
         <jetty-version>9.4.9.v20180320</jetty-version>
-        <testng-version>7.1.0</testng-version>
-        <mockito-version>2.16.0</mockito-version>
-        <rest-assured-version>3.0.7</rest-assured-version>
-        <httpcomponents-version>4.5.3</httpcomponents-version>
+        <testng-version>7.3.0</testng-version>
+        <mockito-version>2.28.2</mockito-version>
+        <rest-assured-version>4.3.2</rest-assured-version>
+        <httpcomponents-version>4.5.13</httpcomponents-version>
 
         <surefire-version>2.21.0</surefire-version>
         <enforcer-plugin-version>3.0.0-M2</enforcer-plugin-version>