Skip to content

Commit c34d5c7

Browse files
committed
Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
2 parents 6bc49bb + 768c2c2 commit c34d5c7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"dependencies": {
3-
"antora": "3.2.0-alpha.4",
3+
"antora": "3.2.0-alpha.8",
44
"@antora/atlas-extension": "1.0.0-alpha.2",
5-
"@antora/collector-extension": "1.0.0-alpha.3",
5+
"@antora/collector-extension": "1.0.1",
66
"@asciidoctor/tabs": "1.0.0-beta.6",
7-
"@springio/antora-extensions": "1.11.1",
8-
"@springio/asciidoctor-extensions": "1.0.0-alpha.10",
7+
"@springio/antora-extensions": "1.14.4",
8+
"@springio/asciidoctor-extensions": "1.0.0-alpha.17",
99
"asciidoctor-kroki": "0.18.1"
1010
}
1111
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<properties>
2626
<spring-boot.version>3.4.3</spring-boot.version>
2727
<!-- Align it also in Docker image under [docker/spring-cloud-contract-docker/project/gradle.properties] -->
28-
<camel.version>3.21.4</camel.version>
28+
<camel.version>3.21.5</camel.version>
2929
<jsch-agent.version>0.0.9</jsch-agent.version>
3030
<spring-cloud-build.version>4.2.2-SNAPSHOT</spring-cloud-build.version>
3131
<spring-cloud-zookeeper.version>4.2.2-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -58,7 +58,7 @@
5858
<!-- We need to have compatibility with Gradle -->
5959
<groovy.version>4.0.21</groovy.version>
6060
<!-- We need to have compatibility with Boot -->
61-
<maven.version>3.9.8</maven.version>
61+
<maven.version>3.9.10</maven.version>
6262
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6363
<!-- Resolver has to be aligned with Maven (e.g resolver 1.4 and Maven 3.6 or resolver 1.3 and Maven 3.5) -->
6464
<maven.resolver.version>1.9.18</maven.resolver.version>

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
@@ -35,7 +35,7 @@
3535
<maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
3636
<maven-plugin-annotations.version>3.11.0</maven-plugin-annotations.version>
3737
<maven-archiver.version>3.6.1</maven-archiver.version>
38-
<plexus-archiver.version>4.9.1</plexus-archiver.version>
38+
<plexus-archiver.version>4.9.2</plexus-archiver.version>
3939
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
4040
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
4141
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>

spring-cloud-contract-wiremock/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<groupId>com.example.github</groupId>
133133
<artifactId>github-analytics</artifactId>
134134
<classifier>stubs</classifier>
135-
<version>1.0.0.M1-20180613_114136-VERSION</version><!-- @releaser:version-check-off -->
135+
<version>1.0.0.M1170929_151255-VERSION</version><!-- @releaser:version-check-off -->
136136
<scope>test</scope>
137137
<exclusions>
138138
<exclusion>

0 commit comments

Comments
 (0)