Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
14b21026
Commit
14b21026
authored
Mar 27, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish "Use HTTPS for external links wherever possible"
See gh-16319
parent
1a4c6f2d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
19 deletions
+20
-19
AutowireCapableBeanJobFactory.java
...t/autoconfigure/quartz/AutowireCapableBeanJobFactory.java
+1
-3
OAuth2WebSecurityConfigurationTests.java
...ty/oauth2/client/OAuth2WebSecurityConfigurationTests.java
+2
-1
appendix-executable-jar-format.adoc
...ocs/src/main/asciidoc/appendix-executable-jar-format.adoc
+1
-1
deployment.adoc
...roject/spring-boot-docs/src/main/asciidoc/deployment.adoc
+2
-2
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+12
-10
OriginTrackedYamlLoaderTests.java
...pringframework/boot/env/OriginTrackedYamlLoaderTests.java
+1
-1
test-yaml.yml
...test/resources/org/springframework/boot/env/test-yaml.yml
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java
View file @
14b21026
/*
/*
* Copyright 2012-201
7
the original author or authors.
* Copyright 2012-201
9
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -26,8 +26,6 @@ import org.springframework.util.Assert;
...
@@ -26,8 +26,6 @@ import org.springframework.util.Assert;
* Subclass of {@link SpringBeanJobFactory} that supports auto-wiring job beans.
* Subclass of {@link SpringBeanJobFactory} that supports auto-wiring job beans.
*
*
* @author Vedran Pavic
* @author Vedran Pavic
* @see <a href="http://blog.btmatthews.com/?p=40#comment-33797">Inject application
* context dependencies in Quartz job beans</a>
*/
*/
class
AutowireCapableBeanJobFactory
extends
SpringBeanJobFactory
{
class
AutowireCapableBeanJobFactory
extends
SpringBeanJobFactory
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
View file @
14b21026
...
@@ -183,7 +183,8 @@ public class OAuth2WebSecurityConfigurationTests {
...
@@ -183,7 +183,8 @@ public class OAuth2WebSecurityConfigurationTests {
@Bean
@Bean
public
ClientRegistrationRepository
clientRegistrationRepository
()
{
public
ClientRegistrationRepository
clientRegistrationRepository
()
{
List
<
ClientRegistration
>
registrations
=
new
ArrayList
<>();
List
<
ClientRegistration
>
registrations
=
new
ArrayList
<>();
registrations
.
add
(
getClientRegistration
(
"first"
,
"https://user-info-uri.com"
));
registrations
.
add
(
getClientRegistration
(
"first"
,
"https://user-info-uri.com"
));
registrations
.
add
(
getClientRegistration
(
"second"
,
"http://other-user-info"
));
registrations
.
add
(
getClientRegistration
(
"second"
,
"http://other-user-info"
));
return
new
InMemoryClientRegistrationRepository
(
registrations
);
return
new
InMemoryClientRegistrationRepository
(
registrations
);
}
}
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc
View file @
14b21026
...
@@ -330,6 +330,6 @@ following alternatives:
...
@@ -330,6 +330,6 @@ following alternatives:
* https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin]
* https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin]
* http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader]
* http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader]
* http
://one-jar.sourceforge.net
[OneJar]
* http
s://sourceforge.net/projects/one-jar/
[OneJar]
* https://imperceptiblethoughts.com/shadow/[Gradle Shadow Plugin]
* https://imperceptiblethoughts.com/shadow/[Gradle Shadow Plugin]
spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
View file @
14b21026
...
@@ -372,8 +372,8 @@ example:
...
@@ -372,8 +372,8 @@ example:
Creating security group boxfuse-sg_axelfontaine/myapp:1.0 ...
Creating security group boxfuse-sg_axelfontaine/myapp:1.0 ...
Launching t2.micro instance of axelfontaine/myapp:1.0 (ami-d23f38cf) in eu-central-1 ...
Launching t2.micro instance of axelfontaine/myapp:1.0 (ami-d23f38cf) in eu-central-1 ...
Instance launched in 00:30.306s -> i-92ef9f53
Instance launched in 00:30.306s -> i-92ef9f53
Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at http://52.28.235.61/ ...
Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at http
s
://52.28.235.61/ ...
Payload started in 00:29.266s -> http://52.28.235.61/
Payload started in 00:29.266s -> http
s
://52.28.235.61/
Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ...
Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ...
Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ...
Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ...
Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/
Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
14b21026
...
@@ -2922,9 +2922,10 @@ JAX-RS resources are packaged as nested jars, you may need to do the same.
...
@@ -2922,9 +2922,10 @@ JAX-RS resources are packaged as nested jars, you may need to do the same.
[[boot-features-embedded-container]]
[[boot-features-embedded-container]]
=== Embedded Servlet Container Support
=== Embedded Servlet Container Support
Spring Boot includes support for embedded https://tomcat.apache.org/[Tomcat],
Spring Boot includes support for embedded https://tomcat.apache.org/[Tomcat],
https://www.eclipse.org/jetty/[Jetty], and http://undertow.io/[Undertow] servers. Most
https://www.eclipse.org/jetty/[Jetty], and
developers use the appropriate "`Starter`" to obtain a fully configured instance. By
https://github.com/undertow-io/undertow[Undertow] servers. Most developers use the
default, the embedded server listens for HTTP requests on port `8080`.
appropriate "`Starter`" to obtain a fully configured instance. By default, the embedded
server listens for HTTP requests on port `8080`.
WARNING: If you choose to use Tomcat on https://www.centos.org/[CentOS], be aware that, by
WARNING: If you choose to use Tomcat on https://www.centos.org/[CentOS], be aware that, by
default, a temporary directory is used to store compiled JSPs, file uploads, and so on.
default, a temporary directory is used to store compiled JSPs, file uploads, and so on.
...
@@ -5838,11 +5839,12 @@ property with a different value for each instance of your application.
...
@@ -5838,11 +5839,12 @@ property with a different value for each instance of your application.
[[boot-features-jta-narayana]]
[[boot-features-jta-narayana]]
=== Using a Narayana Transaction Manager
=== Using a Narayana Transaction Manager
http://narayana.io/[Narayana] is a popular open source JTA transaction manager
https://github.com/jbosstm/narayana[Narayana] is a popular open source JTA transaction
implementation supported by JBoss. You can use the `spring-boot-starter-jta-narayana`
manager implementation supported by JBoss. You can use the
starter to add the appropriate Narayana dependencies to your project. As with Atomikos and
`spring-boot-starter-jta-narayana` starter to add the appropriate Narayana dependencies
Bitronix, Spring Boot automatically configures Narayana and post-processes your beans to
to your project. As with Atomikos and Bitronix, Spring Boot automatically configures
ensure that startup and shutdown ordering is correct.
Narayana and post-processes your beans to ensure that startup and shutdown ordering is
correct.
By default, Narayana transaction logs are written to a `transaction-logs` directory in
By default, Narayana transaction logs are written to a `transaction-logs` directory in
your application home directory (the directory in which your application jar file
your application home directory (the directory in which your application jar file
...
@@ -6150,8 +6152,8 @@ the following provided libraries:
...
@@ -6150,8 +6152,8 @@ the following provided libraries:
* {spring-reference}testing.html#integration-testing[Spring Test] & Spring Boot Test:
* {spring-reference}testing.html#integration-testing[Spring Test] & Spring Boot Test:
Utilities and integration test support for Spring Boot applications.
Utilities and integration test support for Spring Boot applications.
* https://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library.
* https://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library.
* http
://hamcrest.org/JavaHamcrest/[Hamcrest]: A library of matcher objects (also known
* http
s://github.com/hamcrest/JavaHamcrest[Hamcrest]: A library of matcher objects (also
as constraints or predicates).
known
as constraints or predicates).
* https://mockito.github.io[Mockito]: A Java mocking framework.
* https://mockito.github.io[Mockito]: A Java mocking framework.
* https://github.com/skyscreamer/JSONassert[JSONassert]: An assertion library for JSON.
* https://github.com/skyscreamer/JSONassert[JSONassert]: An assertion library for JSON.
* https://github.com/jayway/JsonPath[JsonPath]: XPath for JSON.
* https://github.com/jayway/JsonPath[JsonPath]: XPath for JSON.
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
View file @
14b21026
...
@@ -99,7 +99,7 @@ public class OriginTrackedYamlLoaderTests {
...
@@ -99,7 +99,7 @@ public class OriginTrackedYamlLoaderTests {
OriginTrackedValue
bar2
=
getValue
(
"example.foo[0].bar[1].bar2"
);
OriginTrackedValue
bar2
=
getValue
(
"example.foo[0].bar[1].bar2"
);
assertThat
(
name
.
toString
()).
isEqualTo
(
"springboot"
);
assertThat
(
name
.
toString
()).
isEqualTo
(
"springboot"
);
assertThat
(
getLocation
(
name
)).
isEqualTo
(
"22:15"
);
assertThat
(
getLocation
(
name
)).
isEqualTo
(
"22:15"
);
assertThat
(
url
.
toString
()).
isEqualTo
(
"http
://www.springboot
.com/"
);
assertThat
(
url
.
toString
()).
isEqualTo
(
"http
s://springboot.example
.com/"
);
assertThat
(
getLocation
(
url
)).
isEqualTo
(
"23:14"
);
assertThat
(
getLocation
(
url
)).
isEqualTo
(
"23:14"
);
assertThat
(
bar1
.
toString
()).
isEqualTo
(
"baz"
);
assertThat
(
bar1
.
toString
()).
isEqualTo
(
"baz"
);
assertThat
(
getLocation
(
bar1
)).
isEqualTo
(
"25:19"
);
assertThat
(
getLocation
(
bar1
)).
isEqualTo
(
"25:19"
);
...
...
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
View file @
14b21026
...
@@ -20,7 +20,7 @@ education: |
...
@@ -20,7 +20,7 @@ education: |
example
:
example
:
foo
:
foo
:
-
name
:
springboot
-
name
:
springboot
url
:
http
://www.springboot
.com/
url
:
http
s://springboot.example
.com/
bar
:
bar
:
-
bar1
:
baz
-
bar1
:
baz
-
bar2
:
bling
-
bar2
:
bling
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment