Browse Source

Remove references to https://repo.spring.io/release

pull/33774/head
Andy Wilkinson 3 years ago
parent
commit
3b2e5e5292
  1. 1
      buildSrc/build.gradle
  2. 10
      spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
  3. 8
      spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java
  4. 1
      spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
  5. 10
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
  6. 1
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml

1
buildSrc/build.gradle

@ -7,7 +7,6 @@ plugins { @@ -7,7 +7,6 @@ plugins {
repositories {
mavenCentral()
gradlePluginPortal()
maven { url "https://repo.spring.io/release" }
}
sourceCompatibility = 1.8

10
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@ -13,16 +13,6 @@ configurations { @@ -13,16 +13,6 @@ configurations {
documentation
}
repositories {
maven {
url "https://repo.spring.io/release"
mavenContent {
includeGroup "io.spring.asciidoctor"
includeGroup "io.spring.asciidoctor.backends"
}
}
}
dependencies {
asciidoctorExtensions("org.springframework.restdocs:spring-restdocs-asciidoctor")
asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")

8
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -141,10 +141,8 @@ class MavenResolverGrapeEngineTests { @@ -141,10 +141,8 @@ class MavenResolverGrapeEngineTests {
void resolutionWithCustomResolver() {
Map<String, Object> args = new HashMap<>();
GrapeEngine grapeEngine = createGrapeEngine();
grapeEngine.addResolver(createResolver("spring-releases", "https://repo.spring.io/release"));
Map<String, Object> dependency = createDependency("io.spring.docresources", "spring-doc-resources",
"0.1.1.RELEASE");
dependency.put("ext", "zip");
grapeEngine.addResolver(createResolver("spring-milestones", "https://repo.spring.io/milestone"));
Map<String, Object> dependency = createDependency("org.springframework", "spring-jcl", "5.3.0-M1");
grapeEngine.grab(args, dependency);
assertThat(this.groovyClassLoader.getURLs()).hasSize(1);
}

1
spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml

@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
</filesystem>
<ibiblio name="ibiblio" m2compatible="true" />
<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
</chain>

10
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@ -12,16 +12,6 @@ configurations { @@ -12,16 +12,6 @@ configurations {
documentation
}
repositories {
maven {
url "https://repo.spring.io/release"
mavenContent {
includeGroup "io.spring.asciidoctor"
includeGroup "io.spring.asciidoctor.backends"
}
}
}
dependencies {
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
compileOnly("org.sonatype.plexus:plexus-build-api")

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
<ivy pattern="${projectDir}/build/test-repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
</filesystem>
<ibiblio name="ibiblio" m2compatible="true" />
<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
</chain>

Loading…
Cancel
Save