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

Jump to bottom

Update dependecies for CVE #13834

Merged
merged 2 commits into from
Oct 31, 2022
Merged

Update dependecies for CVE #13834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6604e3
Update dependecies for CVE
Zomzog Oct 26, 2022
a6d020d
Fix schemas
Zomzog Oct 27, 2022
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
Expand Down
7 changes: 7 additions & 0 deletions ...st/java/org/openapitools/codegen/java/helidon/functional/FunctionalHelidonClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.openapitools.codegen.java.helidon.functional;

import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import java.nio.file.Files;
Expand All @@ -26,6 +27,12 @@
import static org.hamcrest.MatcherAssert.assertThat;

public class FunctionalHelidonClientBase extends FunctionalBase {

@BeforeClass
public void setup() {
generatorName("java-helidon-client");
}

@Test
void buildPetstore() {
generate("src/test/resources/3_0/petstore.yaml");
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/test/resources/3_0/helidon/petstore-for-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ paths:
- 'write:pets'
- 'read:pets'
requestBody:
$ref: '#/components/schemas/Pet'
content:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI. @tjquinno there are changes to helidon test spec and files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes because the spec was no valid. I've fixed another one in samples.

application/json:
schema:
$ref: '#/components/schemas/Pet'
/pet/findByStatus:
get:
tags:
Expand Down
5 changes: 4 additions & 1 deletion ...s/openapi-generator/src/test/resources/3_0/helidon/petstore-no-multipart-for-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ paths:
- 'write:pets'
- 'read:pets'
requestBody:
$ref: '#/components/schemas/Pet'
content:
application/json:
schema:
$ref: '#/components/schemas/Pet'
/pet/findByStatus:
get:
tags:
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ paths:
- name: header1
in: header
schema:
$ref: '#/components/requestBodies/Pet'
$ref: '#/components/schemas/Pet'
- name: header2
in: header
schema:
type: array
items:
$ref: '#/components/requestBodies/Pet'
$ref: '#/components/schemas/Pet'
- name: Accept
in: header
schema:
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,14 +1488,15 @@
<commons-cli.version>1.4</commons-cli.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.9</commons-text.version>
<commons-text.version>1.10.0</commons-text.version>
<diffutils.version>1.3.0</diffutils.version>
<generex.version>1.0.2</generex.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<groovy.version>3.0.9</groovy.version>
<guava.version>30.1.1-jre</guava.version>
<handlebars-java.version>4.2.1</handlebars-java.version>
<jackson-threetenbp.version>2.10.0</jackson-threetenbp.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version>
<jackson.version>2.13.4</jackson.version>
<jacoco.version>0.8.7</jacoco.version>
<jmustache.version>1.14</jmustache.version>
Expand All @@ -1517,7 +1518,7 @@
<maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
<openrewrite.version>7.22.0</openrewrite.version>
<swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
<swagger-parser.version>2.1.1</swagger-parser.version>
<swagger-parser.version>2.1.6</swagger-parser.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OpenAPITools/generator-core-team FYI. swagger parser and other dependencies version update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It solve multiple cve. It's this part that make the contract validation more accurate.

<testng.version>7.5</testng.version>
<violations-maven-plugin.version>1.34</violations-maven-plugin.version>
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/go/go-petstore/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -1985,6 +1986,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2004,6 +2006,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2076,6 +2079,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2087,6 +2091,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2098,6 +2103,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/haskell-http-client/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -1985,6 +1986,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2004,6 +2006,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2076,6 +2079,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2087,6 +2091,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2098,6 +2103,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/java/apache-httpclient/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -2046,6 +2047,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2065,6 +2067,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2137,6 +2140,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2148,6 +2152,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2159,6 +2164,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/java/feign-no-nullable/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -2046,6 +2047,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2065,6 +2067,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2137,6 +2140,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2148,6 +2152,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2159,6 +2164,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/java/google-api-client/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -2046,6 +2047,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2065,6 +2067,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2137,6 +2140,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2148,6 +2152,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2159,6 +2164,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
6 changes: 6 additions & 0 deletions samples/client/petstore/java/jersey1/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,7 @@ components:
status:
description: Updated status of the pet
type: string
type: object
uploadFile_request:
properties:
additionalMetadata:
Expand All @@ -2046,6 +2047,7 @@ components:
description: file to upload
format: binary
type: string
type: object
testEnumParameters_request:
properties:
enum_form_string_array:
Expand All @@ -2065,6 +2067,7 @@ components:
- -efg
- (xyz)
type: string
type: object
testEndpointParameters_request:
properties:
integer:
Expand Down Expand Up @@ -2137,6 +2140,7 @@ components:
- double
- number
- pattern_without_delimiter
type: object
testJsonFormData_request:
properties:
param:
Expand All @@ -2148,6 +2152,7 @@ components:
required:
- param
- param2
type: object
uploadFileWithRequiredFile_request:
properties:
additionalMetadata:
Expand All @@ -2159,6 +2164,7 @@ components:
type: string
required:
- requiredFile
type: object
Dog_allOf:
properties:
breed:
Expand Down
Loading