Skip to content

Commit f7b3a4b

Browse files
authored
fix: avoid 'example: null' entries in openapi by compel swagger-parser version (#265)
* fix: avoid 'example: null' entries in openapi by constraint swagger-parser version * dependencies
1 parent 565b76f commit f7b3a4b

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

.github/workflows/discord-webhook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
event_sender_login: ${{ github.event.sender.login }}
2424
repository_name: ${{ github.repository }}
2525
secrets:
26-
env_discord: ${{ secrets.DISCORD_WEBHOOK_GITHUB }}
26+
env_discord: ${{ secrets.DISCORD_GITHUB_WEBHOOK }}

DEPENDENCIES

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.11.1, Apache-2.0, approved, CQ23491
22
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.2, Apache-2.0, approved, #13672
3+
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.11.1, Apache-2.0, approved, CQ23092
34
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, , approved, #13665
45
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.11.1, Apache-2.0, approved, CQ23093
56
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671
@@ -35,7 +36,7 @@ maven/mavencentral/com.google.j2objc/j2objc-annotations/1.1, Apache-2.0, approve
3536
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
3637
maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.0.0, Apache-2.0, approved, clearlydefined
3738
maven/mavencentral/com.j2html/j2html/1.6.0, Apache-2.0, approved, clearlydefined
38-
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.1, LGPL-2.1-or-later, restricted, clearlydefined
39+
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.1, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #16060
3940
maven/mavencentral/com.rameshkp/openapi-merger-app/1.0.5, Apache-2.0, approved, clearlydefined
4041
maven/mavencentral/com.rameshkp/openapi-merger-gradle-plugin/1.0.5, Apache-2.0, approved, #9669
4142
maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
@@ -80,7 +81,7 @@ maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.15.0, Apache-2.0, approved,
8081
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.18, Apache-2.0 AND BSD-3-Clause, approved, #7163
8182
maven/mavencentral/net.bytebuddy/byte-buddy/1.15.0, Apache-2.0 AND BSD-3-Clause, approved, #16008
8283
maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.3, MIT, approved, CQ13174
83-
maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, NOASSERTION, restricted, clearlydefined
84+
maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, MPL-2.0-no-copyleft-exception AND (LicenseRef-scancode-proprietary-license AND MPL-2.0-no-copyleft-exception) AND (MPL-2.0-no-copyleft-exception AND X11) AND (MIT AND MPL-2.0-no-copyleft-exception) AND (MPL-1.0 AND MPL-2.0-no-copyleft-exception) AND (Apache-2.0 AND MPL-2.0-no-copyleft-exception) AND MPL-1.0, restricted, #16061
8485
maven/mavencentral/net.steppschuh.markdowngenerator/markdowngenerator/1.3.1.1, Apache-2.0, approved, clearlydefined
8586
maven/mavencentral/org.antlr/antlr4-runtime/4.13.2, BSD-3-Clause, approved, #10767
8687
maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
@@ -132,7 +133,7 @@ maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.11.0, EPL-2.0, appro
132133
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.11.0, EPL-2.0, approved, #15940
133134
maven/mavencentral/org.junit.platform/junit-platform-commons/1.11.0, EPL-2.0, approved, #15936
134135
maven/mavencentral/org.junit.platform/junit-platform-engine/1.11.0, EPL-2.0, approved, #15932
135-
maven/mavencentral/org.junit/junit-bom/5.11.0, , restricted, clearlydefined
136+
maven/mavencentral/org.junit/junit-bom/5.11.0, EPL-2.0, approved, #16062
136137
maven/mavencentral/org.mockito/mockito-core/5.13.0, MIT, approved, clearlydefined
137138
maven/mavencentral/org.mozilla/rhino/1.7R4, MPL-2.0 AND BSD-3-Clause AND ISC, approved, CQ16320
138139
maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined
@@ -144,4 +145,5 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.28, MIT, approved, CQ13368
144145
maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
145146
maven/mavencentral/org.slf4j/slf4j-ext/1.7.28, MIT, approved, CQ9128
146147
maven/mavencentral/org.xmlresolver/xmlresolver/5.2.2, Apache-2.0, approved, clearlydefined
148+
maven/mavencentral/org.yaml/snakeyaml/1.26, Apache-2.0, approved, clearlydefined
147149
maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232

buildSrc/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ repositories {
1717
}
1818

1919
dependencies {
20+
constraints {
21+
implementation(libs.swagger.parser) {
22+
because("OpenAPI merger plugin uses an old version that caused this issue: https://github.com/eclipse-edc/GradlePlugins/issues/183")
23+
}
24+
}
25+
2026
implementation(libs.plugin.nexus.publish)
2127
implementation(libs.plugin.checksum)
2228
implementation(libs.plugin.swagger)
2329
implementation(libs.plugin.openapi.merger)
24-
implementation(libs.plugin.openapi.merger.app)
2530

2631
implementation(libs.jetbrains.annotations)
2732
implementation(libs.jackson.core)

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jakarta-ws-rs = "4.0.0"
1111
jupiter = "5.11.0"
1212
mockito = "5.13.0"
1313
swagger = "2.2.22"
14+
swagger-parser = "2.1.22"
1415

1516
[libraries]
1617
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
@@ -28,8 +29,8 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
2829
plugin-checksum = { module = "gradle.plugin.org.gradle.crypto:checksum", version = "1.4.0" }
2930
plugin-nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
3031
plugin-openapi-merger = { module = "com.rameshkp:openapi-merger-gradle-plugin", version = "1.0.5" }
31-
plugin-openapi-merger-app = { module = "com.rameshkp:openapi-merger-app", version = "1.0.5" }
3232
plugin-swagger = { module = "io.swagger.core.v3:swagger-gradle-plugin", version.ref = "swagger" }
33+
swagger-parser = { module = "io.swagger.parser.v3:swagger-parser", version.ref = "swagger-parser" }
3334

3435
[bundles]
3536

plugins/openapi-merger/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ plugins {
55
val group: String by project
66

77
dependencies {
8-
// contains the actual merger task
98
implementation(libs.plugin.openapi.merger)
10-
// needed for the OpenApiDataInvalidException:
11-
implementation(libs.plugin.openapi.merger.app)
12-
13-
implementation(libs.edc.runtime.metamodel)
14-
159
}
1610

1711
gradlePlugin {

0 commit comments

Comments
 (0)