diff --git a/.settings.xml b/.settings.xml
index 43f153dec9..97c7a2cc95 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -36,14 +36,14 @@
false
-
+
diff --git a/docker/spring-cloud-contract-docker/project/build.gradle b/docker/spring-cloud-contract-docker/project/build.gradle
index 83ec6aa1dc..dc5c77042f 100644
--- a/docker/spring-cloud-contract-docker/project/build.gradle
+++ b/docker/spring-cloud-contract-docker/project/build.gradle
@@ -4,10 +4,10 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- if (!"${verifierVersion}".contains("RELEASE")) {
+ if ("${verifierVersion}".contains("SNAPSHOT")) {
maven { url "https://repo.spring.io/snapshot" }
+ } else if ("${verifierVersion}".contains("M") || "${verifierVersion}".contains("RC")) {
maven { url "https://repo.spring.io/milestone" }
- maven { url "https://repo.spring.io/release" }
}
}
diff --git a/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle b/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle
index 88383ec6ae..6b3fe7015f 100644
--- a/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle
+++ b/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle
@@ -3,7 +3,7 @@ repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
- maven { url "https://repo.spring.io/release" }
+// maven { url "https://repo.spring.io/release" }
}
ext {
@@ -18,4 +18,4 @@ dependencies {
test {
useJUnitPlatform()
-}
\ No newline at end of file
+}
diff --git a/docs/pom.xml b/docs/pom.xml
index 429f71c335..02c559dc50 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,6 +22,7 @@
deploy
4.0.6
+
@@ -157,6 +158,64 @@
+
+
+ spring-snapshots
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+ true
+
+
+ false
+
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/milestone
+
+ false
+
+
+
+ spring-releases
+ Spring Releases
+ https://repo.spring.io/release
+
+ false
+
+
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+ true
+
+
+ false
+
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/milestone
+
+ false
+
+
+
+ spring-releases
+ Spring Releases
+ https://repo.spring.io/release
+
+ false
+
+
+
diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle
index 4e35ba052b..4ed96649bb 100644
--- a/samples/standalone/dsl/http-client/build.gradle
+++ b/samples/standalone/dsl/http-client/build.gradle
@@ -13,7 +13,7 @@ repositories {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
- maven { url "https://repo.spring.io/release" }
+// maven { url "https://repo.spring.io/release" }
}
dependencyManagement {
diff --git a/samples/standalone/dsl/http-client/settings.gradle b/samples/standalone/dsl/http-client/settings.gradle
index b997608069..c32c6ffa3c 100644
--- a/samples/standalone/dsl/http-client/settings.gradle
+++ b/samples/standalone/dsl/http-client/settings.gradle
@@ -3,7 +3,7 @@ pluginManagement {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
- maven { url "https://repo.spring.io/release" }
+// maven { url "https://repo.spring.io/release" }
gradlePluginPortal()
}
plugins {
diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle
index 9012f424c3..2d511b9740 100644
--- a/samples/standalone/dsl/http-server/build.gradle
+++ b/samples/standalone/dsl/http-server/build.gradle
@@ -46,13 +46,10 @@ dependencies {
}
contractTest {
- doFirst { // https://github.com/spring-cloud/spring-cloud-contract/issues/1910
- useJUnitPlatform()
- }
systemProperty 'spring.profiles.active', 'gradle'
- testLogging {
- exceptionFormat = 'full'
- }
+ testLogging {
+ exceptionFormat = 'full'
+ }
afterSuite { desc, result ->
if (!desc.parent) {
println "Results: (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle
index 2e5c0a9637..afda75b3b8 100644
--- a/samples/standalone/webclient/http-server/build.gradle
+++ b/samples/standalone/webclient/http-server/build.gradle
@@ -20,7 +20,7 @@ repositories {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
- maven { url "https://repo.spring.io/release" }
+// maven { url "https://repo.spring.io/release" }
}
dependencyManagement {