loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 22:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Upgrade testng to avoid CVE-2022-4065 (#18635)

Browse Source
This commit is contained in:
Esteban Dugueperoux 2024-05-11 17:19:57 +02:00 committed by GitHub
parent 42536932da
commit 4637658f78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractIntegrationTest.java
View File

@ -17,10 +17,11 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import java.nio.file.Files;
import java.util.stream.Collectors;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import org.openapitools.codegen.testutils.IntegrationTestPathsConfig; import org.openapitools.codegen.testutils.IntegrationTestPathsConfig;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.testng.reporters.Files;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
@ -51,7 +52,7 @@ public abstract class AbstractIntegrationTest {
IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig(); IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig();
String specContent = Files.readFile(integrationTestPathsConfig.getSpecPath().toFile()); String specContent = Files.lines(integrationTestPathsConfig.getSpecPath()).collect(Collectors.joining("\n"));
OpenAPI openAPI = TestUtils.parseContent(specContent); OpenAPI openAPI = TestUtils.parseContent(specContent);

15
pom.xml
View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>5</version> <version>5</version>
<relativePath/> <relativePath />
<!-- lookup parent from repository --> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
@ -505,7 +507,8 @@
<failOnError>false</failOnError> <failOnError>false</failOnError>
<!-- https://spotbugs.readthedocs.io/en/stable/effort.html --> <!-- https://spotbugs.readthedocs.io/en/stable/effort.html -->
<effort>min</effort> <effort>min</effort>
<excludeFilterFile>${project.basedir}${file.separator}spotbugs-exclude.xml</excludeFilterFile> <excludeFilterFile>
${project.basedir}${file.separator}spotbugs-exclude.xml</excludeFilterFile>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -1253,10 +1256,10 @@
<spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version> <spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version>
<swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version> <swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
<swagger-parser.version>2.1.22</swagger-parser.version> <swagger-parser.version>2.1.22</swagger-parser.version>
<testng.version>7.5</testng.version> <testng.version>7.10.2</testng.version>
<violations-maven-plugin.version>1.34</violations-maven-plugin.version> <violations-maven-plugin.version>1.34</violations-maven-plugin.version>
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version> <wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>
<wagon-svn.version>1.12</wagon-svn.version> <wagon-svn.version>1.12</wagon-svn.version>
<wagon-webdav.version>1.0-beta-2</wagon-webdav.version> <wagon-webdav.version>1.0-beta-2</wagon-webdav.version>
</properties> </properties>
</project> </project>