Commit Graph

11222 Commits (40b33728848e4d6a9b0cdba7b9ef736ba9aad18b)
 

Author SHA1 Message Date
Andy Wilkinson 019b0a3e9c Merge branch '1.5.x' 8 years ago
Andy Wilkinson 50c0204f2d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d32c3a7f43 Correct the URL that's called to test servlet context resources
See gh-8299
Closes gh-8525
8 years ago
Andy Wilkinson b527e71474 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 1395f38ee7 Merge branch '1.4.x' into 1.5.x 8 years ago
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.
8 years ago
Madhura Bhave f72c5b70c6 Merge branch '1.5.x' 8 years ago
Madhura Bhave 7da70a52fd Mask sensitive placeholders in env endpoint
Closes gh-8282
8 years ago
Andy Wilkinson c42312be79 Upgrade to RxJava 2.0.7
Closes gh-8539
8 years ago
Andy Wilkinson 884fedcefb Upgrade to Selenium 3.2.0
Closes gh-8538
8 years ago
Stephane Nicoll 407894e1df Merge pull request #8526 from izeye:polish-20170307
* pr/8526:
  Polish
8 years ago
Johnny Lim 709ee23255 Polish
Closes gh-8526
8 years ago
Madhura Bhave 8f903987da Merge branch '1.5.x' 8 years ago
Madhura Bhave 703b7d9268 Merge branch '1.4.x' into 1.5.x 8 years ago
Madhura Bhave 67068fc83d Ignore unresolvable nested placeholders
The NamePatternEnvironmentFilter used to throw an exception if
placeholders in property values could not be resolved.

Fixes gh-8510
8 years ago
Phillip Webb d75c8719ea Fix Javadoc link references
See gh-8517
See gh-814
8 years ago
Madhura Bhave 484c72cd19 Add OriginTrackedYamlLoader
Update the YAML parser so that origin  information can be tracked.
Line and column numbers are now available for each loaded property
value.

Fixes gh-8142
8 years ago
Madhura Bhave 7d793fd123 Add OriginTrackedPropertiesLoader
Use a custom parser to load `.properties` files so that origin
information can be tracked. Line and column numbers are now available
for each loaded property value.

Fixes gh-8517
8 years ago
Madhura Bhave 0593fd3db1 Add OriginTrackedMapPropertySource
Add `OriginTrackedMapPropertySource` that can be used for any `Map`
backed `PropertySource` that is also aware property origins. Rather than
directly storing the value in the `Map`, an `OriginTrackedValue` can
be used.

See gh-8142
See gh-8517
8 years ago
Phillip Webb 43a54c8db1 Add OriginCapablePropertySource interfaces
Add `OriginCapablePropertySource` interface and supporting classes so
that `PropertySource` implementations can reveal the source of any
given property.

The `TextResourcePropertyOrigin` can be used for sources that load
values from a text `Resource` and can track line/column numbers.

See gh-8517
See gh-8142
8 years ago
Phillip Webb 2136a39004 Fix checkstyle errors 8 years ago
Phillip Webb d8f827d224 Cleanup and format code 8 years ago
Phillip Webb c7b46e4d1c Upgrade to HtmlUnit 2.25
Fixes gh-8515
8 years ago
Phillip Webb e2cc4655f4 Remove deprecated OKHttp 2.0 tests 8 years ago
Phillip Webb 425dbc3e52 Update copyright header for edited files 8 years ago
Phillip Webb 2a592103f0 Polish formatting 8 years ago
Phillip Webb 91a7bf92e6 Merge branch '1.5.x' 8 years ago
Phillip Webb fedd7b9506 Polish 8 years ago
Phillip Webb a3d5101369 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb f5aeac3658 Polish 8 years ago
Andy Wilkinson dcf7e11de5 Upgrade to Snakeyaml 1.18
Closes gh-8505
8 years ago
Andy Wilkinson dc2548d3bc Upgrade to Spring Security Oauth 2.1.0.RELEASE
Closes gh-8504
8 years ago
Andy Wilkinson bf7c9acc87 Upgrade to Rxjava 1.2.7
Closes gh-8503
8 years ago
Andy Wilkinson 0d46181f11 Upgrade to Caffeine 2.4.0
Closes gh-8502
8 years ago
Andy Wilkinson dba2ff13b1 Reinstate dependency management for hibernate-entitymanager
This commit reinstates dependency management for
hibernate-entitymanager as, while empty, it remains part of Hibernate
5.2.x and people may still have a dependency upon it.

It also reinstates the configuration of skipping the jar during TLD
scanning so that any application that does depend on
hibernate-entitymanager doesn't scan it for TLDs.

See gh-8433
8 years ago
Stephane Nicoll 546338ac80 Avoid early initializations for reactive support
This commit flags the `BeanPostProcessor` registered by the reactive
embedded support as `synthetic` so that it doesn't trigger an early
initialization of other components.

See gh-8467
8 years ago
Stephane Nicoll 36d6ab41a2 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 28bba876fa Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9fb9a67c4b Avoid early initializations
This commit flags the two `BeanPostProcessors` registered by the
embedded support as `synthetic` so that they don't trigger an early
initialization of other components.

Closes gh-8467
8 years ago
Stephane Nicoll bc15029e03 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3cdc81c351 Fixup version numbers following release 8 years ago
Spring Buildmaster d23fa24340 Next Development Version 8 years ago
Stephane Nicoll 6cffcb652c Merge pull request #8429 from bquintanaj:issues/8426-master
* pr/8429:
  Upgrade to versions maven plugin 2.3
8 years ago
bquintanaj c99858e4fc Upgrade to versions maven plugin 2.3
Closes gh-8429
8 years ago
Stephane Nicoll 346ddfcf75 Merge branch '1.5.x' 8 years ago
Stephane Nicoll fe465f062e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll dac3810bc1 Fixup version numbers following release 8 years ago
Spring Buildmaster 2a83e80a9b Next Development Version 8 years ago
Andy Wilkinson edc2facd7a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 0ec372bfdb Merge pull request #8268 from Eddú Meléndez
* gh-8268:
  Polish "Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key"
  Enable customization of RestTemplate that retrieves JwtAccessTokenConverter's key
8 years ago