Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
Upgrade Groovy and Spock as they go together
Browse files Browse the repository at this point in the history
  • Loading branch information
@LuisLainez
LuisLainez committed Oct 24, 2023
1 parent d59d765 commit 137e4bf
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 39 deletions.
12 changes: 6 additions & 6 deletions cassandra-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,16 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -414,7 +414,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand All @@ -426,10 +426,10 @@
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down
12 changes: 6 additions & 6 deletions client/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand All @@ -240,10 +240,10 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -361,7 +361,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand All @@ -379,10 +379,10 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down
12 changes: 6 additions & 6 deletions core/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand All @@ -267,10 +267,10 @@
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -397,7 +397,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand All @@ -409,10 +409,10 @@
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down
1 change: 0 additions & 1 deletion ...st/groovy/com/netflix/conductor/core/execution/tasks/IsolatedTaskQueueProducerSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class IsolatedTaskQueueProducerSpec extends Specification {
Duration.ofSeconds(10))
}

@Test
def "addTaskQueuesAddsElementToQueue"() {
given:
TaskDef taskDef = new TaskDef(isolationGroupId: "isolated")
Expand Down
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
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 = '3.0.19'
revGrpc = '1.+'
revGuava = '30.0-jre'
revHamcrestAllMatchers = '1.8'
Expand All @@ -50,7 +50,7 @@ ext {
revRedisson = '3.13.3'
revRxJava = '1.2.2'
revSpectator = '0.122.0'
revSpock = '1.3-groovy-2.5'
revSpock = '2.3-groovy-3.0'
revSpotifyCompletableFutures = '0.3.3'
revTestContainer = '1.15.3'
}
12 changes: 6 additions & 6 deletions java-sdk/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand All @@ -270,10 +270,10 @@
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -436,7 +436,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.glassfish.jersey.core:jersey-common": {
"firstLevelTransitive": [
Expand All @@ -457,10 +457,10 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down
12 changes: 6 additions & 6 deletions redis-concurrency-limit/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,16 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -417,7 +417,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand All @@ -429,10 +429,10 @@
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down
12 changes: 6 additions & 6 deletions test-harness/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
Expand All @@ -130,10 +130,10 @@
"locked": "5.8.2"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
Expand Down Expand Up @@ -640,7 +640,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.22"
"locked": "3.0.19"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -701,10 +701,10 @@
"locked": "1.7.36"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "1.3-groovy-2.5"
"locked": "2.3-groovy-3.0"
},
"org.springdoc:springdoc-openapi-ui": {
"firstLevelTransitive": [
Expand Down

0 comments on commit 137e4bf

Please sign in to comment.