From ca39fdb021d5df978dd18caf9143a3c998e1bef4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 6 May 2024 15:02:25 +0200 Subject: [PATCH] Removes any references to repo.spring.io/release fixes gh-2106 --- .settings.xml | 8 -------- .../project/buildSrc/build.gradle | 1 - docs/pom.xml | 16 ---------------- pom.xml | 16 ---------------- .../contracts/com/example/server/pom.xml | 16 ---------------- samples/standalone/dsl/http-client/build.gradle | 1 - samples/standalone/dsl/http-client/pom.xml | 16 ---------------- .../standalone/dsl/http-client/settings.gradle | 1 - samples/standalone/dsl/http-server/build.gradle | 1 - samples/standalone/dsl/http-server/pom.xml | 16 ---------------- .../standalone/dsl/http-server/settings.gradle | 1 - .../standalone/restdocs/http-client/build.gradle | 2 -- samples/standalone/restdocs/http-client/pom.xml | 16 ---------------- .../standalone/restdocs/http-server/build.gradle | 1 - samples/standalone/restdocs/http-server/pom.xml | 16 ---------------- .../webclient/http-client/build.gradle | 1 - samples/standalone/webclient/http-client/pom.xml | 16 ---------------- .../webclient/http-server/build.gradle | 1 - samples/standalone/webclient/http-server/pom.xml | 16 ---------------- spring-cloud-contract-dependencies/pom.xml | 8 -------- .../build.gradle | 1 - .../functionalTest/bootSimple/build.gradle | 2 -- .../functionalTest/scenarioProject/build.gradle | 1 - .../scenarioProject/settings.gradle | 1 - .../scenarioProjectKotlin/build.gradle.kts | 1 - .../scenarioProjectKotlin/settings.gradle.kts | 1 - .../spring-cloud-contract-maven-plugin/pom.xml | 16 ---------------- .../src/test/projects/plugin-extension/pom.xml | 16 ---------------- .../src/test/projects/spring-boot-groovy/pom.xml | 16 ---------------- .../src/test/projects/spring-boot-java/pom.xml | 16 ---------------- 30 files changed, 241 deletions(-) diff --git a/.settings.xml b/.settings.xml index 97c7a2cc95..e1533de462 100644 --- a/.settings.xml +++ b/.settings.xml @@ -36,14 +36,6 @@ false - diff --git a/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle b/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle index 6b3fe7015f..7db4269e97 100644 --- a/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle +++ b/docker/spring-cloud-contract-docker/project/buildSrc/build.gradle @@ -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 { diff --git a/docs/pom.xml b/docs/pom.xml index 9541d6a215..8fcdb97b7d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -180,14 +180,6 @@ false - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - @@ -209,14 +201,6 @@ false - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - diff --git a/pom.xml b/pom.xml index bf4c5c814b..fb78a6c446 100644 --- a/pom.xml +++ b/pom.xml @@ -627,14 +627,6 @@ false - @@ -656,14 +648,6 @@ false - diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index 597e137c20..443e469bb7 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -70,14 +70,6 @@ false - @@ -96,14 +88,6 @@ false - diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index 502039c8c1..042824b0d6 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -13,7 +13,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } -// maven { url "https://repo.spring.io/release" } } dependencyManagement { diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index 630da9fc63..ba74cb25a6 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -134,14 +134,6 @@ false - @@ -160,14 +152,6 @@ false - diff --git a/samples/standalone/dsl/http-client/settings.gradle b/samples/standalone/dsl/http-client/settings.gradle index c32c6ffa3c..f6e3c526d4 100644 --- a/samples/standalone/dsl/http-client/settings.gradle +++ b/samples/standalone/dsl/http-client/settings.gradle @@ -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 { diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index b62fa49a03..93f2639a4e 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -15,7 +15,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } } // end::deps_repos[] diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index f1d5a1114e..fd3f5eb1ca 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -190,14 +190,6 @@ false - @@ -216,14 +208,6 @@ false - diff --git a/samples/standalone/dsl/http-server/settings.gradle b/samples/standalone/dsl/http-server/settings.gradle index 4a73ec07bb..bc0fb9ad84 100644 --- a/samples/standalone/dsl/http-server/settings.gradle +++ b/samples/standalone/dsl/http-server/settings.gradle @@ -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[] diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle index e64f69d857..d8f90a3cbc 100644 --- a/samples/standalone/restdocs/http-client/build.gradle +++ b/samples/standalone/restdocs/http-client/build.gradle @@ -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}" @@ -19,7 +18,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } } apply plugin: 'groovy' diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 4b9bdc0908..9cd8d86327 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -157,14 +157,6 @@ false - @@ -183,14 +175,6 @@ false - diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle index 6bb63c49d9..7037deb2e4 100644 --- a/samples/standalone/restdocs/http-server/build.gradle +++ b/samples/standalone/restdocs/http-server/build.gradle @@ -14,7 +14,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } } dependencyManagement { diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index c9cc5859ae..235ac0b40b 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -171,14 +171,6 @@ false - @@ -197,14 +189,6 @@ false - diff --git a/samples/standalone/webclient/http-client/build.gradle b/samples/standalone/webclient/http-client/build.gradle index 16b81fad0b..db868a119c 100644 --- a/samples/standalone/webclient/http-client/build.gradle +++ b/samples/standalone/webclient/http-client/build.gradle @@ -13,7 +13,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } } dependencyManagement { diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 58d632928f..84e5ebb4e6 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -133,14 +133,6 @@ false - @@ -159,14 +151,6 @@ false - diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle index afda75b3b8..9ee9eeef28 100644 --- a/samples/standalone/webclient/http-server/build.gradle +++ b/samples/standalone/webclient/http-server/build.gradle @@ -20,7 +20,6 @@ repositories { mavenLocal() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } -// maven { url "https://repo.spring.io/release" } } dependencyManagement { diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index 48cd4de9fe..af51d1469a 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -142,14 +142,6 @@ false - @@ -168,14 +160,6 @@ false - diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 00748844f1..62d8aac37e 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -141,14 +141,6 @@ false - diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle index c10ecd6466..b6c6615d10 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle @@ -42,7 +42,6 @@ repositories { jcenter() 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/ diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle index 549b0fdb7a..b6239c75cf 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -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" } } } @@ -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 { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle index b76a361a95..602cce3278 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle @@ -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 { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/settings.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/settings.gradle index 3b48f5ba2c..a54aa5571a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/settings.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/settings.gradle @@ -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 { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/build.gradle.kts b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/build.gradle.kts index 193986266d..6c665cdf2b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/build.gradle.kts +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/build.gradle.kts @@ -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 { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/settings.gradle.kts b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/settings.gradle.kts index 3d14f16553..2b52badecb 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/settings.gradle.kts +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/settings.gradle.kts @@ -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 { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 6c698d2d5e..4e4c008704 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -464,14 +464,6 @@ false - @@ -493,14 +485,6 @@ false - diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 7ce0ad0359..9bcae99f69 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -105,14 +105,6 @@ false - @@ -134,13 +126,5 @@ false - diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index fb95fa5550..b46763491c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -149,14 +149,6 @@ false - @@ -178,14 +170,6 @@ false - diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index 7ce0ad0359..9bcae99f69 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -105,14 +105,6 @@ false - @@ -134,13 +126,5 @@ false -