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

fix: snakeyml update, scheme validation fix #2577

Merged
merged 2 commits into from
Sep 9, 2022
Merged

fix: snakeyml update, scheme validation fix #2577

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
540ab51
snakeyml update, scheme validation fix
achmelo Sep 9, 2022
7f7ba30
fix build
achmelo Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion api-catalog-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
commands:
start: bin/start.sh
validate: bin/validate.sh
Expand Down
2 changes: 1 addition & 1 deletion apiml-common-lib-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
schemas:
configs: "apiml-common-lib-schema.json"
5 changes: 4 additions & 1 deletion apiml-extension-loader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ dependencies {
compileOnly libraries.spring_boot_starter_web

implementation libraries.apache_commons_lang3
implementation libraries.jackson_dataformat_yaml
implementation(libraries.jackson_dataformat_yaml) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml

compileOnly libraries.lombok
annotationProcessor libraries.lombok
Expand Down
2 changes: 1 addition & 1 deletion apiml-sample-extension-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
# The following block contains all the extensions directory path
# (or file path) that will be included in the API ML
gatewaySharedLibs:
Expand Down
5 changes: 4 additions & 1 deletion apiml-tomcat-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
dependencies {
implementation libraries.spring_boot_starter_web
implementation(libraries.spring_boot_starter_web) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml
implementation libraries.zowe_attls

implementation libraries.spring_aop
Expand Down
2 changes: 1 addition & 1 deletion caching-service-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
commands:
start: bin/start.sh
validate: bin/validate.sh
Expand Down
11 changes: 8 additions & 3 deletions common-service-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ dependencies {
compileOnly libraries.lombok
annotationProcessor libraries.lombok

implementation(libraries.spring_boot_starter_cache)
implementation(libraries.eh_cache)

testImplementation(libraries.spring_boot_starter_cache)
implementation(libraries.spring_boot_starter_cache){
exclude group: "org.yaml", module: "snakeyaml"
}
testImplementation(libraries.spring_boot_starter_cache) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml
testImplementation libraries.snakeyaml
testImplementation(libraries.spring_boot_starter_test)
testImplementation libraries.json_smart
testImplementation(libraries.eh_cache)
Expand Down
2 changes: 1 addition & 1 deletion discovery-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
commands:
start: bin/start.sh
validate: bin/validate.sh
Expand Down
5 changes: 4 additions & 1 deletion discovery-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ dependencies {
implementation libraries.gson
implementation libraries.jackson_annotations
implementation libraries.jackson_core
implementation libraries.jackson_dataformat_yaml
implementation(libraries.jackson_dataformat_yaml) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml
implementation libraries.jackson_databind
implementation libraries.jetty_client
implementation libraries.jetty_http
Expand Down
2 changes: 1 addition & 1 deletion gateway-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
commands:
start: bin/start.sh
validate: bin/validate.sh
Expand Down
1 change: 1 addition & 0 deletions gateway-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dependencies {
implementation project(':apiml-security-common')
implementation project(':apiml-tomcat-common')
implementation project(':apiml-extension-loader')
implementation libraries.snakeyaml
implementation libraries.spring_boot_starter_webflux
implementation libraries.spring_boot_starter_actuator
implementation libraries.spring_boot_starter_web
Expand Down
2 changes: 1 addition & 1 deletion gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ext {
reactorTestVersion = '3.4.9'
restAssuredVersion = '4.4.0'
slf4jVersion = '1.7.31'
snakeyamlVersion = '1.27'
snakeyamlVersion = '1.31'
springFoxVersion = '2.9.2'
springDocVersion = '1.6.9'
spring4Version = '4.3.7.RELEASE' // Used within PJE in tests
Expand Down
2 changes: 1 addition & 1 deletion metrics-service-package/src/main/resources/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
branch: "{{build.branch}}"
number: "{{build.number}}"
commitHash: "{{build.commitHash}}"
timestamp: "{{build.timestamp}}"
timestamp: {{build.timestamp}}
commands:
start: bin/start.sh
validate: bin/validate.sh
Expand Down
1 change: 1 addition & 0 deletions metrics-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
implementation project(':onboarding-enabler-spring')
implementation(project(':security-service-client-spring'))

implementation libraries.snakeyaml
implementation libraries.jackson_annotations
implementation libraries.jackson_core
implementation libraries.jackson_databind
Expand Down
5 changes: 4 additions & 1 deletion onboarding-enabler-java-sample-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ dependencies {
implementation 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'

compileOnly libraries.javax_servlet_api
implementation libraries.jackson_dataformat_yaml
implementation(libraries.jackson_dataformat_yaml) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml

compileOnly libraries.lombok
annotationProcessor libraries.lombok
Expand Down
6 changes: 5 additions & 1 deletion onboarding-enabler-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ dependencies {
implementation libraries.jaxb_api
implementation libraries.javax_annotation
implementation libraries.jackson_annotations
implementation libraries.jackson_dataformat_yaml
implementation(libraries.jackson_dataformat_yaml) {
exclude group: "org.yaml", module: "snakeyaml"
}
implementation libraries.snakeyaml
implementation(libraries.eureka_client) {
exclude group: "javax.servlet", module: "servlet-api"
exclude group: "com.google.code.gson", module: "gson"
}

implementation libraries.snakeyaml
compileOnly libraries.lombok
annotationProcessor libraries.lombok

Expand Down