Skip to content

Commit

Permalink
Merge branch '3.1.x' into 4.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcingrzejszczak
marcingrzejszczak committed May 6, 2024
2 parents 3e0803a + ca39fdb commit b166832
Show file tree
Hide file tree
Showing 25 changed files with 0 additions and 227 deletions.
8 changes: 0 additions & 8 deletions .settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@
<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>
Expand Down
1 change: 0 additions & 1 deletion docker/spring-cloud-contract-docker/project/buildSrc/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
// maven { url "https://repo.spring.io/release" }
}

ext {
Expand Down
16 changes: 0 additions & 16 deletions docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,6 @@
<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>
Expand All @@ -207,14 +199,6 @@
<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>
Expand Down
8 changes: 0 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,14 +677,6 @@
<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>
<profile>
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/contracts/com/example/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@
<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>
Expand All @@ -83,14 +75,6 @@
<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>

</project>
16 changes: 0 additions & 16 deletions samples/standalone/dsl/http-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,6 @@
<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>
Expand All @@ -172,14 +164,6 @@
<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>

<profiles>
Expand Down
1 change: 0 additions & 1 deletion samples/standalone/dsl/http-client/settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pluginManagement {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
// maven { url "https://repo.spring.io/release" }
gradlePluginPortal()
}
plugins {
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/dsl/http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,6 @@
<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>
Expand All @@ -257,14 +249,6 @@
<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>
<!-- end::repos[] -->

Expand Down
1 change: 0 additions & 1 deletion samples/standalone/dsl/http-server/settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pluginManagement {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
gradlePluginPortal()
}
// end::repos[]
Expand Down
1 change: 0 additions & 1 deletion samples/standalone/restdocs/http-client/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ buildscript {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}"
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/restdocs/http-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,6 @@
<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>
Expand All @@ -189,14 +181,6 @@
<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>

<profiles>
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/restdocs/http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,6 @@
<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>
Expand All @@ -197,14 +189,6 @@
<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>

<profiles>
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/webclient/http-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@
<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>
Expand All @@ -159,14 +151,6 @@
<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>

<profiles>
Expand Down
16 changes: 0 additions & 16 deletions samples/standalone/webclient/http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,6 @@
<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>
Expand All @@ -168,14 +160,6 @@
<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>

<profiles>
Expand Down
8 changes: 0 additions & 8 deletions spring-cloud-contract-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,6 @@
<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>
Expand Down
1 change: 0 additions & 1 deletion spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}

//Dependencies in all subprojects - https://solidsoft.wordpress.com/2014/11/13/gradle-tricks-display-dependencies-for-all-subprojects-in-multi-project-build/
Expand Down
2 changes: 0 additions & 2 deletions ...ng-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ buildscript {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}
}

Expand All @@ -27,7 +26,6 @@ repositories {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion ...oud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ subprojects {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion ...-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pluginManagement {
mavenLocal()
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/release" }
}
resolutionStrategy {
eachPlugin {
Expand Down
1 change: 0 additions & 1 deletion ...ct-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ subprojects {
mavenLocal()
maven(url = "https://repo.spring.io/snapshot")
maven(url = "https://repo.spring.io/milestone")
maven(url = "https://repo.spring.io/release")
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion ...gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pluginManagement {
mavenLocal()
maven(url = "https://repo.spring.io/snapshot")
maven(url = "https://repo.spring.io/milestone")
maven(url = "https://repo.spring.io/release")
}
resolutionStrategy {
eachPlugin {
Expand Down
Loading

0 comments on commit b166832

Please sign in to comment.