Commit Graph

50613 Commits

Author SHA1 Message Date
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
Stephane Nicoll
dc3b2a70b9 Merge branch '1.5.x' 2017-03-10 09:22:46 +01:00
Stephane Nicoll
544c73841d Merge branch '1.4.x' into 1.5.x 2017-03-10 09:22:32 +01:00
Stephane Nicoll
633e75dce2 Fix typo
Closes gh-8563
2017-03-10 09:22:00 +01:00
Stephane Nicoll
1223e9248b Merge branch '1.5.x' 2017-03-09 18:33:55 +01:00
Stephane Nicoll
6624fe47c3 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:33:28 +01:00
Stephane Nicoll
e7922a574a Polish 2017-03-09 18:33:13 +01:00
Stephane Nicoll
68ef19b69b Merge branch '1.5.x' 2017-03-09 18:31:08 +01:00
Stephane Nicoll
207ab3ecb4 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:21:40 +01:00
Stephane Nicoll
07c56c60ba Make sure Hazelcast bootstraps before any JCache setup
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.

Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).

Closes gh-8484
2017-03-09 17:59:20 +01:00
Andy Wilkinson
019b0a3e9c Merge branch '1.5.x' 2017-03-09 14:05:51 +00:00
Andy Wilkinson
50c0204f2d Merge branch '1.4.x' into 1.5.x 2017-03-09 14:05:42 +00:00
Andy Wilkinson
d32c3a7f43 Correct the URL that's called to test servlet context resources
See gh-8299
Closes gh-8525
2017-03-09 14:04:19 +00:00
Andy Wilkinson
b527e71474 Merge branch '1.5.x' 2017-03-09 13:26:14 +00:00
Andy Wilkinson
1395f38ee7 Merge branch '1.4.x' into 1.5.x 2017-03-09 13:11:28 +00:00
Andy Wilkinson
a2cf0455fd Fix static resource handling when run in IDE or using Maven or Gradle
The changes made for gh-8299 attempted to make static resource
handling consistent across Jetty, Tomcat, and Undertow. They did so
for application's launched using JarLauncher or WarLauncher but did
not consider application's launched in an IDE or using spring-boot:run
in Maven or bootRun in Gradle.

Running in an IDE or via Maven or Gradle introduces two new
resource locations:

 - Jars on the classpath with file protocol URLs (they are always
   jar protocol URLs when using either launcher)
 - Directories on the classpath from a project that is depended upon
   and contains resources in META-INF/resources

This commit updates the factories for all three containers to handle
these new resources locations. The integration tests have also been
updated.
2017-03-09 12:41:32 +00:00
Madhura Bhave
f72c5b70c6 Merge branch '1.5.x' 2017-03-08 11:57:24 -08:00
Madhura Bhave
7da70a52fd Mask sensitive placeholders in env endpoint
Closes gh-8282
2017-03-08 10:53:39 -08:00
Andy Wilkinson
c42312be79 Upgrade to RxJava 2.0.7
Closes gh-8539
2017-03-08 09:32:38 +00:00