Skip to content

Commit 5149fb5

Browse files
authored
Merge branch 'main' into artemisBump
Signed-off-by: Ryan Baxter <[email protected]>
2 parents b27495e + ee1bfdc commit 5149fb5

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ updates:
1919
directory: /
2020
schedule:
2121
interval: daily
22-
target-branch: 4.2.x
22+
target-branch: "4.2.x"
2323
ignore:
2424
# only upgrade patch versions for maintenance branch
2525
- dependency-name: "*"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.daemon=false
22
org.gradle.parallel=false
33
verifierVersion=5.0.0-SNAPSHOT
4-
springBootVersion=4.0.0-M2
4+
springBootVersion=4.0.0-M3
55
camelVersion=3.22.4

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<inceptionYear>2016</inceptionYear>
2424

2525
<properties>
26-
<spring-boot.version>4.0.0-M2</spring-boot.version>
26+
<spring-boot.version>4.0.0-M3</spring-boot.version>
2727
<!-- Align it also in Docker image under [docker/spring-cloud-contract-docker/project/gradle.properties] -->
2828
<camel.version>4.14.0</camel.version>
2929
<jsch-agent.version>0.0.9</jsch-agent.version>
@@ -51,14 +51,14 @@
5151
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version> <!-- @releaser:version-check-off -->
5252
<awaitility.version>4.2.2</awaitility.version>
5353
<artemis.version>2.42.0</artemis.version>
54-
<testcontainers.version>1.19.8</testcontainers.version>
54+
<testcontainers.version>1.21.3</testcontainers.version>
5555
<hamcrest.version>2.2</hamcrest.version>
5656

5757
<!-- We need to have compatibility with Gradle -->
58-
<groovy.version>4.0.21</groovy.version>
58+
<groovy.version>4.0.28</groovy.version>
5959
<!-- We need to have compatibility with Boot -->
6060
<maven.version>3.9.11</maven.version>
61-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
61+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
6262
<!-- Resolver has to be aligned with Maven (e.g resolver 1.4 and Maven 3.6 or resolver 1.3 and Maven 3.5) -->
6363
<maven.resolver.version>1.9.24</maven.resolver.version>
6464
<xpath2.processor.version>2.1.100</xpath2.processor.version>

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
wiremockVersion=2.35.0
1717
jsonAssertVersion=0.6.2
1818
verifierVersion=5.0.0-SNAPSHOT
19-
bootVersion=4.0.0-M2
19+
bootVersion=4.0.0-M3
2020
groovyVersion=2.4.17

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
wiremockVersion=2.35.0
1717
jsonAssertVersion=0.6.2
1818
verifierVersion=5.0.0-SNAPSHOT
19-
bootVersion=4.0.0-M2
19+
bootVersion=4.0.0-M3
2020
groovyVersion=2.4.17

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
4141
<maven-plugin-testing-harness.version>4.0.0-beta-4</maven-plugin-testing-harness.version>
4242
<maven-shared-incremental.version>1.1</maven-shared-incremental.version>
43-
<slf4j-api.version>2.0.7</slf4j-api.version>
43+
<slf4j-api.version>2.0.17</slf4j-api.version>
4444
<plexus-utils.version>3.6.0</plexus-utils.version> <!-- If not set the provided version is 3.0.x and MethodMissing is thrown -->
4545
</properties>
4646

0 commit comments

Comments
 (0)