SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1.x' into 4.2.x

Browse Source 
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2025-03-04 17:41:24 +01:00
parent f224863613 7e8bb2817f
commit 2195956aca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/package.json
View File

@@ -4,7 +4,7 @@
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.1",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.2",
"@springio/antora-extensions": "1.14.4",
"@springio/asciidoctor-extensions": "1.0.0-alpha.16"
}
}

2
pom.xml
View File

@@ -23,7 +23,7 @@
<bintray.package>netflix</bintray.package>
<spring-cloud-commons.version>4.2.1-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>4.2.1-SNAPSHOT</spring-cloud-config.version>
<testcontainers.version>1.20.4</testcontainers.version>
<testcontainers.version>1.20.5</testcontainers.version>
<mockserverclient.version>5.15.0</mockserverclient.version>
<!-- Sonar -->