refs #3918, refs #3919, refs #3920 - bump jetty version, exclude json…

…-smart
swagger-api · Apr 9, 2021 · b7babad · b7babad
1 parent 438230d
commit b7babad
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 32 deletions.
diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle
@@ -25,7 +25,15 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.7'
 
     testImplementation gradleTestKit()
-    testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
+    testImplementation('com.github.tomakehurst:wiremock:2.27.2') {
+        exclude group: 'com.jayway.jsonpath', module: 'json-path'
+        exclude group: 'org.eclipse.jetty', module: 'jetty-server'
+        exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
+        exclude group: 'org.eclipse.jetty', module: 'jetty-servlets'
+        exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
+        exclude group: 'org.eclipse.jetty', module: 'jetty-proxy'
+        exclude group: 'commons-codec', module: 'commons-codec'
+    }
     testImplementation 'javax.servlet:javax.servlet-api:3.1.0'
     testImplementation 'com.google.guava:guava:30.1-jre'
     testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1'
@@ -39,15 +47,6 @@ dependencies {
     testImplementation "org.apache.httpcomponents:httpclient:4.5.13"
     testImplementation "commons-codec:commons-codec:1.15"
     testImplementation "org.apache.commons:commons-compress:1.20"
-
-    testImplementation('com.github.tomakehurst:wiremock:2.27.2') {
-        exclude group: 'org.eclipse.jetty', module: 'jetty-server'
-        exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
-        exclude group: 'org.eclipse.jetty', module: 'jetty-servlets'
-        exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
-        exclude group: 'org.eclipse.jetty', module: 'jetty-proxy'
-        exclude group: 'commons-codec', module: 'commons-codec'
-    }
 }
 
 // * * * * * * * * * * * *

diff --git a/modules/swagger-gradle-plugin/gradle.properties b/modules/swagger-gradle-plugin/gradle.properties
@@ -1,2 +1,2 @@
 version=2.1.8-SNAPSHOT
-jettyVersion=9.4.35.v20201120
+jettyVersion=9.4.39.v20210325
diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml
@@ -57,24 +57,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${failsafe-plugin-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <jetty.port>${jetty.port}</jetty.port>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -83,6 +65,9 @@
                     <httpConnector><port>${jetty.port}</port></httpConnector>
                     <stopKey>a</stopKey>
                     <stopPort>${jetty.port.stop}</stopPort>
+                    <supportedPackagings>
+                        <supportedPackaging>jar</supportedPackaging>
+                    </supportedPackagings>
                     <useTestScope>true</useTestScope>
                     <webAppSourceDirectory>${project.basedir}/src/test/webapp</webAppSourceDirectory>
                 </configuration>
@@ -106,6 +91,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${failsafe-plugin-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <jetty.port>${jetty.port}</jetty.port>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-eclipse-transformer-maven-plugin</artifactId>

diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml
@@ -273,7 +273,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.35.v20201120</wiremock-jetty-version>
+        <wiremock-jetty-version>9.4.39.v20210325</wiremock-jetty-version>
         <commons-compress-version>1.20</commons-compress-version>
     </properties>
 </project>
diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
@@ -571,7 +571,7 @@
         <commons-lang-version>3.7</commons-lang-version>
         <commons-io-version>2.6</commons-io-version>
         <slf4j-version>1.7.25</slf4j-version>
-        <jetty-version>9.4.9.v20180320</jetty-version>
+        <jetty-version>9.4.39.v20210325</jetty-version>
         <testng-version>7.3.0</testng-version>
         <mockito-version>2.28.2</mockito-version>
         <rest-assured-version>4.3.2</rest-assured-version>

diff --git a/pom.xml b/pom.xml
@@ -632,7 +632,7 @@
         <commons-lang-version>3.7</commons-lang-version>
         <commons-io-version>2.6</commons-io-version>
         <slf4j-version>1.7.25</slf4j-version>
-        <jetty-version>9.4.9.v20180320</jetty-version>
+        <jetty-version>9.4.39.v20210325</jetty-version>
         <testng-version>7.3.0</testng-version>
         <mockito-version>2.28.2</mockito-version>
         <rest-assured-version>4.3.2</rest-assured-version>