Skip to content

Commit ba4671f

Browse files
wilkinsonawilkinsona
committed
Merge branch '1.5.x' into 2.0.x
2 parents 507b00d + e036bc4 commit ba4671f

File tree

92 files changed

+247
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+247
-247
lines changed

Diff for: ‎CODE_OF_CONDUCT.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
4040
with regard to the reporter of an incident.
4141

4242
This Code of Conduct is adapted from the
43-
http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
44-
http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
43+
https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
44+
https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

Diff for: ‎CONTRIBUTING.adoc

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ added after the original pull request but before a merge.
6666
* A few unit tests would help a lot as well -- someone has to do it.
6767
* If no-one else is using your branch, please rebase it against the current master (or
6868
other target branch in the main project).
69-
* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
69+
* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
7070
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
7171
message (where `XXXX` is the issue number).
7272

@@ -75,15 +75,15 @@ added after the original pull request but before a merge.
7575
== Working with the Code
7676
If you don't have an IDE preference we would recommend that you use
7777
https://spring.io/tools/sts[Spring Tools Suite] or
78-
http://eclipse.org[Eclipse] when working with the code. We use the
79-
http://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
78+
https://eclipse.org[Eclipse] when working with the code. We use the
79+
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
8080
should also work without issue.
8181

8282

8383

8484
=== Building from Source
85-
Spring Boot source can be build from the command line using
86-
http://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above.
85+
Spring Boot source can be built from the command line using
86+
https://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above.
8787
We include '`Maven Wrapper`' scripts (`./mvnw` or `mvnw.bat`) that you can run rather
8888
than needing to install Maven locally.
8989

@@ -148,7 +148,7 @@ Spring Boot includes a `.setup` files which can be used with the Eclipse Install
148148
provision a new environment. To use the installer:
149149

150150
* Download and run the latest Eclipse Installer from
151-
http://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse").
151+
https://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse").
152152
* Switch to "Advanced Mode" using the drop down menu on the right.
153153
* Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
154154
install and click "`next`".
@@ -170,7 +170,7 @@ easier to navigate.
170170

171171
==== Manual Installation with M2Eclipse
172172
If you prefer to install Eclipse yourself you should use the
173-
http://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
173+
https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
174174
installed it is available from the "Eclipse marketplace".
175175

176176
Spring Boot includes project specific source formatting settings, in order to have these

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public class CloudFoundrySecurityServiceTests {
5252
@Rule
5353
public ExpectedException thrown = ExpectedException.none();
5454

55-
private static final String CLOUD_CONTROLLER = "http://my-cloud-controller.com";
55+
private static final String CLOUD_CONTROLLER = "https://my-cloud-controller.com";
5656

5757
private static final String CLOUD_CONTROLLER_PERMISSIONS = CLOUD_CONTROLLER
5858
+ "/v2/apps/my-app-id/permissions";
5959

60-
private static final String UAA_URL = "http://my-uaa.com";
60+
private static final String UAA_URL = "https://my-uaa.com";
6161

6262
private CloudFoundrySecurityService securityService;
6363

@@ -151,7 +151,7 @@ public void getAccessLevelWhenCloudControllerIsNotReachableThrowsException() {
151151
@Test
152152
public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA() {
153153
this.server.expect(requestTo(CLOUD_CONTROLLER + "/info"))
154-
.andRespond(withSuccess("{\"token_endpoint\":\"http://my-uaa.com\"}",
154+
.andRespond(withSuccess("{\"token_endpoint\":\"https://my-uaa.com\"}",
155155
MediaType.APPLICATION_JSON));
156156
String tokenKeyValue = "-----BEGIN PUBLIC KEY-----\n"
157157
+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0m59l2u9iDnMbrXHfqkO\n"

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void validateTokenWhenExpiredShouldThrowException() throws Exception {
181181
@Test
182182
public void validateTokenWhenIssuerIsNotValidShouldThrowException() throws Exception {
183183
given(this.securityService.fetchTokenKeys()).willReturn(VALID_KEYS);
184-
given(this.securityService.getUaaUrl()).willReturn("http://other-uaa.com");
184+
given(this.securityService.getUaaUrl()).willReturn("https://other-uaa.com");
185185
String header = "{ \"alg\": \"RS256\", \"kid\": \"valid-key\", \"typ\": \"JWT\", \"scope\": [\"actuator.read\"]}";
186186
String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\"}";
187187
this.thrown

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.springframework.util.StringUtils;
4747

4848
/**
49-
* JTA Configuration for <A href="http://www.atomikos.com/">Atomikos</a>.
49+
* JTA Configuration for <A href="https://www.atomikos.com/">Atomikos</a>.
5050
*
5151
* @author Josh Long
5252
* @author Phillip Webb

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
4444
import org.springframework.util.StringUtils;
4545

4646
/**
47-
* JTA Configuration for <A href="http://docs.codehaus.org/display/BTM/Home">Bitronix</A>.
47+
* JTA Configuration for <A href="https://github.com/bitronix/btm">Bitronix</A>.
4848
*
4949
* @author Josh Long
5050
* @author Phillip Webb

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
4949
import org.springframework.util.StringUtils;
5050

5151
/**
52-
* JTA Configuration for <a href="http://narayana.io/">Narayana</a>.
52+
* JTA Configuration for <a href="https://github.com/jbosstm/narayana">Narayana</a>.
5353
*
5454
* @author Gytis Trikleris
5555
* @author Kazuki Shimizu

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
2+
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
33
<head>
44
<title layout:fragment="title">Layout</title>
55
</head>

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
1+
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
22
<head>
33
<title layout:fragment="title">Content</title>
44
</head>

Diff for: ‎spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@GrabResolver(name='clojars.org', root='http://clojars.org/repo')
1+
@GrabResolver(name='clojars.org', root='https://clojars.org/repo')
22
@Grab('redis.embedded:embedded-redis:0.2')
33

44
@Component

Diff for: ‎spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ limitations under the License
205205
>>> CGLIB 3.0 (cglib:cglib:3.0):
206206

207207
Per the LICENSE file in the CGLIB JAR distribution downloaded from
208-
http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
208+
https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
209209
CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
210210
is included above.
211211

@@ -225,7 +225,7 @@ Eclipse Public License, Version 1.0 is applicable to the following component(s).
225225
The Eclipse Foundation makes available all content in this plug-in ("Content").
226226
Unless otherwise indicated below, the Content is provided to you under the terms
227227
and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the
228-
EPL is available at http://www.eclipse.org/legal/epl-v10.html.
228+
EPL is available at https://www.eclipse.org/legal/epl-v10.html.
229229

230230
For purposes of the EPL, "Program" will mean the Content.
231231

@@ -235,7 +235,7 @@ terms and conditions may apply to your use of any object code in the Content.
235235
Check the Redistributor's license that was provided with the Content. If no such
236236
license exists, contact the Redistributor. Unless otherwise indicated below, the
237237
terms and conditions of the EPL still apply to any source code in the Content and
238-
such source code may be obtained at http://www.eclipse.org/
238+
such source code may be obtained at https://www.eclipse.org/
239239

240240

241241

Diff for: ‎spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
/**
4646
* A {@link GrapeEngine} implementation that uses
47-
* <a href="http://eclipse.org/aether">Aether</a>, the dependency resolution system used
47+
* <a href="https://eclipse.org/aether">Aether</a>, the dependency resolution system used
4848
* by Maven.
4949
*
5050
* @author Andy Wilkinson

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ private AetherGrapeEngine createGrapeEngine(
5353
RepositoryConfiguration... additionalRepositories) {
5454
List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<>();
5555
repositoryConfigurations.add(new RepositoryConfiguration("central",
56-
URI.create("https://repo.maven.apache.org/maven2"), false));
56+
URI.create("https://repo1.maven.org/maven2"), false));
5757
repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
5858
DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext();
5959
dependencyResolutionContext.addDependencyManagement(
@@ -142,7 +142,7 @@ public void resolutionWithCustomResolver() {
142142
Map<String, Object> args = new HashMap<>();
143143
AetherGrapeEngine grapeEngine = this.createGrapeEngine();
144144
grapeEngine
145-
.addResolver(createResolver("restlet.org", "http://maven.restlet.org"));
145+
.addResolver(createResolver("restlet.org", "https://maven.restlet.org"));
146146
grapeEngine.grab(args, createDependency("org.restlet", "org.restlet", "1.1.6"));
147147
assertThat(this.groovyClassLoader.getURLs().length).isEqualTo(1);
148148
}

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
*/
3636
public final class DetailedProgressReporterTests {
3737

38-
private static final String REPOSITORY = "http://my.repository.com/";
38+
private static final String REPOSITORY = "https://repo.example.com/";
3939

4040
private static final String ARTIFACT = "org/alpha/bravo/charlie/1.2.3/charlie-1.2.3.jar";
4141

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ private void assertSessionCustomization(String userHome) {
9696
return null;
9797
});
9898
RemoteRepository repository = new RemoteRepository.Builder("my-server", "default",
99-
"http://maven.example.com").build();
99+
"https://maven.example.com").build();
100100
assertMirrorSelectorConfiguration(session, repository);
101101
assertProxySelectorConfiguration(session, repository);
102102
assertAuthenticationSelectorConfiguration(session, repository);

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/foo.pom

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://maven.apache.org/POM/4.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="
6-
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
6+
http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
77

88
<modelVersion>4.0.0</modelVersion>
99

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html xmlns:th="http://www.thymeleaf.org">
2+
<html xmlns:th="https://www.thymeleaf.org">
33
<head>
44
<title th:text="${title}">Title</title>
55
<link rel="stylesheet" th:href="@{/resources/css/bootstrap.min.css}"
@@ -9,7 +9,7 @@
99
<div class="container">
1010
<div class="navbar">
1111
<div class="navbar-inner">
12-
<a class="brand" href="http://www.thymeleaf.org"> Thymeleaf -
12+
<a class="brand" href="https://www.thymeleaf.org"> Thymeleaf -
1313
Plain </a>
1414
<ul class="nav">
1515
<li><a th:href="@{/}" href="home.html"> Home </a></li>

Diff for: ‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
/**
4242
* A server that can be used to tunnel TCP traffic over HTTP. Similar in design to the
43-
* <a href="http://xmpp.org/extensions/xep-0124.html">Bidirectional-streams Over
43+
* <a href="https://xmpp.org/extensions/xep-0124.html">Bidirectional-streams Over
4444
* Synchronous HTTP (BOSH)</a> XMPP extension protocol, the server uses long polling with
4545
* HTTP requests held open until a response is available. A typical traffic pattern would
4646
* be as follows:

Diff for: ‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

Diff for: ‎spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ your own pom.
6161
* Sensible
6262
https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html[resource
6363
filtering].
64-
* Sensible plugin configuration (http://www.mojohaus.org/exec-maven-plugin/[exec plugin],
64+
* Sensible plugin configuration (https://www.mojohaus.org/exec-maven-plugin/[exec plugin],
6565
https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID], and
6666
https://maven.apache.org/plugins/maven-shade-plugin/[shade]).
6767
* Sensible resource filtering for `application.properties` and `application.yml`

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/common.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-->
2121

2222
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
23-
xmlns:xslthl="http://xslthl.sf.net"
23+
xmlns:xslthl="http://xslthl.sourceforge.net/"
2424
xmlns:d="http://docbook.org/ns/docbook"
2525
exclude-result-prefixes="xslthl d"
2626
version='1.0'>

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/epub.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ under the License.
2020
-->
2121

2222
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
23-
xmlns:xslthl="http://xslthl.sf.net"
23+
xmlns:xslthl="http://xslthl.sourceforge.net/"
2424
xmlns:d="http://docbook.org/ns/docbook"
2525
exclude-result-prefixes="xslthl d"
2626
version='1.0'>

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/html.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ under the License.
2020
-->
2121

2222
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
23-
xmlns:xslthl="http://xslthl.sf.net"
23+
xmlns:xslthl="http://xslthl.sourceforge.net/"
2424
xmlns:d="http://docbook.org/ns/docbook"
2525
exclude-result-prefixes="xslthl"
2626
version='1.0'>

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/pdf.xsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
2323
xmlns:d="http://docbook.org/ns/docbook"
2424
xmlns:fo="http://www.w3.org/1999/XSL/Format"
25-
xmlns:xslthl="http://xslthl.sf.net"
25+
xmlns:xslthl="http://xslthl.sourceforge.net/"
2626
xmlns:xlink='http://www.w3.org/1999/xlink'
2727
xmlns:exsl="http://exslt.org/common"
2828
exclude-result-prefixes="exsl xslthl d xlink"

0 commit comments

Comments
 (0)