Commit Graph

11222 Commits (40b33728848e4d6a9b0cdba7b9ef736ba9aad18b)
 

Author SHA1 Message Date
Phillip Webb 40b3372884 Polish 8 years ago
Madhura Bhave bfae0d7739 Merge branch '1.5.x' 8 years ago
Madhura Bhave 0dcebdaf7c Merge branch '1.4.x' into 1.5.x 8 years ago
Madhura Bhave 19da8d8271 Fix UnsupportedOperationException
Fixes gh-8602
8 years ago
Madhura Bhave 517b30acbb Merge branch '1.5.x' 8 years ago
Madhura Bhave 8deb72be80 Fix ResourceServerProperties validation
Only try and validate if clientId is present.

Fixes gh-8565
8 years ago
Madhura Bhave 8743148ccd Fix tests 8 years ago
Madhura Bhave cb1096dc7f Merge branch '1.5.x' 8 years ago
Madhura Bhave 4607f8bc2f Determine key from configured alias for undertow
Closes gh-8245
8 years ago
Madhura Bhave a47c251c5c Do not convert key nodes to originTrackedValue
Fixes gh-8540
8 years ago
Andy Wilkinson 703d403f7d Tweak file property of import control config to work on Windows 8 years ago
Andy Wilkinson bb54411366 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 17062f9589 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2ddcf0e831 Avoid using File.renameTo(File) as it doesn't work on Windows 8 years ago
Andy Wilkinson 78824b02f3 Start building against Reactor Bom Aluminium snapshots for SR2
See gh-8589
8 years ago
Phillip Webb b0eb5ef71b Fix checkstyle import control
Use fully expanded referenced in an attempt to make the CI happy.

Fixes gh-8532
8 years ago
Phillip Webb 5d89a0c0b7 Remove TomcatResources
Remove `TomcatResources` which isn't needed on master since we only
support Tomcat 8.

See gh-8532
8 years ago
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
8 years ago
Stephane Nicoll 7b388e5865 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6a137260c1 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4158a6d50f Fix typo
Closes gh-8574
8 years ago
Andy Wilkinson b35c162593 Raise the minimum supported version of Gradle to 3.4
Closes gh-7922
8 years ago
Phillip Webb b1f679b1c5 Fix HttpHandlerAutoConfiguration
Fix HttpHandlerAutoConfiguration following upstream Spring Framework
changes.
8 years ago
Stephane Nicoll 4f7e5efac8 Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson 62de505e43 Update tests to align with slight change in HtmlUnit's behaviour
See gh-8515
8 years ago
Stephane Nicoll 5ca197b5b6 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cbde6ed096 Merge pull request #8474 from Nowheresly:gh-8396
* pr/8474:
  Polish contribution
  Add Tomcat Access Log's fileDateFormat property
8 years ago
Stephane Nicoll f8bf05b91f Polish contribution
Closes gh-8474
8 years ago
srichard 0ddaca57fb Add Tomcat Access Log's fileDateFormat property
Closes gh-8396
8 years ago
Andy Wilkinson 030b566194 Upgrade to Selenium HtmlUnit 2.25
See gh-8515
8 years ago
Stephane Nicoll 361ad69a4b Merge branch '1.5.x' 8 years ago
Stephane Nicoll b5fc68dfed Merge pull request #8490 from schlauergerd:gh-8390
* pr/8490:
  Polish contribution
  Introduce reset method to OutputCapture
8 years ago
Stephane Nicoll c8ac94b75d Polish contribution
Closes gh-8490
8 years ago
Roland Weisleder a6f0da8cc6 Introduce reset method to OutputCapture
Closes gh-8390
8 years ago
Stephane Nicoll 7ed97d3e0b Merge pull request #8552 from sotuzun:master
* pr/8552:
  Remove unused parameter
8 years ago
Sabri Onur Tüzün bce5737215 Remove unused parameter
Closes gh-8552
8 years ago
Stephane Nicoll abef1ee4db Merge branch '1.5.x' 8 years ago
Stephane Nicoll feb1ab375f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 095eb779e2 Merge pull request #8562 from eddumelendez:missing_cassandra_metadata
* pr/8562:
  Add missing spring-data-cassandra metadata
8 years ago
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
8 years ago
Stephane Nicoll dc3b2a70b9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 544c73841d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 633e75dce2 Fix typo
Closes gh-8563
8 years ago
Stephane Nicoll 1223e9248b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6624fe47c3 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll e7922a574a Polish 8 years ago
Stephane Nicoll 68ef19b69b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 207ab3ecb4 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago