Skip to content

Commit 1c02978

Browse files
committed
Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <[email protected]> # Conflicts: # docker/spring-cloud-contract-docker/project/gradle.properties # pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
2 parents 63ecb2c + 621f637 commit 1c02978

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/codeql.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Set up JDK
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: 'temurin'
2424
java-version: 17

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# if: github.repository_owner == 'spring-cloud'
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
ref: docs-build
2222
fetch-depth: 1

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Set up JDK
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: 17

docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"dependencies": {
3-
"antora": "3.2.0-alpha.8",
4-
"@antora/atlas-extension": "1.0.0-alpha.2",
5-
"@antora/collector-extension": "1.0.1",
3+
"antora": "3.2.0-alpha.9",
4+
"@antora/atlas-extension": "1.0.0-alpha.5",
5+
"@antora/collector-extension": "1.0.2",
66
"@asciidoctor/tabs": "1.0.0-beta.6",
77
"@springio/antora-extensions": "1.14.7",
88
"@springio/asciidoctor-extensions": "1.0.0-alpha.17",

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<junit-jupiter.version>5.13.1</junit-jupiter.version>
5151
<gmavenplus-plugin.version>1.13.0</gmavenplus-plugin.version>
5252
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version> <!-- @releaser:version-check-off -->
53-
<awaitility.version>4.2.0</awaitility.version>
53+
<awaitility.version>4.2.2</awaitility.version>
5454
<artemis.version>2.41.0</artemis.version>
5555
<testcontainers.version>1.19.8</testcontainers.version>
5656
<hamcrest.version>2.2</hamcrest.version>
@@ -64,7 +64,7 @@
6464
<maven.resolver.version>1.9.23</maven.resolver.version>
6565
<xpath2.processor.version>2.1.100</xpath2.processor.version>
6666
<xerces.version>2.12.2</xerces.version>
67-
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
67+
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
6868
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
6969
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
7070

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
@@ -34,7 +34,7 @@
3434
<maven-scm-publish-plugin.version>3.2.1</maven-scm-publish-plugin.version>
3535
<maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
3636
<maven-plugin-annotations.version>3.11.0</maven-plugin-annotations.version>
37-
<maven-archiver.version>3.6.3</maven-archiver.version>
37+
<maven-archiver.version>3.6.4</maven-archiver.version>
3838
<plexus-archiver.version>4.10.0</plexus-archiver.version>
3939
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
4040
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>

0 commit comments

Comments
 (0)