Merge branch '1.5.x'

kekemu · Nov 29, 2017 · 9965221 · 9965221
2 parents eb6182f + 5fd5292
commit 9965221
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
diff --git a/...i/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/...i/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
@@ -42,7 +42,7 @@
 public final class RepositoryConfigurationFactory {
 
 	private static final RepositoryConfiguration MAVEN_CENTRAL = new RepositoryConfiguration(
-			"central", URI.create("http://repo1.maven.org/maven2/"), false);
+			"central", URI.create("https://repo.maven.apache.org/maven2/"), false);
 
 	private static final RepositoryConfiguration SPRING_MILESTONE = new RepositoryConfiguration(
 			"spring-milestone", URI.create("http://repo.spring.io/milestone"), false);

diff --git a/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
@@ -53,7 +53,7 @@ private AetherGrapeEngine createGrapeEngine(
 			RepositoryConfiguration... additionalRepositories) {
 		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<>();
 		repositoryConfigurations.add(new RepositoryConfiguration("central",
-				URI.create("http://repo1.maven.org/maven2"), false));
+				URI.create("https://repo.maven.apache.org/maven2"), false));
 		repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
 		DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext();
 		dependencyResolutionContext.addDependencyManagement(

diff --git a/...n/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java b/...n/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java
@@ -185,7 +185,7 @@ private List<URL> resolveCoordinates(String[] coordinates) throws Exception {
 				repositorySystem.newLocalRepositoryManager(session, localRepository));
 		CollectRequest collectRequest = new CollectRequest(null,
 				Arrays.asList(new RemoteRepository.Builder("central", "default",
-						"http://central.maven.org/maven2").build()));
+						"https://repo.maven.apache.org/maven2").build()));
 
 		collectRequest.setDependencies(createDependencies(coordinates));
 		DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);

diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
@@ -14,7 +14,7 @@
 		<main.basedir>${basedir}/../../..</main.basedir>
 		<cargo.container.id>tomcat8x</cargo.container.id>
 		<cargo.container.url>
-			http://central.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip
+			https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip
 		</cargo.container.url>
 	</properties>
 	<dependencies>

diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
@@ -14,7 +14,7 @@
 		<main.basedir>${basedir}/../../..</main.basedir>
 		<wlp.version>16.0.0.4</wlp.version>
 		<cargo.container.id>liberty</cargo.container.id>
-		<cargo.container.url>http://central.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-webProfile7/${wlp.version}/wlp-webProfile7-${wlp.version}.zip</cargo.container.url>
+		<cargo.container.url>https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-webProfile7/${wlp.version}/wlp-webProfile7-${wlp.version}.zip</cargo.container.url>
 	</properties>
 	<dependencies>
 		<dependency>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip