Commit Graph

8469 Commits

Author SHA1 Message Date
Andy Wilkinson 72d59b9fcf Upgrade to Freemarker 2.3.24-incubating
Closes gh-6270
2016-07-01 11:37:10 +01:00
Andy Wilkinson 0976178def Upgrade to Groovy 2.4.7
Closes gh-6269
2016-07-01 11:36:33 +01:00
Andy Wilkinson 5e6f859304 Upgrade to Tomcat 8.0.36
Closes gh-6268
2016-07-01 11:36:04 +01:00
Andy Wilkinson 03c0b24798 Upgrade to httpasynclient 4.1.2
Closes gh-6267
2016-07-01 11:35:40 +01:00
Andy Wilkinson 6d3f6c5886 Upgrade to EhCache 2.10.2.2.21
Closes gh-6266
2016-07-01 11:35:15 +01:00
Andy Wilkinson bf90e67042 Upgrade to Jackson 2.6.7
Closes gh-6265
2016-07-01 11:34:42 +01:00
Andy Wilkinson fdc2e8407e Merge pull request #6241 from Matt Benson
* gh-6241:
  Add an accessor for webEnvironment to SpringApplication
2016-07-01 11:00:02 +01:00
Matt Benson 687199e688 Add an accessor for webEnvironment to SpringApplication
Closes gh-6241
2016-07-01 10:59:17 +01:00
Andy Wilkinson 92bb24e365 Avoid synchronizing on this and use an internal monitor instead
Where possible, code that previously synchronized on this (or on the
class in the case of static methods) has been updated to use an
internal monitor object instead. This allows the locking model that's
employed to be an implementation detail rather than part of the
class's API.

Classes that override a synchronized method continue to declare
the overriding method as synchronized. This ensures that locking
is consistent across the superclass and its subclass.

Closes gh-6262
2016-07-01 10:44:23 +01:00
Stephane Nicoll f9c7db1137 Upgrade to Ehcache 3.1.0
Closes gh-6263
2016-07-01 11:06:48 +02:00
Phillip Webb 516df88ea0 Revisit AuditEventRepository interface
Update AuditEventRepository to restore support for `null` arguments and
explicitly Javadoc their meaning.

See gh-5854
2016-06-30 17:27:55 -07:00
Phillip Webb ebdacfabc3 Polish 2016-06-30 17:15:27 -07:00
Andy Wilkinson d124d68213 Upgrade to Dependency Management Plugin 0.6.0.RELEASE
Closes gh-6257
2016-06-30 18:10:17 +01:00
Andy Wilkinson ef35fe649b Upgrade to Jersey 2.23.1
Closes gh-6253
2016-06-30 16:14:55 +01:00
Andy Wilkinson 76c4a38e65 Merge branch '1.3.x' 2016-06-30 16:05:16 +01:00
Andy Wilkinson 02e989c863 Check that URL is actually a file URL before getting a File from it
Previously, Log4J2LoggingSystem used ResourceUtils.isFileURL(URL) to
check that the URL of the configuration was suitable for accessing as a
File. Unfortunately, this fails when the URL’s protocol is vfs or
vfsfile as both return true and then fail when the URL is subsequently
passed into ResourceUtils.getFile(URL).

This commit switches to checking that the URL’s protocol is file,
the only protocol that will allow getFile(URL) to succeed.

Closes gh-6246
2016-06-30 15:55:22 +01:00
Stephane Nicoll 0ea2626867 Improve Spring Session documentation
Closes gh-6256
2016-06-30 15:40:45 +02:00
Stephane Nicoll 31a5d7f876 Merge pull request #5879 from vpavic:session-jdbc-initializer
* pr/5879:
  Polish "Add Spring Session JDBC database initializer"
  Add Spring Session JDBC database initializer
  Allow Tomcat context root redirect to be configured via the environment
2016-06-30 15:24:13 +02:00
Stephane Nicoll 2fea5a869d Polish "Add Spring Session JDBC database initializer"
Closes gh-5879
2016-06-30 15:23:54 +02:00
Vedran Pavic a251ea8bc7 Add Spring Session JDBC database initializer
See gh-5879
2016-06-30 15:23:54 +02:00
Andy Wilkinson 2b970f9efc Allow Tomcat context root redirect to be configured via the environment
This commit adds a new property, server.tomcat.redirect-context-root,
that can be used to configure the Tomcat Context’s 
mapperContextRootRedirectEnabled property. The default is to not apply
any configuration and, therefore, to use Tomcat’s default of true.

Closes gh-6248
2016-06-30 12:47:42 +01:00
Stephane Nicoll 05b9dd1cb9 Merge pull request #5854 from vpavic:audit-repository
* pr/5854:
  Polish "Improve AuditEventRepository"
  Improve AuditEventRepository
2016-06-30 11:45:10 +02:00
Stephane Nicoll 3ba2b24301 Polish "Improve AuditEventRepository"
Closes gh-5854
2016-06-30 11:44:01 +02:00
Vedran Pavic 5f19323fbd Improve AuditEventRepository
See gh-5854
2016-06-30 11:20:23 +02:00
Stephane Nicoll 6527aa0e80 Downgrade to maven-failsafe-plugin 2.18.1
This commit downgrades the maven failsafe plugin version. As of 2.19, the
generated jar is used for integration tests rather than the
`target/classes` directory. The fat jar in 1.4 has changed to move
classes to `BOOT-INF/classes` and therefore these are not found anymore.

There isn't a way to configure the jar file to use in the plugin. Users
willing to use the latest version should configure a `classifier` for the
repackaged jar so that the original jar is used by failsafe.

Closes gh-6254
2016-06-30 11:08:59 +02:00
Stephane Nicoll 9b5973c16d Merge pull request #6251 from eddumelendez:session_1.2.1.RELEASE
* pr/6251:
  Upgrade to spring-session 1.2.1.RELEASE
2016-06-30 09:48:24 +02:00
Eddú Meléndez 74d873f8ee Upgrade to spring-session 1.2.1.RELEASE
Closes gh-6251
2016-06-30 09:47:47 +02:00
Phillip Webb d08480320b Stop RequestContextFilter initializing config
Change WebMvcAutoConfigurationAdapter.requestContextFilter() to a static
method so that the configuration class isn't needed when creating it.
This helps to prevent early initialization of beans.

See gh-6178
2016-06-29 20:14:17 -07:00
Phillip Webb 4d50b4d321 Defer javax.servlet.Filter initialization
Update `DelegatingFilterProxyRegistrationBean` so that calls to the
`init()` method no longer trigger early bean initialization.

See gh-6178
2016-06-29 20:13:58 -07:00
Phillip Webb be884d4e33 Polish 2016-06-29 10:57:43 -07:00
Phillip Webb 266445aaf0 Polish 2016-06-29 10:44:33 -07:00
Dave Syer d41127d3da Add javadocs to auth server config props 2016-06-29 09:11:41 -07:00
Andy Wilkinson fc16d9b85c Merge branch '1.3.x' 2016-06-29 17:05:47 +01:00
Andy Wilkinson 05b44a98e0 Simplify generics in CassandraRepositoriesAutoConfigurationTests 2016-06-29 17:05:08 +01:00
Andy Wilkinson 4c8729a3f2 Upgrade to Undertow 1.3.23.Final
Closes gh-6245
2016-06-29 17:02:40 +01:00
Andy Wilkinson 911f728bc3 Start building against Spring Framework 4.2.7 snapshots
See gh-6249
2016-06-29 17:01:55 +01:00
Stephane Nicoll 669da59b4a Polish 2016-06-29 16:28:41 +02:00
Stephane Nicoll 4670226a3c Merge pull request #6244 from izeye:polish-20160629
* pr/6244:
  Polish
2016-06-29 08:09:15 +02:00
Johnny Lim 5bc9d5b380 Polish
Closes gh-6244
2016-06-29 08:08:53 +02:00
Stephane Nicoll f54bec835d Move BasicAuthorizationInterceptor
`BasicAuthorizationInterceptor` is now available in the core framework
and this commit uses that instead of the outdated copy in Boot.

Closes gh-6237
2016-06-29 08:07:30 +02:00
Stephane Nicoll fc4d8b99d6 Allow to configure Tomcat's renameOnRotate property
Closes gh-5981
2016-06-28 16:38:01 +02:00
Stephane Nicoll c024dc836a Support Spring Mobile for all template engines
Previously, Spring Mobile was only supported for Thymeleaf and JSPs. This
commit improves the auto-configuration to also provide device delegating
support for Freemarker, Groovy Templates and Mustache.

Closes gh-5140
2016-06-28 16:16:34 +02:00
Stephane Nicoll 6dd8e71d06 Merge pull request #5855 from mp911de:issue/cassandra-schema-action
* pr/5855:
  Polish "Add schemaAction property"
  Add schemaAction property to CassandraProperties
2016-06-28 10:22:13 +02:00
Stephane Nicoll 397c64d256 Polish "Add schemaAction property"
Closes gh-5855
2016-06-28 10:21:48 +02:00
Mark Paluch e85cb2c4c5 Add schemaAction property to CassandraProperties
Set schemaAction property in CassandraSessionFactoryBean. Use relaxed
property resolver for enum lookup of the configured schemaAction.

See gh-5855
2016-06-28 10:21:24 +02:00
Andy Wilkinson 4386732376 Merge pull request #6072 from Misagh Moayyed
* gh-6072:
  Polish “Allow connection timeout to be configured via the environment”
  Allow connection timeout to be configured via the environment
2016-06-27 16:57:37 +01:00
Andy Wilkinson 94ba6bdae2 Polish “Allow connection timeout to be configured via the environment”
- Preserve default connection timeout when server.connection-timeout
   has not been set
 - Apply standard coding conventions and formatting

See gh-6072
2016-06-27 16:56:16 +01:00
Misagh Moayyed 6007d7efc1 Allow connection timeout to be configured via the environment
Closes gh-6072
2016-06-27 16:56:16 +01:00
Stephane Nicoll 9891eb5432 Merge pull request #6018 from venilnoronha:issue-5982-fix
* pr/6018:
  Polish "Add ability to filter cookies in trace data"
  Add ability to filter cookies in trace data
2016-06-27 16:41:47 +02:00
Stephane Nicoll 84b2ff5c38 Polish "Add ability to filter cookies in trace data"
Closes gh-6018
2016-06-27 16:41:10 +02:00