Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refs #3968 refs #3969 - fix security alerts #3981

Merged
merged 1 commit into from
Jun 25, 2021
Merged

refs #3968 refs #3969 - fix security alerts #3981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/swagger-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
}

// * * * * * * * * * * * *
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-gradle-plugin/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=2.1.10-SNAPSHOT
jettyVersion=9.4.39.v20210325
jettyVersion=9.4.42.v20210604
2 changes: 1 addition & 1 deletion .../swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down
21 changes: 20 additions & 1 deletion modules/swagger-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-project-jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down