Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson
2019-03-28 11:48:47 +00:00
125 changed files with 450 additions and 447 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -59,7 +59,7 @@ public class ChangeableUrlsTests {
@Test
public void httpUrl() throws Exception {
URL url = new URL("http://spring.io");
URL url = new URL("https://spring.io");
assertThat(ChangeableUrls.fromUrls(url)).isEmpty();
}