Skip to content

Commit c0b2bd2

Browse files
authored
Merge branch 'main' into dependabot/gradle/org.openapitools-jackson-databind-nullable-0.2.10
2 parents 5567bad + abf83db commit c0b2bd2

14 files changed

Lines changed: 116 additions & 29 deletions

File tree

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @getyourguide/chk
1+
* @getyourguide/payx

‎build.gradle‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,54 @@ allprojects {
2323
}
2424

2525
subprojects {
26+
configurations.configureEach {
27+
resolutionStrategy.eachDependency {
28+
if (requested.group == 'tools.jackson.core'
29+
&& requested.version != null && requested.version < '3.1.5') {
30+
useVersion('3.1.5')
31+
because('GHSA-2m67-wjpj-xhg9: Jackson Core 3.0.0-3.1.0 maxDocumentLength bypass; ' +
32+
'GHSA-j3rv-43j4-c7qm / GHSA-rmj7-2vxq-3g9f / GHSA-hgj6-7826-r7m5 / GHSA-5jmj-h7xm-6q6v / ' +
33+
'GHSA-rcqc-6cw3-h962 / GHSA-9fxm-vc8v-hj55 / GHSA-5hh8-q8hv-fr38 / GHSA-5gvw-p9qm-jgwh: jackson-databind 3.x deserialization vulnerabilities')
34+
}
35+
if (requested.group == 'com.fasterxml.jackson.core' && requested.name == 'jackson-databind'
36+
&& requested.version != null && requested.version < '2.21.5') {
37+
useVersion('2.21.5')
38+
because('GHSA-j3rv-43j4-c7qm / GHSA-rmj7-2vxq-3g9f / GHSA-hgj6-7826-r7m5 / GHSA-5jmj-h7xm-6q6v / ' +
39+
'GHSA-rcqc-6cw3-h962 / GHSA-9fxm-vc8v-hj55 / GHSA-5hh8-q8hv-fr38: jackson-databind 2.x deserialization vulnerabilities')
40+
}
41+
if (requested.group == 'ch.qos.logback'
42+
&& requested.version != null && requested.version < '1.5.34') {
43+
useVersion('1.5.34')
44+
because('GHSA-p47f-322f-whfh / GHSA-jhq6-gfmj-v8fx: logback-core deserialization of untrusted data / object injection')
45+
}
46+
if (requested.group == 'org.apache.tomcat.embed' && requested.name == 'tomcat-embed-core'
47+
&& requested.version != null && requested.version < '11.0.25') {
48+
useVersion('11.0.25')
49+
because('GHSA-rv64-5gf8-9qq8 / GHSA-x4m4-345f-5h5g / GHSA-24j9-x2wg-9qv6 / GHSA-gx5v-xp9w-j4cg / GHSA-gcx9-497g-6cp6: Apache Tomcat < 11.0.25 vulnerabilities')
50+
}
51+
if (requested.group == 'io.netty'
52+
&& requested.version != null && requested.version < '4.2.17.Final') {
53+
useVersion('4.2.17.Final')
54+
because('GHSA-38f8-5428-x5cv: HTTP Request Smuggling in io.netty:netty-codec-http via malformed Transfer-Encoding headers; ' +
55+
'GHSA-3qp7-7mw8-wx86 / GHSA-c2rx-5r8w-8xr2 / GHSA-cmm3-54f8-px4j / GHSA-x4gw-5cx5-pgmh / GHSA-676x-f7gg-47vc / ' +
56+
'GHSA-5pvg-856g-cp85 / GHSA-4grm-h2qv-h6w6 / GHSA-c653-97m9-rcg9 / GHSA-563q-j3cm-6jxm / GHSA-hvcg-qmg6-jm4c / ' +
57+
'GHSA-cq4q-cv5g-r8q5 / GHSA-c2gf-v879-257j / GHSA-5x3r-wrvg-rp6q / GHSA-xmv7-r254-6q78 / GHSA-w573-9ffj-6ff9 / ' +
58+
'GHSA-mvh2-crg5-v77c / GHSA-8c42-7qj2-3j46: multiple Netty vulnerabilities, including SPDY zlib header block continues decoded expansion ' +
59+
'after maxHeaderSize truncation and CORS Vary Header Overwrite cache poisoning, fixed in 4.2.17.Final')
60+
}
61+
if (requested.group == 'org.springframework' && requested.name == 'spring-core'
62+
&& requested.version != null && requested.version < '7.0.8') {
63+
useVersion('7.0.8')
64+
because('GHSA-659m-px2c-25wj: Denial of Service in spring-core via AntPathMatcher, fixed in 7.0.8')
65+
}
66+
if (requested.group == 'org.apache.logging.log4j'
67+
&& requested.version != null && requested.version < '2.25.5') {
68+
useVersion('2.25.5')
69+
because('GHSA-qv9r-c865-cp47: improper encoding of non-finite floating-point values during MapMessage JSON serialization, fixed in 2.25.5')
70+
}
71+
}
72+
}
73+
2674
if(it.parent.name == 'examples') {
2775
apply plugin: 'java'
2876
} else {

‎examples/example-spring-boot-starter-web/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ plugins {
55
alias(libs.plugins.openapi.generator)
66
}
77

8+
ext['jackson-bom.version'] = '3.1.4'
9+
ext['jackson-2-bom.version'] = '2.21.5'
10+
ext['logback.version'] = '1.5.34'
11+
ext['log4j2.version'] = '2.25.5'
12+
ext['netty.version'] = '4.2.17.Final'
13+
ext['tomcat.version'] = '11.0.25'
14+
ext['spring-framework.version'] = '7.0.8'
15+
816
dependencies {
917
implementation project(':examples:examples-common')
1018
implementation project(':spring-boot-starter:spring-boot-starter-web')

‎examples/example-spring-boot-starter-webflux/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ plugins {
55
alias(libs.plugins.openapi.generator)
66
}
77

8+
ext['jackson-bom.version'] = '3.1.4'
9+
ext['jackson-2-bom.version'] = '2.21.5'
10+
ext['logback.version'] = '1.5.34'
11+
ext['log4j2.version'] = '2.25.5'
12+
ext['netty.version'] = '4.2.17.Final'
13+
ext['tomcat.version'] = '11.0.25'
14+
ext['spring-framework.version'] = '7.0.8'
15+
816
dependencies {
917
implementation project(':examples:examples-common')
1018
implementation project(':spring-boot-starter:spring-boot-starter-webflux')

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
22
java = "21"
3-
spring-boot = "4.0.5"
3+
spring-boot = "4.0.7"
44
spring-dependency-management = "1.1.7"
55
openapi-generator = "7.21.0"
66
openapi-tools = "0.2.10"
7-
swagger = "2.2.46"
7+
swagger = "2.2.49"
88
swagger-request-validator = "2.46.1"
99
jakarta-validation = "3.1.1"
1010
lombok = "1.18.44"

‎gradle/wrapper/gradle-wrapper.jar‎

-504 Bytes
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 10 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openapi-validation-api/src/main/java/com/getyourguide/openapi/validation/api/Rules.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ public static class Request {
55
public static final String PATH_MISSING = "validation.request.path.missing";
66
public static final String OPERATION_NOT_ALLOWED = "validation.request.operation.notAllowed";
77
public static final String BODY_SCHEMA_ONE_OF = "validation.request.body.schema.oneOf";
8+
public static final String ACCEPT_NOT_ALLOWED = "validation.request.accept.notAllowed";
89
}
910

1011
public static class Response {

0 commit comments

Comments
 (0)