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

Removed explicit json-path dependency version & fixed orca-core TCs #41

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Removed explicit json-path dependency version & fixed orca-core TCs #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 orca-core/orca-core.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
implementation("org.apache.httpcomponents:httpclient")
implementation("jakarta.servlet:jakarta.servlet-api:+")
implementation("javax.validation:validation-api:+")
implementation("com.jayway.jsonpath:json-path:2.2.0")
implementation("com.jayway.jsonpath:json-path")
implementation("org.yaml:snakeyaml")
implementation("org.apache.groovy:groovy:4.0.9")
implementation("org.jetbrains.spek:spek-api:1.1.5")
Expand Down
6 changes: 3 additions & 3 deletions ...test/groovy/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessorSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class ContextParameterProcessorSpec extends Specification {
def result = contextParameterProcessor.process(source, contextParameterProcessor.buildExecutionContext(execution), true)

then:
result.deployed.size == 2
result.deployed.size() == 2
result.deployed.serverGroup == ["flex-test-v043", "flex-prestaging-v011"]
result.deployed.region == ["us-east-1", "us-west-1"]
result.deployed.ami == ["ami-06362b6e", "ami-f759b7b3"]
Expand Down Expand Up @@ -601,7 +601,7 @@ class ContextParameterProcessorSpec extends Specification {
def result = contextParameterProcessor.process(source, contextParameterProcessor.buildExecutionContext(execution), true)

then:
result.deployed.size == 2
result.deployed.size() == 2
result.deployed.serverGroup == ["flex-test-v043", "flex-prestaging-v011"]
result.deployed.region == ["us-east-1", "us-west-1"]
result.deployed.ami == ["ami-06362b6e", "ami-f759b7b3"]
Expand All @@ -612,7 +612,7 @@ class ContextParameterProcessorSpec extends Specification {
result = contextParameterProcessor.process(source, contextParameterProcessor.buildExecutionContext(execution), true)

then: 'should only consider the specified stage name/id'
result.deployed.size == 1
result.deployed.size() == 1
result.deployed.serverGroup == ["flex-test-v043"]
result.deployed.region == ["us-east-1"]
result.deployed.ami == ["ami-06362b6e"]
Expand Down
2 changes: 1 addition & 1 deletion orca-pipelinetemplate/orca-pipelinetemplate.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation("com.hubspot.jinjava:jinjava")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("com.jayway.jsonpath:json-path:2.2.0")
implementation("com.jayway.jsonpath:json-path")
implementation("org.slf4j:slf4j-api")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("org.springframework:spring-context")
Expand Down
2 changes: 1 addition & 1 deletion orca-webhook/orca-webhook.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-autoconfigure")
compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
implementation("com.jayway.jsonpath:json-path:2.2.0")
implementation("com.jayway.jsonpath:json-path")
implementation("com.squareup.okhttp3:okhttp")
implementation("com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0")
// testImplementation project(':orca-test')
Expand Down
Loading