From 48d0aa326ebe334bf0cc9d93c791b7ef14100edb Mon Sep 17 00:00:00 2001
From: frantuma <frantuma@yahoo.com>
Date: Fri, 25 Jun 2021 21:22:56 +0200
Subject: [PATCH] refs #3968 refs #3969 - fix security alerts

---
 modules/swagger-gradle-plugin/build.gradle    |  4 ++++
 .../swagger-gradle-plugin/gradle.properties   |  2 +-
 .../v3/plugins/gradle/SwaggerResolveTest.java |  2 +-
 modules/swagger-maven-plugin/pom.xml          | 21 ++++++++++++++++++-
 modules/swagger-project-jakarta/pom.xml       |  2 +-
 pom.xml                                       |  2 +-
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle
index 69566b2a54..cfb7150197 100644
--- a/modules/swagger-gradle-plugin/build.gradle
+++ b/modules/swagger-gradle-plugin/build.gradle
@@ -33,6 +33,8 @@ dependencies {
         exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
         exclude group: 'org.eclipse.jetty', module: 'jetty-proxy'
         exclude group: 'commons-codec', module: 'commons-codec'
+        exclude group: 'com.github.jknack', module: 'handlebars'
+        exclude group: 'com.github.jknack', module: 'handlebars-helpers'
     }
     testImplementation 'javax.servlet:javax.servlet-api:3.1.0'
     testImplementation 'com.google.guava:guava:30.1-jre'
@@ -48,6 +50,8 @@ dependencies {
     testImplementation "commons-codec:commons-codec:1.15"
     testImplementation "commons-io:commons-io:2.7"
     testImplementation "org.apache.commons:commons-compress:1.20"
+    testImplementation "com.github.jknack:handlebars:4.1.2"
+    testImplementation "com.github.jknack:handlebars-helpers:4.1.2"
 }
 
 // * * * * * * * * * * * *
diff --git a/modules/swagger-gradle-plugin/gradle.properties b/modules/swagger-gradle-plugin/gradle.properties
index da25d4e50d..7f5f1d41cf 100644
--- a/modules/swagger-gradle-plugin/gradle.properties
+++ b/modules/swagger-gradle-plugin/gradle.properties
@@ -1,2 +1,2 @@
 version=2.1.10-SNAPSHOT
-jettyVersion=9.4.39.v20210325
+jettyVersion=9.4.42.v20210604
diff --git a/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java b/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
index 150f52b044..cf07172fbb 100644
--- a/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
+++ b/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
@@ -85,7 +85,7 @@ public void testSwaggerResolveTask() throws IOException {
                 "    compile group: 'io.swagger.core.v3', name: 'swagger-jaxrs2', version:'2.1.10-SNAPSHOT'\n" +
                 "    compile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version:'2.1'\n" +
                 "    compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'\n" +
-                "    testCompile group: 'com.github.tomakehurst', name: 'wiremock', version:'2.14.0'\n" +
+                "    testCompile group: 'com.github.tomakehurst', name: 'wiremock', version:'2.27.2'\n" +
                 "    testCompile 'junit:junit:4+'\n" +
                 "\n" +
                 "\n" +
diff --git a/modules/swagger-maven-plugin/pom.xml b/modules/swagger-maven-plugin/pom.xml
index 274f68bacc..dd7ff14a10 100644
--- a/modules/swagger-maven-plugin/pom.xml
+++ b/modules/swagger-maven-plugin/pom.xml
@@ -214,6 +214,14 @@
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.github.jknack</groupId>
+                    <artifactId>handlebars-helpers</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.jknack</groupId>
+                    <artifactId>handlebars</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -267,7 +275,18 @@
             <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars-helpers</artifactId>
+            <scope>test</scope>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars</artifactId>
+            <scope>test</scope>
+            <version>4.1.2</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
index 2eafb9d738..b0fe279604 100644
--- 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.7</commons-io-version>
         <slf4j-version>1.7.25</slf4j-version>
-        <jetty-version>9.4.39.v20210325</jetty-version>
+        <jetty-version>9.4.42.v20210604</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
index 41e16cb9a9..c11f8177e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -632,7 +632,7 @@
         <commons-lang-version>3.7</commons-lang-version>
         <commons-io-version>2.7</commons-io-version>
         <slf4j-version>1.7.25</slf4j-version>
-        <jetty-version>9.4.39.v20210325</jetty-version>
+        <jetty-version>9.4.42.v20210604</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>