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

Merge branch '4.0.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2023-07-03 07:05:48 +02:00
parent abbd78e677 a6f0e9a4f5
commit 77f91133f5
8 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.settings.xml
View File

@@ -36,14 +36,14 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<!--<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repository>-->
</repositories>
<pluginRepositories>
<pluginRepository>

4
docker/spring-cloud-contract-docker/project/build.gradle
View File

@@ -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" }
}
}

4
docker/spring-cloud-contract-docker/project/buildSrc/build.gradle
View File

@@ -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()
}
}

59
docs/pom.xml
View File

@@ -22,6 +22,7 @@
<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
<!-- Aligned with Groovy in SC-Build -->
<groovy.version>4.0.6</groovy.version>
<index-link></index-link>
</properties>
<build>
<plugins>
@@ -157,6 +158,64 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>

2
samples/standalone/dsl/http-client/build.gradle
View File

@@ -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 {

2
samples/standalone/dsl/http-client/settings.gradle
View File

@@ -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 {

9
samples/standalone/dsl/http-server/build.gradle
View File

@@ -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)"

2
samples/standalone/webclient/http-server/build.gradle
View File

@@ -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 {