Phillip Webb
9d61882bb1
Polish `AbstractServletWebServerFactory`
...
Extract some of the utility methods to package private classes
2017-03-14 21:58:47 -07:00
Phillip Webb
b1c689b9b2
Unify WebServerFactory implementations
...
Unify common for from the abstract `ServletWebServerFactory` and
`ReactiveWebServerFactory` classes. Common code is now located in
`AbstractConfigurableWebServerFactory`.
Fixes gh-8631
2017-03-14 21:52:40 -07:00
Phillip Webb
099e188f9f
Unify WebServerFactoryCustomizers
...
Replace `ReactiveWebServerCustomizer` and `WebServerFactoryCustomizer`
with a unified `WebServerFactoryCustomizer`.
Fixes gh-8558
2017-03-14 21:43:23 -07:00
Phillip Webb
13db69bf41
Drop superfluous `@Order` annotation
...
Remove `@Order` which has no effect on `ImportBeanDefinitionRegistrar`.
Fixes gh-8603
2017-03-14 13:49:18 -07:00
Phillip Webb
4100360ceb
Make ReactiveWebServerFactory functional interface
...
Update `ReactiveWebServerFactory` to contain only a single method.
Fixes gh-8559
2017-03-14 13:45:53 -07:00
Phillip Webb
ca5e566deb
Fix Configuration processor test tangle
...
Move `Metadata` test class to fix a package tangle in the test code.
Fixes gh-8613
2017-03-14 13:45:53 -07:00
Phillip Webb
2a9bbfdb86
Fix FailureAnalyzers tangle
...
Create a new `SpringBootExceptionReporter` interface so that a direct
link between `SpringApplication` and `FailureAnalyzers` is no longer
needed.
This prevents package tangle warnings and allows for cleaner separation
of concerns.
Fixes gh-8612
2017-03-14 13:45:53 -07:00
Phillip Webb
69b72874ea
Extract logging listeners
...
Separate logging ApplicationListeners classes to a different package
so that the root `logging` package is no longer aware of `context`
concerns.
Fixes gh-8611
2017-03-14 13:45:53 -07:00
Phillip Webb
902905ad10
Fix SpringBootVersion tangle
...
Update `SpringBootVersion` to no longer reference `SpringApplication`
for the root package.
Fixes gh-8610
2017-03-14 13:45:53 -07:00
Phillip Webb
40b3372884
Polish
2017-03-14 13:45:53 -07:00
Madhura Bhave
bfae0d7739
Merge branch '1.5.x'
2017-03-14 13:37:09 -07:00
Madhura Bhave
0dcebdaf7c
Merge branch '1.4.x' into 1.5.x
2017-03-14 13:34:41 -07:00
Madhura Bhave
19da8d8271
Fix UnsupportedOperationException
...
Fixes gh-8602
2017-03-14 11:59:42 -07:00
Madhura Bhave
517b30acbb
Merge branch '1.5.x'
2017-03-14 11:35:53 -07:00
Madhura Bhave
8deb72be80
Fix ResourceServerProperties validation
...
Only try and validate if clientId is present.
Fixes gh-8565
2017-03-14 11:03:21 -07:00
Madhura Bhave
8743148ccd
Fix tests
2017-03-13 13:58:32 -07:00
Madhura Bhave
cb1096dc7f
Merge branch '1.5.x'
2017-03-13 13:44:34 -07:00
Madhura Bhave
4607f8bc2f
Determine key from configured alias for undertow
...
Closes gh-8245
2017-03-13 12:37:54 -07:00
Madhura Bhave
a47c251c5c
Do not convert key nodes to originTrackedValue
...
Fixes gh-8540
2017-03-13 11:11:13 -07:00
Andy Wilkinson
703d403f7d
Tweak file property of import control config to work on Windows
2017-03-13 16:22:23 +00:00
Andy Wilkinson
bb54411366
Merge branch '1.5.x'
2017-03-13 16:10:51 +00:00
Andy Wilkinson
17062f9589
Merge branch '1.4.x' into 1.5.x
2017-03-13 16:10:32 +00:00
Andy Wilkinson
2ddcf0e831
Avoid using File.renameTo(File) as it doesn't work on Windows
2017-03-13 15:46:19 +00:00
Andy Wilkinson
78824b02f3
Start building against Reactor Bom Aluminium snapshots for SR2
...
See gh-8589
2017-03-13 07:24:54 +00:00
Phillip Webb
b0eb5ef71b
Fix checkstyle import control
...
Use fully expanded referenced in an attempt to make the CI happy.
Fixes gh-8532
2017-03-12 22:27:49 -07:00
Phillip Webb
5d89a0c0b7
Remove TomcatResources
...
Remove `TomcatResources` which isn't needed on master since we only
support Tomcat 8.
See gh-8532
2017-03-12 21:56:24 -07:00
Phillip Webb
67556ba8ea
Restructure embedded web server packages
...
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:
Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server
Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter
Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server
Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded
In addition:
- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
`ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
`ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.
Fixes gh-8532
2017-03-12 21:08:25 -07:00
Stephane Nicoll
7b388e5865
Merge branch '1.5.x'
2017-03-12 08:44:38 +01:00
Stephane Nicoll
6a137260c1
Merge branch '1.4.x' into 1.5.x
2017-03-12 08:44:18 +01:00
Stephane Nicoll
4158a6d50f
Fix typo
...
Closes gh-8574
2017-03-12 08:43:51 +01:00
Andy Wilkinson
b35c162593
Raise the minimum supported version of Gradle to 3.4
...
Closes gh-7922
2017-03-11 09:03:06 +00:00
Phillip Webb
b1f679b1c5
Fix HttpHandlerAutoConfiguration
...
Fix HttpHandlerAutoConfiguration following upstream Spring Framework
changes.
2017-03-10 20:16:05 -08:00
Stephane Nicoll
4f7e5efac8
Merge branch '1.5.x'
2017-03-10 16:29:31 +01:00
Stephane Nicoll
5d27c7e501
Handle non supported JOOQ dialect
...
This commit uses a fallback translator if the JOOQ Dialect in use is not
one we support.
Closes gh-8521
2017-03-10 16:27:44 +01:00
Andy Wilkinson
62de505e43
Update tests to align with slight change in HtmlUnit's behaviour
...
See gh-8515
2017-03-10 09:45:10 +00:00
Stephane Nicoll
5ca197b5b6
Merge branch '1.5.x'
2017-03-10 10:39:00 +01:00
Stephane Nicoll
cbde6ed096
Merge pull request #8474 from Nowheresly:gh-8396
...
* pr/8474:
Polish contribution
Add Tomcat Access Log's fileDateFormat property
2017-03-10 10:21:39 +01:00
Stephane Nicoll
f8bf05b91f
Polish contribution
...
Closes gh-8474
2017-03-10 10:20:48 +01:00
srichard
0ddaca57fb
Add Tomcat Access Log's fileDateFormat property
...
Closes gh-8396
2017-03-10 09:57:00 +01:00
Andy Wilkinson
030b566194
Upgrade to Selenium HtmlUnit 2.25
...
See gh-8515
2017-03-10 08:56:27 +00:00
Stephane Nicoll
361ad69a4b
Merge branch '1.5.x'
2017-03-10 09:55:11 +01:00
Stephane Nicoll
b5fc68dfed
Merge pull request #8490 from schlauergerd:gh-8390
...
* pr/8490:
Polish contribution
Introduce reset method to OutputCapture
2017-03-10 09:54:57 +01:00
Stephane Nicoll
c8ac94b75d
Polish contribution
...
Closes gh-8490
2017-03-10 09:51:35 +01:00
Roland Weisleder
a6f0da8cc6
Introduce reset method to OutputCapture
...
Closes gh-8390
2017-03-10 09:48:36 +01:00
Stephane Nicoll
7ed97d3e0b
Merge pull request #8552 from sotuzun:master
...
* pr/8552:
Remove unused parameter
2017-03-10 09:45:10 +01:00
Sabri Onur Tüzün
bce5737215
Remove unused parameter
...
Closes gh-8552
2017-03-10 09:43:55 +01:00
Stephane Nicoll
abef1ee4db
Merge branch '1.5.x'
2017-03-10 09:37:21 +01:00
Stephane Nicoll
feb1ab375f
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:36:55 +01:00
Stephane Nicoll
095eb779e2
Merge pull request #8562 from eddumelendez:missing_cassandra_metadata
...
* pr/8562:
Add missing spring-data-cassandra metadata
2017-03-10 09:35:22 +01:00
Eddú Meléndez
251090b1e5
Add missing spring-data-cassandra metadata
...
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.
Closes gh-8562
2017-03-10 09:34:19 +01:00