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.

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

Upgrade Groovy to version 4 #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 cassandra-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
testImplementation project(':conductor-core').sourceSets.test.output
testImplementation project(':conductor-common').sourceSets.test.output

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"
testImplementation "org.testcontainers:spock:${revTestContainer}"
Expand Down
8 changes: 4 additions & 4 deletions cassandra-persistence/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down Expand Up @@ -413,8 +413,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down
2 changes: 1 addition & 1 deletion client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
testImplementation "org.powermock:powermock-module-junit4:${revPowerMock}"
testImplementation "org.powermock:powermock-api-mockito2:${revPowerMock}"

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"
}
8 changes: 4 additions & 4 deletions client/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down Expand Up @@ -360,8 +360,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
testImplementation 'org.springframework.retry:spring-retry'
testImplementation project(':conductor-common').sourceSets.test.output

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"
testImplementation "org.junit.vintage:junit-vintage-engine"
Expand Down
8 changes: 4 additions & 4 deletions core/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand Down Expand Up @@ -396,8 +396,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ext {
revElasticSearch6 = '6.8.12'
revEmbeddedRedis = '0.6'
revEurekaClient = '1.10.10'
revGroovy = '2.5.22'
revGroovy = '4.0.15'
revGrpc = '1.+'
revGuava = '30.0-jre'
revHamcrestAllMatchers = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion java-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
testImplementation "com.fasterxml.jackson.core:jackson-core"
testImplementation "org.apache.commons:commons-lang3"

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"

}

Expand Down
8 changes: 4 additions & 4 deletions java-sdk/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down Expand Up @@ -435,8 +435,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.glassfish.jersey.core:jersey-common": {
"firstLevelTransitive": [
Expand Down
2 changes: 1 addition & 1 deletion redis-concurrency-limit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation "redis.clients:jedis:3.6.0" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis
implementation "org.apache.commons:commons-lang3"

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"
testImplementation "org.testcontainers:spock:${revTestContainer}"
Expand Down
8 changes: 4 additions & 4 deletions redis-concurrency-limit/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down Expand Up @@ -416,8 +416,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down
2 changes: 1 addition & 1 deletion test-harness/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
testImplementation "redis.clients:jedis:${revJedis}"
testImplementation "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}"

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"

Expand Down
8 changes: 4 additions & 4 deletions test-harness/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
Expand Down Expand Up @@ -639,8 +639,8 @@
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"org.apache.groovy:groovy-all": {
"locked": "4.0.15"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"firstLevelTransitive": [
Expand Down
Loading